diff --git a/src/com/massivecraft/massivecore/Active.java b/src/com/massivecraft/massivecore/Active.java
index a1f1126e..73e0f10d 100644
--- a/src/com/massivecraft/massivecore/Active.java
+++ b/src/com/massivecraft/massivecore/Active.java
@@ -3,16 +3,16 @@ package com.massivecraft.massivecore;
 public interface Active
 {
 	// Boolean
-	public boolean isActive();
-	public void setActive(boolean active);
+	boolean isActive();
+	void setActive(boolean active);
 	
 	// Plugin
-	public MassivePlugin setActivePlugin(MassivePlugin plugin);
-	public MassivePlugin getActivePlugin();
+	MassivePlugin setActivePlugin(MassivePlugin plugin);
+	MassivePlugin getActivePlugin();
 	
 	// Combined Setter
 	// Plugin is set first.
 	// Boolean by null state.
-	public void setActive(MassivePlugin plugin);
+	void setActive(MassivePlugin plugin);
 	
 }
diff --git a/src/com/massivecraft/massivecore/Aspect.java b/src/com/massivecraft/massivecore/Aspect.java
index e2e532a6..5169eca4 100644
--- a/src/com/massivecraft/massivecore/Aspect.java
+++ b/src/com/massivecraft/massivecore/Aspect.java
@@ -26,7 +26,7 @@ public class Aspect extends Entity<Aspect>
 	public boolean isRegistered() { return this.registered; }
 	public void register() { this.registered = true; }
 	
-	private transient Collection<String> desc = new ArrayList<String>();
+	private transient Collection<String> desc = new ArrayList<>();
 	public Collection<String> getDesc() { return this.desc; }
 	public void setDesc(Collection<String> val) { this.desc = val; }
 	public void setDesc(String... val) { this.desc = Arrays.asList(val); }
diff --git a/src/com/massivecraft/massivecore/AspectColl.java b/src/com/massivecraft/massivecore/AspectColl.java
index 765074f8..111fabb2 100644
--- a/src/com/massivecraft/massivecore/AspectColl.java
+++ b/src/com/massivecraft/massivecore/AspectColl.java
@@ -30,7 +30,7 @@ public class AspectColl extends Coll<Aspect>
 	
 	public List<Aspect> getAllRegistered()
 	{
-		List<Aspect> ret = new ArrayList<Aspect>();
+		List<Aspect> ret = new ArrayList<>();
 		for (Aspect aspect : this.getAll())
 		{
 			if (aspect.isRegistered() == false) continue;
@@ -41,7 +41,7 @@ public class AspectColl extends Coll<Aspect>
 	
 	public List<Aspect> getAllRegisteredForMultiverse(Multiverse multiverse, boolean normal)
 	{
-		List<Aspect> ret = new ArrayList<Aspect>();
+		List<Aspect> ret = new ArrayList<>();
 		for (Aspect aspect : this.getAll())
 		{
 			if (aspect.isRegistered() == false) continue;
diff --git a/src/com/massivecraft/massivecore/Colorized.java b/src/com/massivecraft/massivecore/Colorized.java
index 56099061..4905f837 100644
--- a/src/com/massivecraft/massivecore/Colorized.java
+++ b/src/com/massivecraft/massivecore/Colorized.java
@@ -4,5 +4,5 @@ import org.bukkit.ChatColor;
 
 public interface Colorized
 {
-	public ChatColor getColor();
+	ChatColor getColor();
 }
diff --git a/src/com/massivecraft/massivecore/Couple.java b/src/com/massivecraft/massivecore/Couple.java
index ede058a4..bd4750a0 100644
--- a/src/com/massivecraft/massivecore/Couple.java
+++ b/src/com/massivecraft/massivecore/Couple.java
@@ -74,7 +74,7 @@ public class Couple<A, B> implements Entry<A, B>, Cloneable, Serializable
 	
 	public static <A, B> Couple<A, B> valueOf(A first, B second)
 	{
-		return new Couple<A, B>(first, second);
+		return new Couple<>(first, second);
 	}
 	
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/massivecore/Identified.java b/src/com/massivecraft/massivecore/Identified.java
index f95356b6..f16903d1 100644
--- a/src/com/massivecraft/massivecore/Identified.java
+++ b/src/com/massivecraft/massivecore/Identified.java
@@ -2,5 +2,5 @@ package com.massivecraft.massivecore;
 
 public interface Identified
 {
-	public String getId();
+	String getId();
 }
diff --git a/src/com/massivecraft/massivecore/Multiverse.java b/src/com/massivecraft/massivecore/Multiverse.java
index cdaed9c9..cf8272e5 100644
--- a/src/com/massivecraft/massivecore/Multiverse.java
+++ b/src/com/massivecraft/massivecore/Multiverse.java
@@ -27,7 +27,7 @@ public class Multiverse extends Entity<Multiverse>
 	// FIELDS
 	// -------------------------------------------- //
 	
-	protected Map<String, Set<String>> uw = new HashMap<String, Set<String>>();
+	protected Map<String, Set<String>> uw = new HashMap<>();
 	
 	
 	// -------------------------------------------- //
@@ -68,7 +68,7 @@ public class Multiverse extends Entity<Multiverse>
 		Set<String> ret = this.uw.get(universe);
 		if (ret == null)
 		{
-			ret = new HashSet<String>();
+			ret = new HashSet<>();
 			this.uw.put(universe, ret);
 			this.changed();
 		}
@@ -83,7 +83,7 @@ public class Multiverse extends Entity<Multiverse>
 	
 	public Set<String> getUniverses()
 	{
-		Set<String> ret = new TreeSet<String>();
+		Set<String> ret = new TreeSet<>();
 		ret.addAll(this.uw.keySet());
 		ret.add(MassiveCore.DEFAULT);
 		return ret;
@@ -142,7 +142,7 @@ public class Multiverse extends Entity<Multiverse>
 	
 	public Set<String> getWorlds()
 	{
-		Set<String> ret = new TreeSet<String>();
+		Set<String> ret = new TreeSet<>();
 		for (Set<String> uworlds : this.uw.values())
 		{
 			ret.addAll(uworlds);
@@ -155,7 +155,7 @@ public class Multiverse extends Entity<Multiverse>
 		Set<String> orig = this.uw.get(universe);
 		if (orig == null) return null;
 		
-		Set<String> ret = new TreeSet<String>();
+		Set<String> ret = new TreeSet<>();
 		ret.addAll(orig);
 		
 		return ret;
diff --git a/src/com/massivecraft/massivecore/Named.java b/src/com/massivecraft/massivecore/Named.java
index cd635eab..82e512af 100644
--- a/src/com/massivecraft/massivecore/Named.java
+++ b/src/com/massivecraft/massivecore/Named.java
@@ -2,5 +2,5 @@ package com.massivecraft.massivecore;
 
 public interface Named
 {
-	public String getName();
+	String getName();
 }
diff --git a/src/com/massivecraft/massivecore/PotionEffectWrap.java b/src/com/massivecraft/massivecore/PotionEffectWrap.java
index 118a6183..607c9476 100644
--- a/src/com/massivecraft/massivecore/PotionEffectWrap.java
+++ b/src/com/massivecraft/massivecore/PotionEffectWrap.java
@@ -105,7 +105,7 @@ public class PotionEffectWrap
 	public static List<PotionEffectWrap> getEffects(LivingEntity entity)
 	{
 		// Create Ret
-		List<PotionEffectWrap> ret = new MassiveList<PotionEffectWrap>();
+		List<PotionEffectWrap> ret = new MassiveList<>();
 		
 		// Fill Ret
 		for (PotionEffect potionEffect : entity.getActivePotionEffects())
diff --git a/src/com/massivecraft/massivecore/Prioritized.java b/src/com/massivecraft/massivecore/Prioritized.java
index 4c50837c..bc2fd0ca 100644
--- a/src/com/massivecraft/massivecore/Prioritized.java
+++ b/src/com/massivecraft/massivecore/Prioritized.java
@@ -2,5 +2,5 @@ package com.massivecraft.massivecore;
 
 public interface Prioritized
 {
-	public int getPriority();
+	int getPriority();
 }
diff --git a/src/com/massivecraft/massivecore/Progressbar.java b/src/com/massivecraft/massivecore/Progressbar.java
index ecfda517..32d0b2f1 100644
--- a/src/com/massivecraft/massivecore/Progressbar.java
+++ b/src/com/massivecraft/massivecore/Progressbar.java
@@ -126,7 +126,7 @@ public class Progressbar
 	public static List<String> renderList(double quota, int width, String left, String solid, String between, String empty, String right, double solidsPerEmpty, String colorTag, Map<Double, String> roofToColor)
 	{
 		// Create Ret
-		List<String> ret = new ArrayList<String>();
+		List<String> ret = new ArrayList<>();
 		
 		// Ensure between 0 and 1;
 		quota = limit(quota);
diff --git a/src/com/massivecraft/massivecore/Registerable.java b/src/com/massivecraft/massivecore/Registerable.java
index e7c7fda2..064ced48 100644
--- a/src/com/massivecraft/massivecore/Registerable.java
+++ b/src/com/massivecraft/massivecore/Registerable.java
@@ -2,5 +2,5 @@ package com.massivecraft.massivecore;
 
 public interface Registerable
 {
-	public boolean isRegistered();
+	boolean isRegistered();
 }
diff --git a/src/com/massivecraft/massivecore/Triple.java b/src/com/massivecraft/massivecore/Triple.java
index 3311117e..40e74508 100644
--- a/src/com/massivecraft/massivecore/Triple.java
+++ b/src/com/massivecraft/massivecore/Triple.java
@@ -17,13 +17,13 @@ public class Triple<A, B, C> implements Cloneable, Serializable
 	// -------------------------------------------- //
 	
 	private final A first;
-	public A getFirst() { return this.first; };
+	public A getFirst() { return this.first; }
 	
 	private final B second;
-	public B getSecond() { return this.second; };
+	public B getSecond() { return this.second; }
 	
 	private final C third;
-	public C getThird() { return this.third; };
+	public C getThird() { return this.third; }
 	
 	// -------------------------------------------- //
 	// FIELDS: WITH
@@ -55,7 +55,7 @@ public class Triple<A, B, C> implements Cloneable, Serializable
 	
 	public static <A, B, C> Triple<A, B, C> valueOf(A first, B second, C third)
 	{
-		return new Triple<A, B, C>(first, second, third);
+		return new Triple<>(first, second, third);
 	}
 	
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/massivecore/adapter/AdapterEntry.java b/src/com/massivecraft/massivecore/adapter/AdapterEntry.java
index ed7e95a2..8bfce37b 100644
--- a/src/com/massivecraft/massivecore/adapter/AdapterEntry.java
+++ b/src/com/massivecraft/massivecore/adapter/AdapterEntry.java
@@ -71,7 +71,7 @@ public class AdapterEntry implements JsonDeserializer<Entry<?, ?>>, JsonSerializ
 		Object key = context.deserialize(keyJson, keyType);
 		Object value = context.deserialize(valueJson, valueType);
 		
-		return new SimpleEntry<Object, Object>(key, value);
+		return new SimpleEntry<>(key, value);
 	}
 	
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/massivecore/adapter/AdapterLowercaseEnum.java b/src/com/massivecraft/massivecore/adapter/AdapterLowercaseEnum.java
index 20cecaa9..7624baeb 100644
--- a/src/com/massivecraft/massivecore/adapter/AdapterLowercaseEnum.java
+++ b/src/com/massivecraft/massivecore/adapter/AdapterLowercaseEnum.java
@@ -26,7 +26,7 @@ public class AdapterLowercaseEnum<T extends Enum<T>> implements JsonDeserializer
 	
 	public static <T extends Enum<T>> AdapterLowercaseEnum<T> get(Class<T> clazz)
 	{
-		return new AdapterLowercaseEnum<T>(clazz);
+		return new AdapterLowercaseEnum<>(clazz);
 	}
 	
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/massivecore/adapter/AdapterModdedEnumType.java b/src/com/massivecraft/massivecore/adapter/AdapterModdedEnumType.java
index 75f61bbc..1be06649 100644
--- a/src/com/massivecraft/massivecore/adapter/AdapterModdedEnumType.java
+++ b/src/com/massivecraft/massivecore/adapter/AdapterModdedEnumType.java
@@ -41,8 +41,8 @@ import java.util.Map;
  * @author OniBait
  */
 public final class AdapterModdedEnumType<T extends Enum<T>> extends TypeAdapter<T> {
-	private final Map<String, T> nameToConstant = new HashMap<String, T>();
-	private final Map<T, String> constantToName = new HashMap<T, String>();
+	private final Map<String, T> nameToConstant = new HashMap<>();
+	private final Map<T, String> constantToName = new HashMap<>();
 
 	public AdapterModdedEnumType(Class<T> classOfT) {
 		for (T constant : classOfT.getEnumConstants()) {
diff --git a/src/com/massivecraft/massivecore/chestgui/ChestGui.java b/src/com/massivecraft/massivecore/chestgui/ChestGui.java
index 47178095..1b5439fc 100644
--- a/src/com/massivecraft/massivecore/chestgui/ChestGui.java
+++ b/src/com/massivecraft/massivecore/chestgui/ChestGui.java
@@ -71,7 +71,7 @@ public class ChestGui
 	// One could have imagined an approach where we looked at the item instead.
 	// That is however not feasible since the Bukkit ItemStack equals method is not reliable.
 	
-	private Map<Integer, ChestAction> indexToAction = new MassiveMap<Integer, ChestAction>();
+	private Map<Integer, ChestAction> indexToAction = new MassiveMap<>();
 	public Map<Integer, ChestAction> getIndexToAction() { return this.indexToAction; }
 	public ChestAction removeAction(ItemStack item) { return this.indexToAction.remove(item); }
 	public ChestAction setAction(int index, ChestAction action) { return this.indexToAction.put(index, action); }
diff --git a/src/com/massivecraft/massivecore/collections/ExceptionSet.java b/src/com/massivecraft/massivecore/collections/ExceptionSet.java
index 3b49eb62..53c4e810 100644
--- a/src/com/massivecraft/massivecore/collections/ExceptionSet.java
+++ b/src/com/massivecraft/massivecore/collections/ExceptionSet.java
@@ -37,7 +37,7 @@ public class ExceptionSet
 	}
 	
 	@SafeVarargs
-	public <O extends Object> ExceptionSet(boolean standard, O... exceptions)
+	public <O> ExceptionSet(boolean standard, O... exceptions)
 	{
 		this.standard = standard;
 		if (exceptions.length == 0) return;
@@ -49,7 +49,7 @@ public class ExceptionSet
 	// CONTAINS
 	// -------------------------------------------- //
 	
-	public <O extends Object> boolean contains(O object)
+	public <O> boolean contains(O object)
 	{
 		if (object == null) return ! this.standard;
 		String string = stringify(object);
diff --git a/src/com/massivecraft/massivecore/collections/MassiveMap.java b/src/com/massivecraft/massivecore/collections/MassiveMap.java
index 05ef2f9e..4a99adfc 100644
--- a/src/com/massivecraft/massivecore/collections/MassiveMap.java
+++ b/src/com/massivecraft/massivecore/collections/MassiveMap.java
@@ -64,7 +64,7 @@ public class MassiveMap<K, V> extends LinkedHashMap<K, V>
 	@SuppressWarnings("unchecked")
 	public static <K, V> MassiveMap<K, V> varargCreate(K key1, V value1, Object... objects)
 	{
-		MassiveMap<K, V> ret = new MassiveMap<K, V>();
+		MassiveMap<K, V> ret = new MassiveMap<>();
 		
 		ret.put(key1, value1);
 		
diff --git a/src/com/massivecraft/massivecore/collections/WorldExceptionSet.java b/src/com/massivecraft/massivecore/collections/WorldExceptionSet.java
index d7482d19..419b505b 100644
--- a/src/com/massivecraft/massivecore/collections/WorldExceptionSet.java
+++ b/src/com/massivecraft/massivecore/collections/WorldExceptionSet.java
@@ -22,7 +22,7 @@ public class WorldExceptionSet extends ExceptionSet
 	}
 	
 	@SafeVarargs
-	public <O extends Object> WorldExceptionSet(boolean standard, O... exceptions)
+	public <O> WorldExceptionSet(boolean standard, O... exceptions)
 	{
 		super(standard, exceptions);
 	}
diff --git a/src/com/massivecraft/massivecore/command/MassiveCommand.java b/src/com/massivecraft/massivecore/command/MassiveCommand.java
index 940146f6..849a48fb 100644
--- a/src/com/massivecraft/massivecore/command/MassiveCommand.java
+++ b/src/com/massivecraft/massivecore/command/MassiveCommand.java
@@ -402,7 +402,7 @@ public class MassiveCommand implements Active, PluginIdentifiableCommand
 	public Map<String, MassiveCommand> getChildMatches(String token, boolean levenshtein, CommandSender onlyRelevantToSender)
 	{
 		// Create Ret
-		Map<String, MassiveCommand> ret = new MassiveMap<String, MassiveCommand>();
+		Map<String, MassiveCommand> ret = new MassiveMap<>();
 		
 		// Prepare
 		token = token.toLowerCase();
@@ -419,7 +419,7 @@ public class MassiveCommand implements Active, PluginIdentifiableCommand
 				// ... consider exact priority ...
 				if (alias.equalsIgnoreCase(token))
 				{
-					return new MassiveMap<String, MassiveCommand>(alias, child);
+					return new MassiveMap<>(alias, child);
 				}
 				
 				// ... matches ...
@@ -500,7 +500,7 @@ public class MassiveCommand implements Active, PluginIdentifiableCommand
 	public List<String> getAliases() { return this.aliases; }
 	
 	@SuppressWarnings("unchecked")
-	public <T extends MassiveCommand> T setAliases(Collection<String> aliases) { this.aliases = new MassiveList<String>(aliases); return (T) this; }
+	public <T extends MassiveCommand> T setAliases(Collection<String> aliases) { this.aliases = new MassiveList<>(aliases); return (T) this; }
 	public <T extends MassiveCommand> T setAliases(String... aliases) { return this.setAliases(Arrays.asList(aliases)); }
 	
 	@SuppressWarnings("unchecked")
@@ -616,7 +616,7 @@ public class MassiveCommand implements Active, PluginIdentifiableCommand
 	// All
 	public <T> Parameter<T> addParameter(T defaultValue, Type<T> type, boolean requiredFromConsole, String name, String defaultDesc, boolean concatFromHere)
 	{
-		return this.addParameter(new Parameter<T>(defaultValue, type, requiredFromConsole, name, defaultDesc), concatFromHere);
+		return this.addParameter(new Parameter<>(defaultValue, type, requiredFromConsole, name, defaultDesc), concatFromHere);
 	}
 	
 	// WITHOUT 1
@@ -624,25 +624,25 @@ public class MassiveCommand implements Active, PluginIdentifiableCommand
 	// Without defaultValue
 	public <T> Parameter<T> addParameter(Type<T> type, boolean requiredFromConsole, String name, String defaultDesc, boolean concatFromHere)
 	{
-		return this.addParameter(new Parameter<T>(type, requiredFromConsole, name, defaultDesc), concatFromHere);
+		return this.addParameter(new Parameter<>(type, requiredFromConsole, name, defaultDesc), concatFromHere);
 	}
 	
 	// Without reqFromConsole.
 	public <T> Parameter<T> addParameter(T defaultValue, Type<T> type, String name, String defaultDesc, boolean concatFromHere)
 	{
-		return this.addParameter(new Parameter<T>(defaultValue, type, name, defaultDesc),  concatFromHere);
+		return this.addParameter(new Parameter<>(defaultValue, type, name, defaultDesc),  concatFromHere);
 	}
 
 	// Without defaultDesc.
 	public <T> Parameter<T> addParameter(T defaultValue, Type<T> type, boolean requiredFromConsole, String name, boolean concatFromHere)
 	{
-		return this.addParameter(new Parameter<T>(defaultValue, type, requiredFromConsole, name), concatFromHere);
+		return this.addParameter(new Parameter<>(defaultValue, type, requiredFromConsole, name), concatFromHere);
 	}
 	
 	// Without concat.
 	public <T> Parameter<T> addParameter(T defaultValue, Type<T> type, boolean requiredFromConsole, String name, String defaultDesc)
 	{
-		return this.addParameter(new Parameter<T>(defaultValue, type, requiredFromConsole, name, defaultDesc), false);
+		return this.addParameter(new Parameter<>(defaultValue, type, requiredFromConsole, name, defaultDesc), false);
 	}
 	
 	// WITHOUT 2
@@ -650,37 +650,37 @@ public class MassiveCommand implements Active, PluginIdentifiableCommand
 	// Without defaultValue & reqFromConsole
 	public <T> Parameter<T> addParameter(Type<T> type, String name, String defaultDesc, boolean concatFromHere)
 	{
-		return this.addParameter(new Parameter<T>(type, name, defaultDesc), concatFromHere);
+		return this.addParameter(new Parameter<>(type, name, defaultDesc), concatFromHere);
 	}
 	
 	// Without defaultValue & defaultDesc
 	public <T> Parameter<T> addParameter(Type<T> type, boolean requiredFromConsole, String name, boolean concatFromHere)
 	{
-		return this.addParameter(new Parameter<T>(type, requiredFromConsole, name), concatFromHere);
+		return this.addParameter(new Parameter<>(type, requiredFromConsole, name), concatFromHere);
 	}
 	
 	// Without defaultValue & concat.
 	public <T> Parameter<T> addParameter(Type<T> type, boolean requiredFromConsole, String name, String defaultDesc)
 	{
-		return this.addParameter(new Parameter<T>(type, requiredFromConsole, name, defaultDesc));
+		return this.addParameter(new Parameter<>(type, requiredFromConsole, name, defaultDesc));
 	}
 
 	// Without reqFromConsole & defaultDesc.
 	public <T> Parameter<T> addParameter(T defaultValue, Type<T> type, String name, boolean concatFromHere)
 	{
-		return this.addParameter(new Parameter<T>(defaultValue, type, name), concatFromHere);
+		return this.addParameter(new Parameter<>(defaultValue, type, name), concatFromHere);
 	}
 
 	// Without reqFromConsole & concat.
 	public <T> Parameter<T> addParameter(T defaultValue, Type<T> type, String name, String defaultDesc)
 	{
-		return this.addParameter(new Parameter<T>(defaultValue, type, name, defaultDesc));
+		return this.addParameter(new Parameter<>(defaultValue, type, name, defaultDesc));
 	}
 	
 	// Without defaultDesc & concat.
 	public <T> Parameter<T> addParameter(T defaultValue, Type<T> type, boolean requiredFromConsole, String name)
 	{
-		return this.addParameter(new Parameter<T>(defaultValue, type, requiredFromConsole, name));
+		return this.addParameter(new Parameter<>(defaultValue, type, requiredFromConsole, name));
 	}
 	
 	// WITHOUT 3
@@ -688,25 +688,25 @@ public class MassiveCommand implements Active, PluginIdentifiableCommand
 	// Without defaultValue, reqFromConsole & defaultDesc.
 	public <T> Parameter<T> addParameter(Type<T> type, String name, boolean concatFromHere)
 	{
-		return this.addParameter(new Parameter<T>(type, name), concatFromHere);
+		return this.addParameter(new Parameter<>(type, name), concatFromHere);
 	}
 	
 	// Without defaultValue, reqFromConsole & concat .
 	public <T> Parameter<T> addParameter(Type<T> type, String name, String defaultDesc)
 	{
-		return this.addParameter(new Parameter<T>(type, name, defaultDesc));
+		return this.addParameter(new Parameter<>(type, name, defaultDesc));
 	}
 	
 	// Without defaultValue, defaultDesc & concat .
 	public <T> Parameter<T> addParameter(Type<T> type, boolean requiredFromConsole, String name)
 	{
-		return this.addParameter(new Parameter<T>(type, requiredFromConsole, name));
+		return this.addParameter(new Parameter<>(type, requiredFromConsole, name));
 	}
 	
 	// Without reqFromConsole, defaultDesc & concat .
 	public <T> Parameter<T> addParameter(T defaultValue, Type<T> type, String name)
 	{
-		return this.addParameter(new Parameter<T>(defaultValue, type, name));
+		return this.addParameter(new Parameter<>(defaultValue, type, name));
 	}
 	
 	// WITHOUT 4
@@ -714,13 +714,13 @@ public class MassiveCommand implements Active, PluginIdentifiableCommand
 	// Without defaultValue, reqFromConsole, defaultDesc & concat.
 	public <T> Parameter<T> addParameter(Type<T> type, String name)
 	{
-		return this.addParameter(new Parameter<T>(type, name));
+		return this.addParameter(new Parameter<>(type, name));
 	}
 	
 	// Without defaultValue, name, reqFromConsole & defaultDesc.
 	public <T> Parameter<T> addParameter(Type<T> type, boolean concatFromHere)
 	{
-		return this.addParameter(new Parameter<T>(type), concatFromHere);
+		return this.addParameter(new Parameter<>(type), concatFromHere);
 	}
 	
 	// Without 5
@@ -728,7 +728,7 @@ public class MassiveCommand implements Active, PluginIdentifiableCommand
 	// Without defaultValue, name, reqFromConsole, defaultDesc & concat.
 	public <T> Parameter<T> addParameter(Type<T> type)
 	{
-		return this.addParameter(new Parameter<T>(type));
+		return this.addParameter(new Parameter<>(type));
 	}
 	
 	// -------------------------------------------- //
@@ -776,7 +776,7 @@ public class MassiveCommand implements Active, PluginIdentifiableCommand
 		if ( ! this.isConcatenating()) return args;
 		
 		// Create Ret
-		List<String> ret = new MassiveList<String>();
+		List<String> ret = new MassiveList<>();
 		
 		// Fill Ret
 		final int maxIdx = Math.min(this.getConcatenationIndex(), args.size());
@@ -1276,7 +1276,7 @@ public class MassiveCommand implements Active, PluginIdentifiableCommand
 	
 	protected List<Mson> getTemplateParameters(CommandSender sender)
 	{
-		List<Mson> ret = new MassiveList<Mson>();
+		List<Mson> ret = new MassiveList<>();
 		
 		for (Parameter<?> parameter : this.getParameters())
 		{
@@ -1384,7 +1384,7 @@ public class MassiveCommand implements Active, PluginIdentifiableCommand
 		}
 
 		// ... else check the children.
-		List<String> ret = new ArrayList<String>();
+		List<String> ret = new ArrayList<>();
 		String token = args.get(args.size()-1).toLowerCase();
 		for (MassiveCommand child : this.getChildren())
 		{
diff --git a/src/com/massivecraft/massivecore/command/MassiveCoreBukkitCommand.java b/src/com/massivecraft/massivecore/command/MassiveCoreBukkitCommand.java
index d1189d67..b12e566c 100644
--- a/src/com/massivecraft/massivecore/command/MassiveCoreBukkitCommand.java
+++ b/src/com/massivecraft/massivecore/command/MassiveCoreBukkitCommand.java
@@ -76,7 +76,7 @@ public class MassiveCoreBukkitCommand extends Command implements PluginIdentifia
 		if (this.getMassiveCommand().isUnsmart())
 		{
 			List<String> oldArgList = ret;
-			ret = new ArrayList<String>(oldArgList.size());
+			ret = new ArrayList<>(oldArgList.size());
 			for (String arg : oldArgList)
 			{
 				ret.add(Txt.removeSmartQuotes(arg));
@@ -127,7 +127,7 @@ public class MassiveCoreBukkitCommand extends Command implements PluginIdentifia
 		if (rawArgs == null) throw new IllegalArgumentException("args must not be null");
 		if (alias == null) throw new IllegalArgumentException("args must not be null");
 		
-		List<String> args = new MassiveList<String>();
+		List<String> args = new MassiveList<>();
 		
 		// When several spaces are next to each other, empty elements in the array will occur.
 		// To avoid such whitespace we do the following
diff --git a/src/com/massivecraft/massivecore/command/Parameter.java b/src/com/massivecraft/massivecore/command/Parameter.java
index 39a12bdb..1142964f 100644
--- a/src/com/massivecraft/massivecore/command/Parameter.java
+++ b/src/com/massivecraft/massivecore/command/Parameter.java
@@ -193,7 +193,7 @@ public class Parameter<T>
 	public static Parameter<Integer> getPage()
 	{
 		// We can't use a singleton because people might want to set a description.
-		return new Parameter<Integer>(1, TypeInteger.get(), "page", "1");
+		return new Parameter<>(1, TypeInteger.get(), "page", "1");
 	}
 	
 }
diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditAbstract.java b/src/com/massivecraft/massivecore/command/editor/CommandEditAbstract.java
index 01c19084..8cef4d42 100644
--- a/src/com/massivecraft/massivecore/command/editor/CommandEditAbstract.java
+++ b/src/com/massivecraft/massivecore/command/editor/CommandEditAbstract.java
@@ -111,7 +111,7 @@ public class CommandEditAbstract<O, V> extends MassiveCommand
 		V before = inherited.getValue();
 		
 		// Event
-		EventMassiveCoreEditorEdit<O, V> event = new EventMassiveCoreEditorEdit<O, V>(this, source, before, after);
+		EventMassiveCoreEditorEdit<O, V> event = new EventMassiveCoreEditorEdit<>(this, source, before, after);
 		event.run();
 		if (event.isCancelled()) return;
 		after = event.getAfter();
diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditContainer.java b/src/com/massivecraft/massivecore/command/editor/CommandEditContainer.java
index 4530225c..dd1ebb30 100644
--- a/src/com/massivecraft/massivecore/command/editor/CommandEditContainer.java
+++ b/src/com/massivecraft/massivecore/command/editor/CommandEditContainer.java
@@ -12,36 +12,36 @@ public class CommandEditContainer<O, V> extends CommandEditAbstract<O, V>
 		super(settings, property, null);
 		
 		// Children
-		this.addChild(new CommandEditShow<O, V>(settings, property));
+		this.addChild(new CommandEditShow<>(settings, property));
 		
 		if (property.isNullable())
 		{
-			this.addChild(new CommandEditCreate<O, V>(settings, property));
-			this.addChild(new CommandEditDelete<O, V>(settings, property));
+			this.addChild(new CommandEditCreate<>(settings, property));
+			this.addChild(new CommandEditDelete<>(settings, property));
 		}
 		
 		if (property.isEditable())
 		{
-			this.addChild(new CommandEditContainerAdd<O, V>(settings, property));
+			this.addChild(new CommandEditContainerAdd<>(settings, property));
 			
 			// These are not suitable for maps.
 			if (property.getValueType().isContainerCollection())
 			{
-				this.addChild(new CommandEditContainerInsert<O, V>(settings, property));
-				this.addChild(new CommandEditContainerSet<O, V>(settings, property));	
+				this.addChild(new CommandEditContainerInsert<>(settings, property));
+				this.addChild(new CommandEditContainerSet<>(settings, property));
 			}
 			
-			this.addChild(new CommandEditContainerRemove<O, V>(settings, property));
-			this.addChild(new CommandEditContainerRemoveIndex<O, V>(settings, property));
+			this.addChild(new CommandEditContainerRemove<>(settings, property));
+			this.addChild(new CommandEditContainerRemoveIndex<>(settings, property));
 			
 			// The container must not be sorted, and must be ordered.
 			if ( ! property.getValueType().isContainerSorted() && property.getValueType().getContainerComparator() == null && property.getValueType().isContainerOrdered())
 			{
-				this.addChild(new CommandEditContainerMove<O, V>(settings, property));
-				this.addChild(new CommandEditContainerSwap<O, V>(settings, property));
+				this.addChild(new CommandEditContainerMove<>(settings, property));
+				this.addChild(new CommandEditContainerSwap<>(settings, property));
 			}
 		
-			this.addChild(new CommandEditContainerClear<O, V>(settings, property));
+			this.addChild(new CommandEditContainerClear<>(settings, property));
 		}
 	}
 	
diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerAbstract.java b/src/com/massivecraft/massivecore/command/editor/CommandEditContainerAbstract.java
index f4d9b4f8..f278d34b 100644
--- a/src/com/massivecraft/massivecore/command/editor/CommandEditContainerAbstract.java
+++ b/src/com/massivecraft/massivecore/command/editor/CommandEditContainerAbstract.java
@@ -208,7 +208,7 @@ public abstract class CommandEditContainerAbstract<O, V> extends CommandEditAbst
 		{
 			Object key = this.readElementInner(0);
 			Object value = this.readElementInner(1);
-			return new SimpleImmutableEntry<Object, Object>(key, value);
+			return new SimpleImmutableEntry<>(key, value);
 		}
 	}
 	
diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacks.java b/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacks.java
index 544d62ec..6a825b30 100644
--- a/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacks.java
+++ b/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacks.java
@@ -16,17 +16,17 @@ public class CommandEditItemStacks<O> extends CommandEditAbstract<O, List<ItemSt
 		super(settings, property, true);
 		
 		// Children
-		this.addChild(new CommandEditShow<O, List<ItemStack>>(settings, property));
+		this.addChild(new CommandEditShow<>(settings, property));
 		
 		if (property.isNullable())
 		{
-			this.addChild(new CommandEditCreate<O, List<ItemStack>>(settings, property));
-			this.addChild(new CommandEditDelete<O, List<ItemStack>>(settings, property));
+			this.addChild(new CommandEditCreate<>(settings, property));
+			this.addChild(new CommandEditDelete<>(settings, property));
 		}
 		
 		if (property.isEditable())
 		{
-			this.addChild(new CommandEditItemStacksOpen<O>(settings, property));	
+			this.addChild(new CommandEditItemStacksOpen<>(settings, property));
 		}
 	}
 	
diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacksOpen.java b/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacksOpen.java
index 163ea781..1ec276d1 100644
--- a/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacksOpen.java
+++ b/src/com/massivecraft/massivecore/command/editor/CommandEditItemStacksOpen.java
@@ -43,7 +43,7 @@ public class CommandEditItemStacksOpen<O> extends CommandEditItemStacksAbstract<
 	// EDITING
 	// -------------------------------------------- //
 	
-	protected Set<UUID> playerIds = new MassiveSet<UUID>();
+	protected Set<UUID> playerIds = new MassiveSet<>();
 	
 	public void setEditing(Player player, boolean editing)
 	{
@@ -141,7 +141,7 @@ public class CommandEditItemStacksOpen<O> extends CommandEditItemStacksAbstract<
 		if (inventory == null) return null;
 		
 		// Create Ret
-		List<ItemStack> ret = new MassiveList<ItemStack>();
+		List<ItemStack> ret = new MassiveList<>();
 		
 		// Fill Ret
 		for (int i = 0; i < inventory.getSize(); i++)
diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditSingleton.java b/src/com/massivecraft/massivecore/command/editor/CommandEditSingleton.java
index b0d87e39..99736b56 100644
--- a/src/com/massivecraft/massivecore/command/editor/CommandEditSingleton.java
+++ b/src/com/massivecraft/massivecore/command/editor/CommandEditSingleton.java
@@ -31,7 +31,7 @@ public class CommandEditSingleton<O> extends CommandEditProperties<O, O>
 	{
 		EditSettings<O> ret = new EditSettings<>(typeObject);
 		
-		PropertyUsed<O> usedProperty = new PropertyUsed<O>(ret, object);
+		PropertyUsed<O> usedProperty = new PropertyUsed<>(ret, object);
 		ret.setUsedProperty(usedProperty);
 		
 		return ret;
diff --git a/src/com/massivecraft/massivecore/command/editor/EditSettings.java b/src/com/massivecraft/massivecore/command/editor/EditSettings.java
index e3b6d254..e2700267 100644
--- a/src/com/massivecraft/massivecore/command/editor/EditSettings.java
+++ b/src/com/massivecraft/massivecore/command/editor/EditSettings.java
@@ -78,7 +78,7 @@ public class EditSettings<O>
 	}
 	protected EditSettings<CommandSender> createUsedSettings()
 	{
-		return new EditSettings<CommandSender>(TypeSender.get(), new PropertyThis<CommandSender>(TypeSender.get()));
+		return new EditSettings<>(TypeSender.get(), new PropertyThis<>(TypeSender.get()));
 	}
 	
 	// Requirements to edit the used object.
@@ -164,12 +164,12 @@ public class EditSettings<O>
 	
 	public CommandEditUsed<O> createCommandUsed()
 	{
-		return new CommandEditUsed<O>(this);
+		return new CommandEditUsed<>(this);
 	}
 	
 	public CommandEditShow<O, O> createCommandShow()
 	{
-		return new CommandEditShow<O, O>(this, new PropertyThis<>(this.getObjectType()));
+		return new CommandEditShow<>(this, new PropertyThis<>(this.getObjectType()));
 	}
 	
 	public CommandEditAbstract<O, O> createCommandEdit()
diff --git a/src/com/massivecraft/massivecore/command/editor/Property.java b/src/com/massivecraft/massivecore/command/editor/Property.java
index cdd71eef..5b1d1cd0 100644
--- a/src/com/massivecraft/massivecore/command/editor/Property.java
+++ b/src/com/massivecraft/massivecore/command/editor/Property.java
@@ -62,17 +62,17 @@ public abstract class Property<O, V> implements Named
 	// NAME
 	// -------------------------------------------- //
 	
-	protected List<String> names = new MassiveList<String>();
+	protected List<String> names = new MassiveList<>();
 	public List<String> getNames() { return this.names; }
 	@Override public String getName() { return this.getNames().isEmpty() ? null : this.getNames().get(0); }
-	public void setName(String name) { this.names = new MassiveList<String>(name); }
-	public void setNames(String... names) { this.names = new MassiveList<String>(names); }
+	public void setName(String name) { this.names = new MassiveList<>(name); }
+	public void setNames(String... names) { this.names = new MassiveList<>(names); }
 	
 	// -------------------------------------------- //
 	// REQUIREMENTS
 	// -------------------------------------------- //
 	
-	protected List<Requirement> requirements = new ArrayList<Requirement>();
+	protected List<Requirement> requirements = new ArrayList<>();
 	
 	public List<Requirement> getRequirements() { return this.requirements; }
 	public void setRequirements(List<Requirement> requirements) { this.requirements = requirements; }
@@ -87,7 +87,7 @@ public abstract class Property<O, V> implements Named
 	{
 		this.objectType = objectType;
 		this.valueType = valueType;
-		this.names = new MassiveList<String>(names);
+		this.names = new MassiveList<>(names);
 	}
 	
 	public Property(Type<O> objectType, Type<V> valueType, String... names)
@@ -145,9 +145,9 @@ public abstract class Property<O, V> implements Named
 	
 	public Entry<O, V> getInheritedEntry(O object)
 	{
-		if (object == null) return new SimpleEntry<O, V>(null, null);
+		if (object == null) return new SimpleEntry<>(null, null);
 		V value = this.getValue(object);
-		return new SimpleEntry<O, V>(object, value);
+		return new SimpleEntry<>(object, value);
 	}
 	
 	public O getInheritedObject(O object)
diff --git a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreListcolls.java b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreListcolls.java
index 32f4de5e..515dbb73 100644
--- a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreListcolls.java
+++ b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreStoreListcolls.java
@@ -50,7 +50,7 @@ public class CmdMassiveCoreStoreListcolls extends MassiveCommand
 		}
 		
 		// Prepare
-		Set<String> collnames = new TreeSet<String>(ComparatorNaturalOrder.get());
+		Set<String> collnames = new TreeSet<>(ComparatorNaturalOrder.get());
 		collnames.addAll(db.getCollnames());
 		
 		// Do it!
diff --git a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysAspectList.java b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysAspectList.java
index 74558a5d..556388ea 100644
--- a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysAspectList.java
+++ b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysAspectList.java
@@ -40,12 +40,12 @@ public class CmdMassiveCoreUsysAspectList extends MassiveCommand
 		int page = this.readArg();
 		
 		// Pager Create
-		Pager<Aspect> pager = new Pager<Aspect>(this, "Aspect List", page, AspectColl.get().getAllRegistered(), new Stringifier<Aspect>()
+		Pager<Aspect> pager = new Pager<>(this, "Aspect List", page, AspectColl.get().getAllRegistered(), new Stringifier<Aspect>()
 		{
 			@Override
 			public String toString(Aspect aspect, int index)
 			{
-				return Txt.parse("<h>"+aspect.getId()+" <white>--> <h>"+aspect.getMultiverse().getId());
+				return Txt.parse("<h>" + aspect.getId() + " <white>--> <h>" + aspect.getMultiverse().getId());
 			}
 		}); 
 		
diff --git a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysMultiverseList.java b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysMultiverseList.java
index 129d2906..2cfda5e3 100644
--- a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysMultiverseList.java
+++ b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysMultiverseList.java
@@ -40,12 +40,12 @@ public class CmdMassiveCoreUsysMultiverseList extends MassiveCommand
 		int page = this.readArg();
 		
 		// Pager Create
-		Pager<Multiverse> pager = new Pager<Multiverse>(this, "Multiverse List", page, MultiverseColl.get().getAll(), new Stringifier<Multiverse>()
+		Pager<Multiverse> pager = new Pager<>(this, "Multiverse List", page, MultiverseColl.get().getAll(), new Stringifier<Multiverse>()
 		{
 			@Override
 			public String toString(Multiverse multiverse, int index)
 			{
-				return Txt.parse("<h>"+multiverse.getId()+" <i>has "+Txt.implodeCommaAndDot(multiverse.getUniverses(), "<aqua>%s", "<i>, ", " <i>and ", "<i>."));
+				return Txt.parse("<h>" + multiverse.getId() + " <i>has " + Txt.implodeCommaAndDot(multiverse.getUniverses(), "<aqua>%s", "<i>, ", " <i>and ", "<i>."));
 			}
 		}); 
 		
diff --git a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysMultiverseShow.java b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysMultiverseShow.java
index b07df423..fba82f5e 100644
--- a/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysMultiverseShow.java
+++ b/src/com/massivecraft/massivecore/command/massivecore/CmdMassiveCoreUsysMultiverseShow.java
@@ -60,7 +60,7 @@ public class CmdMassiveCoreUsysMultiverseShow extends MassiveCommand
 	
 	public void msgAspects(List<Aspect> aspects)
 	{
-		List<String> ids = new ArrayList<String>();
+		List<String> ids = new ArrayList<>();
 		for (Aspect aspect : aspects)
 		{
 			ids.add(aspect.getId());
diff --git a/src/com/massivecraft/massivecore/command/requirement/Requirement.java b/src/com/massivecraft/massivecore/command/requirement/Requirement.java
index 887e0c07..ce7f2dd7 100644
--- a/src/com/massivecraft/massivecore/command/requirement/Requirement.java
+++ b/src/com/massivecraft/massivecore/command/requirement/Requirement.java
@@ -6,10 +6,10 @@ import org.bukkit.command.CommandSender;
 
 public interface Requirement extends Predicate<CommandSender>
 {
-	public boolean apply(CommandSender sender, MassiveCommand command);
+	boolean apply(CommandSender sender, MassiveCommand command);
 	
 	// This just composes the error message and does NOT test the requirement at all.
 	
-	public String createErrorMessage(CommandSender sender);
-	public String createErrorMessage(CommandSender sender, MassiveCommand command);
+	String createErrorMessage(CommandSender sender);
+	String createErrorMessage(CommandSender sender, MassiveCommand command);
 }
diff --git a/src/com/massivecraft/massivecore/command/requirement/RequirementAnd.java b/src/com/massivecraft/massivecore/command/requirement/RequirementAnd.java
index dfd6e117..53b9cdbe 100644
--- a/src/com/massivecraft/massivecore/command/requirement/RequirementAnd.java
+++ b/src/com/massivecraft/massivecore/command/requirement/RequirementAnd.java
@@ -26,7 +26,7 @@ public class RequirementAnd extends RequirementAbstract
 	public static RequirementAnd get(Collection<Requirement> requirements) { return new RequirementAnd(requirements); }
 	public RequirementAnd(Collection<Requirement> requirements)
 	{
-		this.requirements = Collections.unmodifiableList(new ArrayList<Requirement>(requirements));
+		this.requirements = Collections.unmodifiableList(new ArrayList<>(requirements));
 	}
 	
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/massivecore/command/type/Type.java b/src/com/massivecraft/massivecore/command/type/Type.java
index 548da853..0ce12d70 100644
--- a/src/com/massivecraft/massivecore/command/type/Type.java
+++ b/src/com/massivecraft/massivecore/command/type/Type.java
@@ -21,111 +21,111 @@ public interface Type<T> extends Named
 	// -------------------------------------------- //
 	
 	// Human friendly name
-	public String getName();
+	String getName();
 	
-	public Class<T> getClazz();
+	Class<T> getClazz();
 	
 	// -------------------------------------------- //
 	// INNER TYPE
 	// -------------------------------------------- //
 	
-	public <I extends Type<?>> List<I> getInnerTypes();
-	public <I extends Type<?>> I getInnerType(int index);
-	public <I extends Type<?>> I getInnerType();
+	<I extends Type<?>> List<I> getInnerTypes();
+	<I extends Type<?>> I getInnerType(int index);
+	<I extends Type<?>> I getInnerType();
 	
-	public void setInnerTypes(Collection<Type<?>> innerTypes);
-	public void setInnerTypes(Type<?>... innerTypes);
-	public void setInnerType(Type<?> innerType);
+	void setInnerTypes(Collection<Type<?>> innerTypes);
+	void setInnerTypes(Type<?>... innerTypes);
+	void setInnerType(Type<?> innerType);
 	
-	public void setUserOrder(List<Integer> userOrder);
-	public void setUserOrder(Integer... userOrder);
-	public List<Integer> getUserOrder();
-	public Integer getIndexUser(int indexTechy);
-	public Integer getIndexTech(int indexUser);
+	void setUserOrder(List<Integer> userOrder);
+	void setUserOrder(Integer... userOrder);
+	List<Integer> getUserOrder();
+	Integer getIndexUser(int indexTechy);
+	Integer getIndexTech(int indexUser);
 	
 	// -------------------------------------------- //
 	// INNER PROPERTY
 	// -------------------------------------------- //
 	
-	public boolean hasInnerProperties();
+	boolean hasInnerProperties();
 	
-	public <I extends Property<T, ?>> List<I> getInnerProperties();
-	public <I extends Property<T, ?>> I getInnerProperty(int index);
+	<I extends Property<T, ?>> List<I> getInnerProperties();
+	<I extends Property<T, ?>> I getInnerProperty(int index);
 	
-	public <I extends Property<T, ?>> void setInnerProperties(Collection<I> innerTypes);
+	<I extends Property<T, ?>> void setInnerProperties(Collection<I> innerTypes);
 	@SuppressWarnings("unchecked")
-	public <I extends Property<T, ?>> void setInnerProperties(I... innerTypes);
+	<I extends Property<T, ?>> void setInnerProperties(I... innerTypes);
 
 	// -------------------------------------------- //
 	// WRITE VISUAL COLOR
 	// -------------------------------------------- //
 	
-	public ChatColor getVisualColor(T value, CommandSender sender);
-	public ChatColor getVisualColor(T value);
-	public void setVisualColor(ChatColor color);
+	ChatColor getVisualColor(T value, CommandSender sender);
+	ChatColor getVisualColor(T value);
+	void setVisualColor(ChatColor color);
 	
 	// -------------------------------------------- //
 	// WRITE SHOW
 	// -------------------------------------------- //
 	// A list of property values.
 	
-	public List<Mson> getShowInner(T value, CommandSender sender);
-	public List<Mson> getShow(T value, CommandSender sender);
-	public List<Mson> getShow(T value);
+	List<Mson> getShowInner(T value, CommandSender sender);
+	List<Mson> getShow(T value, CommandSender sender);
+	List<Mson> getShow(T value);
 	
 	// -------------------------------------------- //
 	// WRITE VISUAL MSON
 	// -------------------------------------------- //
 	// A visual mson.
 	
-	public Mson getVisualMsonInner(T value, CommandSender sender);
-	public Mson getVisualMson(T value, CommandSender sender);
-	public Mson getVisualMson(T value);
+	Mson getVisualMsonInner(T value, CommandSender sender);
+	Mson getVisualMson(T value, CommandSender sender);
+	Mson getVisualMson(T value);
 	
 	// -------------------------------------------- //
 	// WRITE VISUAL
 	// -------------------------------------------- //
 	// A visual and colorful representation. Possibly with added detail such as simple ASCII art.
 	
-	public String getVisualInner(T value, CommandSender sender);
-	public String getVisual(T value, CommandSender sender);
-	public String getVisual(T value);
+	String getVisualInner(T value, CommandSender sender);
+	String getVisual(T value, CommandSender sender);
+	String getVisual(T value);
 
 	// -------------------------------------------- //
 	// WRITE NAME
 	// -------------------------------------------- //
 	// A human friendly but simple representation without color and clutter.
 	
-	public String getNameInner(T value);
-	public String getName(T value);
-	public Set<String> getNamesInner(T value);
-	public Set<String> getNames(T value);
+	String getNameInner(T value);
+	String getName(T value);
+	Set<String> getNamesInner(T value);
+	Set<String> getNames(T value);
 	
 	// -------------------------------------------- //
 	// WRITE ID
 	// -------------------------------------------- //
 	// System identification string. Most times unsuitable for humans. 
 	
-	public String getIdInner(T value);
-	public String getId(T value);
-	public Set<String> getIdsInner(T value);
-	public Set<String> getIds(T value);
+	String getIdInner(T value);
+	String getId(T value);
+	Set<String> getIdsInner(T value);
+	Set<String> getIds(T value);
 	
 	// -------------------------------------------- //
 	// READ
 	// -------------------------------------------- //
 	
-	public T read(String arg, CommandSender sender) throws MassiveException;
-	public T read(CommandSender sender) throws MassiveException;
-	public T read(String arg) throws MassiveException;
-	public T read() throws MassiveException;
+	T read(String arg, CommandSender sender) throws MassiveException;
+	T read(CommandSender sender) throws MassiveException;
+	T read(String arg) throws MassiveException;
+	T read() throws MassiveException;
 
 	// -------------------------------------------- //
 	// VALID
 	// -------------------------------------------- //
 	// Used for arbitrary argument order
 	
-	public boolean isValid(String arg, CommandSender sender);
+	boolean isValid(String arg, CommandSender sender);
 	
 	// -------------------------------------------- //
 	// TAB LIST
@@ -133,48 +133,48 @@ public interface Type<T> extends Named
 	
 	// The sender is the one that tried to tab complete.
 	// The arg is beginning the word they are trying to tab complete.
-	public Collection<String> getTabList(CommandSender sender, String arg);
-	public List<String> getTabListFiltered(CommandSender sender, String arg);
+	Collection<String> getTabList(CommandSender sender, String arg);
+	List<String> getTabListFiltered(CommandSender sender, String arg);
 	
 	// Sometimes we put a space after a tab completion.
 	// That would however not make sense with all Types.
 	// Default is true;
-	public boolean allowSpaceAfterTab();
+	boolean allowSpaceAfterTab();
 	
 	// -------------------------------------------- //
 	// CONTAINER > IS
 	// -------------------------------------------- //
 	
-	public boolean isContainer();
-	public boolean isContainerMap();
-	public boolean isContainerCollection();
+	boolean isContainer();
+	boolean isContainerMap();
+	boolean isContainerCollection();
 	
-	public boolean isContainerIndexed();
-	public boolean isContainerOrdered();
-	public boolean isContainerSorted();
+	boolean isContainerIndexed();
+	boolean isContainerOrdered();
+	boolean isContainerSorted();
 	
 	// -------------------------------------------- //
 	// CONTAINER > COMPARATOR
 	// -------------------------------------------- //
 	
-	public <E> Comparator<E> getContainerComparator();
-	public void setContainerComparator(Comparator<?> container);
+	<E> Comparator<E> getContainerComparator();
+	void setContainerComparator(Comparator<?> container);
 	
-	public <E> List<E> getContainerElementsOrdered(Iterable<E> elements);
-	public <E> List<E> getContainerElementsOrdered(T container);
+	<E> List<E> getContainerElementsOrdered(Iterable<E> elements);
+	<E> List<E> getContainerElementsOrdered(T container);
 	
 	// -------------------------------------------- //
 	// EQUALS
 	// -------------------------------------------- //
 	
-	public boolean equals(T type1, T type2);
-	public boolean equalsInner(T type1, T type2);
+	boolean equals(T type1, T type2);
+	boolean equalsInner(T type1, T type2);
 	
 	// -------------------------------------------- //
 	// EDITOR
 	// -------------------------------------------- //
 	
-	public <O> CommandEditAbstract<O, T> createEditCommand(EditSettings<O> settings, Property<O, T> property);
-	public T createNewInstance();
+	<O> CommandEditAbstract<O, T> createEditCommand(EditSettings<O> settings, Property<O, T> property);
+	T createNewInstance();
 	
 }
diff --git a/src/com/massivecraft/massivecore/command/type/TypeAbstract.java b/src/com/massivecraft/massivecore/command/type/TypeAbstract.java
index aaf0bdc1..24fc47d3 100644
--- a/src/com/massivecraft/massivecore/command/type/TypeAbstract.java
+++ b/src/com/massivecraft/massivecore/command/type/TypeAbstract.java
@@ -108,7 +108,8 @@ public abstract class TypeAbstract<T> implements Type<T>
 	
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override public void setInnerTypes(Collection<Type<?>> innerTypes) { this.innerTypes = new MassiveList(innerTypes); }
-	@Override public void setInnerTypes(Type<?>... innerTypes) { this.setInnerTypes(Arrays.asList(innerTypes)); };
+	@Override public void setInnerTypes(Type<?>... innerTypes) { this.setInnerTypes(Arrays.asList(innerTypes)); }
+	
 	@Override public void setInnerType(Type<?> innerType) { this.setInnerTypes(innerType); }
 	
 	private List<Integer> userOrder = null;
@@ -521,7 +522,7 @@ public abstract class TypeAbstract<T> implements Type<T>
 	
 	private static List<String> withoutPreAndSuffix(List<String> suggestions, String prefix)
 	{
-		LinkedHashSet<String> ret = new LinkedHashSet<String>(suggestions.size());
+		LinkedHashSet<String> ret = new LinkedHashSet<>(suggestions.size());
 		boolean includesPrefix = false; // Sometimes a suggestion is equal to the prefix.
 		for (String suggestion : suggestions)
 		{
@@ -540,7 +541,7 @@ public abstract class TypeAbstract<T> implements Type<T>
 			ret.add(suggestion.substring(prefix.length(), lastIndex));
 		}
 		
-		return new ArrayList<String>(ret);
+		return new ArrayList<>(ret);
 	}
 	
 	// -------------------------------------------- //
@@ -602,11 +603,11 @@ public abstract class TypeAbstract<T> implements Type<T>
 		List<E> ret;
 		if (elements instanceof Collection<?>)
 		{
-			ret = new MassiveList<E>((Collection<E>)elements);
+			ret = new MassiveList<>((Collection<E>) elements);
 		}
 		else
 		{
-			ret = new MassiveList<E>();
+			ret = new MassiveList<>();
 			for (E element : elements)
 			{
 				ret.add(element);
@@ -653,11 +654,11 @@ public abstract class TypeAbstract<T> implements Type<T>
 	{
 		if (this.hasInnerProperties())
 		{
-			return new CommandEditProperties<O, T>(settings, property);
+			return new CommandEditProperties<>(settings, property);
 		}
 		else
 		{
-			return new CommandEditSimple<O, T>(settings, property);	
+			return new CommandEditSimple<>(settings, property);
 		}
 	}
 	
diff --git a/src/com/massivecraft/massivecore/command/type/TypeAbstractChoice.java b/src/com/massivecraft/massivecore/command/type/TypeAbstractChoice.java
index c8924e04..78f90b1a 100644
--- a/src/com/massivecraft/massivecore/command/type/TypeAbstractChoice.java
+++ b/src/com/massivecraft/massivecore/command/type/TypeAbstractChoice.java
@@ -62,7 +62,7 @@ public abstract class TypeAbstractChoice<T> extends TypeAbstract<T> implements A
 	public Collection<T> getAll() { return all; }
 	public void setAll(Collection<T> all)
 	{
-		if (all != null) all = Collections.unmodifiableCollection(new MassiveList<T>(all));
+		if (all != null) all = Collections.unmodifiableCollection(new MassiveList<>(all));
 		this.all = all;
 		
 		if (all == null)
@@ -242,7 +242,7 @@ public abstract class TypeAbstractChoice<T> extends TypeAbstract<T> implements A
 		if ( ! this.isCanSeeOverridden()) return this.getAll();
 		
 		// Create
-		Set<T> ret = new MassiveSet<T>();
+		Set<T> ret = new MassiveSet<>();
 		
 		// Fill
 		for (T value : this.getAll())
@@ -272,7 +272,7 @@ public abstract class TypeAbstractChoice<T> extends TypeAbstract<T> implements A
 	public List<T> getMatches(Map<String, T> options, String arg, boolean levenshtein)
 	{
 		// Create
-		List<T> ret = new MassiveList<T>();
+		List<T> ret = new MassiveList<>();
 		
 		// Prepare
 		arg = this.prepareOptionKey(arg);
@@ -331,7 +331,7 @@ public abstract class TypeAbstractChoice<T> extends TypeAbstract<T> implements A
 	public Map<String, T> createOptions(Iterable<T> all)
 	{
 		// Create
-		Map<String, T> ret = new MassiveMap<String, T>();
+		Map<String, T> ret = new MassiveMap<>();
 		
 		// Fill
 		for (T value : all)
@@ -351,7 +351,7 @@ public abstract class TypeAbstractChoice<T> extends TypeAbstract<T> implements A
 	public List<String> createOptionKeys(T value)
 	{
 		// Create
-		List<String> ret = new MassiveList<String>();
+		List<String> ret = new MassiveList<>();
 		
 		// Fill
 		String string;
@@ -399,7 +399,7 @@ public abstract class TypeAbstractChoice<T> extends TypeAbstract<T> implements A
 	public Set<String> createTabs(CommandSender sender)
 	{
 		// Create
-		Set<String> ret = new MassiveSet<String>();
+		Set<String> ret = new MassiveSet<>();
 		
 		// Fill
 		for (T value : this.getAll(sender))
diff --git a/src/com/massivecraft/massivecore/command/type/TypeAbstractSelect.java b/src/com/massivecraft/massivecore/command/type/TypeAbstractSelect.java
index e4d54406..b2f287c3 100644
--- a/src/com/massivecraft/massivecore/command/type/TypeAbstractSelect.java
+++ b/src/com/massivecraft/massivecore/command/type/TypeAbstractSelect.java
@@ -52,7 +52,7 @@ public abstract class TypeAbstractSelect<T> extends TypeAbstract<T> implements A
 	
 	public Collection<String> altNames(CommandSender sender)
 	{
-		List<String> names = new ArrayList<String>();
+		List<String> names = new ArrayList<>();
 		for (T value : this.getAll(sender))
 		{
 			String name = this.getVisual(value, sender);
@@ -107,7 +107,7 @@ public abstract class TypeAbstractSelect<T> extends TypeAbstract<T> implements A
 		arg = arg.toLowerCase();
 		
 		// Try Levenshtein
-		List<String> matches = new ArrayList<String>();
+		List<String> matches = new ArrayList<>();
 		
 		for (String alias : this.altNames(sender))
 		{
diff --git a/src/com/massivecraft/massivecore/command/type/TypeNullable.java b/src/com/massivecraft/massivecore/command/type/TypeNullable.java
index 3f5de6d4..eda30be0 100644
--- a/src/com/massivecraft/massivecore/command/type/TypeNullable.java
+++ b/src/com/massivecraft/massivecore/command/type/TypeNullable.java
@@ -23,17 +23,17 @@ public class TypeNullable<T> extends TypeWrapper<T>
 	
 	public static <T> TypeNullable<T> get(Type<T> inner, Collection<String> nulls)
 	{
-		return new TypeNullable<T>(inner, nulls);
+		return new TypeNullable<>(inner, nulls);
 	}
 	
 	public static <T> TypeNullable<T> get(Type<T> inner, String... nulls)
 	{
-		return new TypeNullable<T>(inner, nulls);
+		return new TypeNullable<>(inner, nulls);
 	}
 	
 	public static <T> TypeNullable<T> get(Type<T> inner)
 	{
-		return new TypeNullable<T>(inner);
+		return new TypeNullable<>(inner);
 	}
 	
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/massivecore/command/type/TypeStringCommand.java b/src/com/massivecraft/massivecore/command/type/TypeStringCommand.java
index f5be7055..b6b39946 100644
--- a/src/com/massivecraft/massivecore/command/type/TypeStringCommand.java
+++ b/src/com/massivecraft/massivecore/command/type/TypeStringCommand.java
@@ -83,7 +83,7 @@ public class TypeStringCommand extends TypeAbstract<String>
 		List<String> subcompletions = command.tabComplete(sender, alias, Arrays.copyOfRange(args, 1, args.length));
 		
 		String prefix = Txt.implode(Arrays.copyOfRange(args, 0, args.length-1), " ") + " ";
-		List<String> ret = new MassiveList<String>();
+		List<String> ret = new MassiveList<>();
 		
 		for (String subcompletion : subcompletions)
 		{
diff --git a/src/com/massivecraft/massivecore/command/type/TypeTransformer.java b/src/com/massivecraft/massivecore/command/type/TypeTransformer.java
index 01ca0634..01341beb 100644
--- a/src/com/massivecraft/massivecore/command/type/TypeTransformer.java
+++ b/src/com/massivecraft/massivecore/command/type/TypeTransformer.java
@@ -40,7 +40,7 @@ public abstract class TypeTransformer<I, O> extends TypeAbstract<O>
 	public static Set<String> prefix(Set<String> strings)
 	{
 		// Create
-		Set<String> ret = new MassiveSet<String>(strings.size());
+		Set<String> ret = new MassiveSet<>(strings.size());
 		
 		// Fill
 		for (String string : strings)
diff --git a/src/com/massivecraft/massivecore/command/type/TypeWrapper.java b/src/com/massivecraft/massivecore/command/type/TypeWrapper.java
index eff56f1b..a563e4d8 100644
--- a/src/com/massivecraft/massivecore/command/type/TypeWrapper.java
+++ b/src/com/massivecraft/massivecore/command/type/TypeWrapper.java
@@ -78,7 +78,7 @@ public class TypeWrapper<T> extends TypeAbstract<T>
 	@Override
 	public Collection<String> getTabList(CommandSender sender, String arg)
 	{
-		return new MassiveList<String>(this.getInnerType().getTabList(sender, arg));
+		return new MassiveList<>(this.getInnerType().getTabList(sender, arg));
 	}
 	
 	@Override
diff --git a/src/com/massivecraft/massivecore/command/type/combined/TypeCombined.java b/src/com/massivecraft/massivecore/command/type/combined/TypeCombined.java
index d36d0ec4..cc8ae2d6 100644
--- a/src/com/massivecraft/massivecore/command/type/combined/TypeCombined.java
+++ b/src/com/massivecraft/massivecore/command/type/combined/TypeCombined.java
@@ -237,7 +237,7 @@ public abstract class TypeCombined<T> extends TypeAbstract<T>
 	public String getName()
 	{
 		// Create
-		List<String> parts = new MassiveList<String>();
+		List<String> parts = new MassiveList<>();
 		
 		// Fill
 		for (Type<?> type : this.getInnerTypes())
@@ -386,7 +386,7 @@ public abstract class TypeCombined<T> extends TypeAbstract<T>
 	public List<Object> readParts(String arg, CommandSender sender) throws MassiveException
 	{
 		// Create
-		List<Object> ret = new MassiveList<Object>();
+		List<Object> ret = new MassiveList<>();
 		
 		// Fill
 		List<String> innerArgs = this.getArgs(arg);
@@ -417,7 +417,7 @@ public abstract class TypeCombined<T> extends TypeAbstract<T>
 		String innerArg = this.getLastArg(arg);
 		String prefix = arg.substring(0, arg.length() - innerArg.length());
 		List<String> strings = innerType.getTabListFiltered(sender, innerArg);
-		List<String> ret = new MassiveList<String>();
+		List<String> ret = new MassiveList<>();
 		for (String string : strings)
 		{
 			ret.add(prefix + string);
diff --git a/src/com/massivecraft/massivecore/command/type/combined/TypeEntry.java b/src/com/massivecraft/massivecore/command/type/combined/TypeEntry.java
index cde2a691..c259ed00 100644
--- a/src/com/massivecraft/massivecore/command/type/combined/TypeEntry.java
+++ b/src/com/massivecraft/massivecore/command/type/combined/TypeEntry.java
@@ -20,7 +20,7 @@ public class TypeEntry<K, V> extends TypeCombined<Entry<K, V>>
 	// INSTANCE & CONSTRUCT
 	// -------------------------------------------- //
 	
-	public static <K, V> TypeEntry<K, V> get(Type<K> keyType, Type<V> valueType) { return new TypeEntry<K, V>(keyType, valueType); }
+	public static <K, V> TypeEntry<K, V> get(Type<K> keyType, Type<V> valueType) { return new TypeEntry<>(keyType, valueType); }
 	public TypeEntry(Type<K> keyType, Type<V> valueType)
 	{
 		super(Entry.class, keyType, valueType);
diff --git a/src/com/massivecraft/massivecore/command/type/container/TypeBackstringSet.java b/src/com/massivecraft/massivecore/command/type/container/TypeBackstringSet.java
index d1ec1cfa..ba27a759 100644
--- a/src/com/massivecraft/massivecore/command/type/container/TypeBackstringSet.java
+++ b/src/com/massivecraft/massivecore/command/type/container/TypeBackstringSet.java
@@ -19,7 +19,7 @@ public class TypeBackstringSet<E extends Enum<E>> extends TypeContainer<Set<E>,
 	
 	public static <E extends Enum<E>> TypeBackstringSet<E> get(Type<E> innerType)
 	{
-		return new TypeBackstringSet<E>(innerType);
+		return new TypeBackstringSet<>(innerType);
 	}
 	
 	public TypeBackstringSet(Type<E> innerType)
@@ -35,7 +35,7 @@ public class TypeBackstringSet<E extends Enum<E>> extends TypeContainer<Set<E>,
 	@Override
 	public BackstringSet<E> createNewInstance()
 	{
-		return new BackstringSet<E>((Class<E>) innerTypeClass);
+		return new BackstringSet<>((Class<E>) innerTypeClass);
 	}
 
 }
diff --git a/src/com/massivecraft/massivecore/command/type/container/TypeContainer.java b/src/com/massivecraft/massivecore/command/type/container/TypeContainer.java
index 750d002d..4d131fd8 100644
--- a/src/com/massivecraft/massivecore/command/type/container/TypeContainer.java
+++ b/src/com/massivecraft/massivecore/command/type/container/TypeContainer.java
@@ -18,7 +18,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-public abstract class TypeContainer<C extends Object, E> extends TypeAbstract<C>
+public abstract class TypeContainer<C, E> extends TypeAbstract<C>
 {
 	// -------------------------------------------- //
 	// CONSTRUCT
@@ -267,7 +267,7 @@ public abstract class TypeContainer<C extends Object, E> extends TypeAbstract<C>
 	@Override
 	public <O> CommandEditAbstract<O, C> createEditCommand(EditSettings<O> settings, Property<O, C> property)
 	{
-		return new CommandEditContainer<O, C>(settings, property);
+		return new CommandEditContainer<>(settings, property);
 	}
 	
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/massivecore/command/type/container/TypeItemStacks.java b/src/com/massivecraft/massivecore/command/type/container/TypeItemStacks.java
index aac13ed4..171a38f4 100644
--- a/src/com/massivecraft/massivecore/command/type/container/TypeItemStacks.java
+++ b/src/com/massivecraft/massivecore/command/type/container/TypeItemStacks.java
@@ -29,7 +29,7 @@ public class TypeItemStacks extends TypeList<ItemStack>
 	@Override
 	public <O> CommandEditAbstract<O, List<ItemStack>> createEditCommand(EditSettings<O> settings, Property<O, List<ItemStack>> property)
 	{
-		return new CommandEditItemStacks<O>(settings, property);
+		return new CommandEditItemStacks<>(settings, property);
 	}
 	
 }
diff --git a/src/com/massivecraft/massivecore/command/type/container/TypeList.java b/src/com/massivecraft/massivecore/command/type/container/TypeList.java
index f2a3e91c..04970564 100644
--- a/src/com/massivecraft/massivecore/command/type/container/TypeList.java
+++ b/src/com/massivecraft/massivecore/command/type/container/TypeList.java
@@ -13,7 +13,7 @@ public class TypeList<E> extends TypeContainer<List<E>, E>
 	
 	public static <E> TypeList<E> get(Type<E> innerType)
 	{
-		return new TypeList<E>(innerType);
+		return new TypeList<>(innerType);
 	}
 	
 	public TypeList(Type<E> innerType)
@@ -28,7 +28,7 @@ public class TypeList<E> extends TypeContainer<List<E>, E>
 	@Override
 	public List<E> createNewInstance()
 	{
-		return new MassiveList<E>();
+		return new MassiveList<>();
 	}
 
 }
diff --git a/src/com/massivecraft/massivecore/command/type/container/TypeMap.java b/src/com/massivecraft/massivecore/command/type/container/TypeMap.java
index cfd93e6a..095f4f95 100644
--- a/src/com/massivecraft/massivecore/command/type/container/TypeMap.java
+++ b/src/com/massivecraft/massivecore/command/type/container/TypeMap.java
@@ -20,7 +20,7 @@ public class TypeMap<K, V> extends TypeContainer<Map<K, V>, Entry<K, V>>
 	
 	public static <K, V> TypeMap<K, V> get(TypeEntry<K, V> entryType)
 	{
-		return new TypeMap<K, V>(entryType);
+		return new TypeMap<>(entryType);
 	}
 	
 	public TypeMap(TypeEntry<K, V> entryType)
@@ -43,7 +43,7 @@ public class TypeMap<K, V> extends TypeContainer<Map<K, V>, Entry<K, V>>
 	@Override
 	public Map<K, V> createNewInstance()
 	{
-		return new MassiveMap<K, V>();
+		return new MassiveMap<>();
 	}
 
 }
diff --git a/src/com/massivecraft/massivecore/command/type/container/TypeSet.java b/src/com/massivecraft/massivecore/command/type/container/TypeSet.java
index b208af25..2f7ead38 100644
--- a/src/com/massivecraft/massivecore/command/type/container/TypeSet.java
+++ b/src/com/massivecraft/massivecore/command/type/container/TypeSet.java
@@ -13,7 +13,7 @@ public class TypeSet<E> extends TypeContainer<Set<E>, E>
 
 	public static <E> TypeSet<E> get(Type<E> innerType)
 	{
-		return new TypeSet<E>(innerType);
+		return new TypeSet<>(innerType);
 	}
 	
 	public TypeSet(Type<E> innerType)
@@ -28,7 +28,7 @@ public class TypeSet<E> extends TypeContainer<Set<E>, E>
 	@Override
 	public Set<E> createNewInstance()
 	{
-		return new MassiveSet<E>();
+		return new MassiveSet<>();
 	}
 
 }
diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java
index aefba813..708dd0ea 100644
--- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java
+++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java
@@ -25,7 +25,7 @@ public class TypeEntityType extends TypeEnum<EntityType>
 	@Override
 	public Set<String> getNamesInner(EntityType value)
 	{
-		Set<String> ret = new MassiveSet<String>(super.getNamesInner(value));
+		Set<String> ret = new MassiveSet<>(super.getNamesInner(value));
 		
 		if (value == EntityType.PIG_ZOMBIE)
 		{
diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeEnvironment.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeEnvironment.java
index 12840e83..815fc4d4 100644
--- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeEnvironment.java
+++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeEnvironment.java
@@ -25,7 +25,7 @@ public class TypeEnvironment extends TypeEnum<Environment>
 	@Override
 	public Set<String> getNamesInner(Environment value)
 	{
-		Set<String> ret = new MassiveSet<String>(super.getNamesInner(value));
+		Set<String> ret = new MassiveSet<>(super.getNamesInner(value));
 		
 		if (value == Environment.NORMAL)
 		{
diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeGameMode.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeGameMode.java
index 18827f88..92e6d30d 100644
--- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeGameMode.java
+++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeGameMode.java
@@ -25,7 +25,7 @@ public class TypeGameMode extends TypeEnum<GameMode>
 	@Override
 	public Set<String> getIdsInner(GameMode value)
 	{
-		Set<String> ret = new MassiveSet<String>(super.getIdsInner(value));
+		Set<String> ret = new MassiveSet<>(super.getIdsInner(value));
 		
 		int idInt = getIntegerId(value);
 		String idString = String.valueOf(idInt);
diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeMaterial.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeMaterial.java
index 8aa691f2..d592b926 100644
--- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeMaterial.java
+++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeMaterial.java
@@ -26,7 +26,7 @@ public class TypeMaterial extends TypeEnum<Material>
 	@Override
 	public Set<String> getIdsInner(Material value)
 	{
-		Set<String> ret = new MassiveSet<String>(super.getIdsInner(value));
+		Set<String> ret = new MassiveSet<>(super.getIdsInner(value));
 		
 		String id = String.valueOf(value.getId());
 		ret.add(id);
diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeSound.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeSound.java
index c3a43496..f4489a4b 100644
--- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeSound.java
+++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeSound.java
@@ -17,7 +17,7 @@ public class TypeSound extends TypeEnum<Sound>
 	// https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/diff/src/main/java/org/bukkit/Sound.java?until=7898a2a2d2d81308e73e9ed37725f53d7ad37bfc&at=refs%2Fheads%2Fmaster
 	
 	// Maps every sound in Minecraft 1.8 to the new sound in Minecraft 1.9
-	public static Map<String, String> FROM_18_TO_19 = new MassiveMap<String, String>(
+	public static Map<String, String> FROM_18_TO_19 = new MassiveMap<>(
 		"AMBIENCE_CAVE", "AMBIENT_CAVE",
 		"AMBIENCE_RAIN", "WEATHER_RAIN",
 		"AMBIENCE_THUNDER", "ENTITY_LIGHTNING_THUNDER",
@@ -34,14 +34,14 @@ public class TypeSound extends TypeEnum<Sound>
 		"DRINK", "ENTITY_GENERIC_DRINK",
 		"EAT", "ENTITY_GENERIC_EAT",
 		"EXPLODE", "ENTITY_GENERIC_EXPLODE",
-		"FALL_BIG", "ENTITY_GENERIC_BIG_FALL", 
+		"FALL_BIG", "ENTITY_GENERIC_BIG_FALL",
 		"FALL_SMALL", "ENTITY_GENERIC_SMALL_FALL",
-	
+		
 		"FIRE", "BLOCK_FIRE_AMBIENT",
 		"FIRE_IGNITE", "ITEM_FLINTANDSTEEL_USE",
 		"FIZZ", "ENTITY_GENERIC_EXTINGUISH_FIRE",
 		"FUSE", "ENTITY_TNT_PRIMED",
-	
+		
 		"GLASS", "BLOCK_GLASS_BREAK",
 		"HURT_FLESH", "ENTITY_GENERIC_HURT",
 		"ITEM_BREAK", "ENTITY_ITEM_BREAK",
@@ -51,7 +51,7 @@ public class TypeSound extends TypeEnum<Sound>
 		"LEVEL_UP", "ENTITY_PLAYER_LEVELUP",
 		"MINECART_BASE", "ENTITY_MINECART_RIDING",
 		"MINECART_INSIDE", "ENTITY_MINECART_INSIDE",
-	
+		
 		"NOTE_BASS", "BLOCK_NOTE_BASS", // NOTE: Duplicate since 1 less sound in 1.9.
 		"NOTE_PIANO", "BLOCK_NOTE_HARP",
 		"NOTE_BASS_DRUM", "BLOCK_NOTE_BASEDRUM",
@@ -59,7 +59,7 @@ public class TypeSound extends TypeEnum<Sound>
 		"NOTE_BASS_GUITAR", "BLOCK_NOTE_BASS", // NOTE: Duplicate since 1 less sound in 1.9.
 		"NOTE_SNARE_DRUM", "BLOCK_NOTE_SNARE",
 		"NOTE_PLING", "BLOCK_NOTE_PLING",
-	
+		
 		"ORB_PICKUP", "ENTITY_EXPERIENCE_ORB_PICKUP",
 		"PISTON_EXTEND", "BLOCK_PISTON_EXTEND",
 		"PISTON_RETRACT", "BLOCK_PISTON_CONTRACT",
@@ -77,51 +77,51 @@ public class TypeSound extends TypeEnum<Sound>
 		"STEP_STONE", "BLOCK_STONE_STEP",
 		"STEP_WOOD", "BLOCK_WOOD_STEP",
 		"STEP_WOOL", "BLOCK_CLOTH_STEP",
-		"SWIM", "ENTITY_GENERIC_SWIM", 
-		"WATER", "BLOCK_WATER_AMBIENT", 
+		"SWIM", "ENTITY_GENERIC_SWIM",
+		"WATER", "BLOCK_WATER_AMBIENT",
 		"WOOD_CLICK", "BLOCK_WOOD_BUTTON_CLICK_ON",
-	
+		
 		// Mob sounds
 		"BAT_DEATH", "ENTITY_BAT_DEATH",
 		"BAT_HURT", "ENTITY_BAT_HURT",
 		"BAT_IDLE", "ENTITY_BAT_AMBIENT",
 		"BAT_LOOP", "ENTITY_BAT_LOOP",
 		"BAT_TAKEOFF", "ENTITY_BAT_TAKEOFF",
-	
+		
 		"BLAZE_BREATH", "ENTITY_BLAZE_AMBIENT",
 		"BLAZE_DEATH", "ENTITY_BLAZE_DEATH",
 		"BLAZE_HIT", "ENTITY_BLAZE_HURT",
-	
+		
 		"CAT_HISS", "ENTITY_CAT_HISS",
 		"CAT_HIT", "ENTITY_CAT_HURT",
 		"CAT_MEOW", "ENTITY_CAT_AMBIENT",
 		"CAT_PURR", "ENTITY_CAT_PURR",
 		"CAT_PURREOW", "ENTITY_CAT_PURREOW",
-	
+		
 		"CHICKEN_IDLE", "ENTITY_CHICKEN_AMBIENT",
 		"CHICKEN_HURT", "ENTITY_CHICKEN_HURT",
 		"CHICKEN_EGG_POP", "ENTITY_CHICKEN_EGG",
 		"CHICKEN_WALK", "ENTITY_CHICKEN_STEP",
-	
+		
 		"COW_IDLE", "ENTITY_COW_AMBIENT",
 		"COW_HURT", "ENTITY_COW_HURT",
 		"COW_WALK", "ENTITY_COW_STEP",
-	
+		
 		"CREEPER_HISS", "ENTITY_CREEPER_PRIMED",
 		"CREEPER_DEATH", "ENTITY_CREEPER_DEATH",
-	
+		
 		"ENDERDRAGON_DEATH", "ENTITY_ENDERDRAGON_DEATH",
 		"ENDERDRAGON_GROWL", "ENTITY_ENDERDRAGON_GROWL",
 		"ENDERDRAGON_HIT", "ENTITY_ENDERDRAGON_HURT",
 		"ENDERDRAGON_WINGS", "ENTITY_ENDERDRAGON_FLAP",
-	
+		
 		"ENDERMAN_DEATH", "ENTITY_ENDERMEN_DEATH",
 		"ENDERMAN_HIT", "ENTITY_ENDERMEN_HURT",
 		"ENDERMAN_IDLE", "ENTITY_ENDERMEN_AMBIENT",
 		"ENDERMAN_TELEPORT", "ENTITY_ENDERMEN_TELEPORT",
 		"ENDERMAN_SCREAM", "ENTITY_ENDERMEN_SCREAM",
 		"ENDERMAN_STARE", "ENTITY_ENDERMEN_STARE",
-	
+		
 		// Really unsure about all of these
 		"GHAST_SCREAM", "ENTITY_GHAST_AMBIENT",
 		"GHAST_SCREAM2", "ENTITY_GHAST_SCREAM",
@@ -129,48 +129,48 @@ public class TypeSound extends TypeEnum<Sound>
 		"GHAST_DEATH", "ENTITY_GHAST_DEATH",
 		"GHAST_FIREBALL", "ENTITY_GHAST_SHOOT",
 		"GHAST_MOAN", "ENTITY_GHAST_HURT",
-	
+		
 		"IRONGOLEM_DEATH", "ENTITY_IRONGOLEM_DEATH",
 		"IRONGOLEM_HIT", "ENTITY_IRONGOLEM_HURT",
 		"IRONGOLEM_THROW", "ENTITY_IRONGOLEM_ATTACK",
 		"IRONGOLEM_WALK", "ENTITY_IRONGOLEM_STEP",
-	
+		
 		"MAGMACUBE_WALK", "ENTITY_MAGMACUBE_SQUISH", // TODO: This is a wild guess.
 		"MAGMACUBE_WALK2", "ENTITY_MAGMACUBE_HURT", // TODO: This is a wild guess.
 		"MAGMACUBE_JUMP", "ENTITY_MAGMACUBE_JUMP",
-	
-		"PIG_IDLE", "ENTITY_PIG_AMBIENT", 
+		
+		"PIG_IDLE", "ENTITY_PIG_AMBIENT",
 		"PIG_DEATH", "ENTITY_PIG_DEATH",
 		"PIG_WALK", "ENTITY_PIG_STEP",
-	
-		"SHEEP_IDLE", "ENTITY_SHEEP_AMBIENT", 
-		"SHEEP_SHEAR", "ENTITY_SHEEP_SHEAR", 
-		"SHEEP_WALK", "ENTITY_SHEEP_STEP", 
-	
+		
+		"SHEEP_IDLE", "ENTITY_SHEEP_AMBIENT",
+		"SHEEP_SHEAR", "ENTITY_SHEEP_SHEAR",
+		"SHEEP_WALK", "ENTITY_SHEEP_STEP",
+		
 		"SILVERFISH_HIT", "ENTITY_SILVERFISH_HURT",
 		"SILVERFISH_KILL", "ENTITY_SILVERFISH_DEATH",
-		"SILVERFISH_IDLE", "ENTITY_SILVERFISH_AMBIENT", 
-		"SILVERFISH_WALK", "ENTITY_SILVERFISH_STEP", 
-	
-		"SKELETON_IDLE", "ENTITY_SKELETON_AMBIENT", 
+		"SILVERFISH_IDLE", "ENTITY_SILVERFISH_AMBIENT",
+		"SILVERFISH_WALK", "ENTITY_SILVERFISH_STEP",
+		
+		"SKELETON_IDLE", "ENTITY_SKELETON_AMBIENT",
 		"SKELETON_DEATH", "ENTITY_SKELETON_DEATH",
 		"SKELETON_HURT", "ENTITY_SKELETON_HURT",
-		"SKELETON_WALK", "ENTITY_SKELETON_STEP", 
-	
+		"SKELETON_WALK", "ENTITY_SKELETON_STEP",
+		
 		"SLIME_ATTACK", "ENTITY_SLIME_ATTACK",
-		"SLIME_WALK", "ENTITY_SLIME_SQUISH", 
+		"SLIME_WALK", "ENTITY_SLIME_SQUISH",
 		"SLIME_WALK2", "ENTITY_SLIME_JUMP",
-	
-		"SPIDER_IDLE", "ENTITY_SPIDER_AMBIENT", 
-		"SPIDER_DEATH", "ENTITY_SPIDER_DEATH", 
+		
+		"SPIDER_IDLE", "ENTITY_SPIDER_AMBIENT",
+		"SPIDER_DEATH", "ENTITY_SPIDER_DEATH",
 		"SPIDER_WALK", "ENTITY_SPIDER_STEP",
-	
+		
 		"WITHER_DEATH", "ENTITY_WITHER_DEATH",
 		"WITHER_HURT", "ENTITY_WITHER_HURT",
-		"WITHER_IDLE", "ENTITY_WITHER_AMBIENT", 
+		"WITHER_IDLE", "ENTITY_WITHER_AMBIENT",
 		"WITHER_SHOOT", "ENTITY_WITHER_SHOOT",
 		"WITHER_SPAWN", "ENTITY_WITHER_SPAWN",
-	
+		
 		"WOLF_BARK", "ENTITY_WOLF_AMBIENT",
 		"WOLF_DEATH", "ENTITY_WOLF_DEATH",
 		"WOLF_GROWL", "ENTITY_WOLF_GROWL",
@@ -180,7 +180,7 @@ public class TypeSound extends TypeEnum<Sound>
 		"WOLF_SHAKE", "ENTITY_WOLF_SHAKE",
 		"WOLF_WALK", "ENTITY_WOLF_STEP",
 		"WOLF_WHINE", "ENTITY_WOLF_WHINE",
-	
+		
 		"ZOMBIE_METAL", "ENTITY_ZOMBIE_ATTACK_IRON_DOOR",
 		"ZOMBIE_WOOD", "ENTITY_ZOMBIE_ATTACK_DOOR_WOOD",
 		"ZOMBIE_WOODBREAK", "ENTITY_ZOMBIE_BREAK_DOOR_WOOD",
@@ -191,12 +191,12 @@ public class TypeSound extends TypeEnum<Sound>
 		"ZOMBIE_UNFECT", "ENTITY_ZOMBIE_VILLAGER_CONVERTED", // TODO: I'm not sure about this one.
 		"ZOMBIE_REMEDY", "ENTITY_ZOMBIE_VILLAGER_CURE", // TODO: I'm not sure about this one.
 		"ZOMBIE_WALK", "ENTITY_ZOMBIE_STEP",
-	
+		
 		"ZOMBIE_PIG_IDLE", "ENTITY_ZOMBIE_PIG_AMBIENT",
 		"ZOMBIE_PIG_ANGRY", "ENTITY_ZOMBIE_PIG_ANGRY",
 		"ZOMBIE_PIG_DEATH", "ENTITY_ZOMBIE_PIG_DEATH",
 		"ZOMBIE_PIG_HURT", "ENTITY_ZOMBIE_PIG_HURT",
-	
+		
 		// Dig Sounds
 		"DIG_WOOL", "BLOCK_CLOTH_BREAK",
 		"DIG_GRASS", "BLOCK_GRASS_BREAK",
@@ -205,7 +205,7 @@ public class TypeSound extends TypeEnum<Sound>
 		"DIG_SNOW", "BLOCK_SNOW_BREAK",
 		"DIG_STONE", "BLOCK_STONE_BREAK",
 		"DIG_WOOD", "BLOCK_WOOD_BREAK",
-	
+		
 		// Fireworks
 		"FIREWORK_BLAST", "ENTITY_FIREWORK_BLAST",
 		"FIREWORK_BLAST2", "ENTITY_FIREWORK_BLAST_FAR",
@@ -215,7 +215,7 @@ public class TypeSound extends TypeEnum<Sound>
 		"FIREWORK_TWINKLE2", "ENTITY_FIREWORK_TWINKLE_FAR",
 		"FIREWORK_LAUNCH", "ENTITY_FIREWORK_LAUNCH",
 		"SUCCESSFUL_HIT", "ENTITY_FIREWORK_SHOOT",
-	
+		
 		// Horses
 		"HORSE_ANGRY", "ENTITY_HORSE_ANGRY",
 		"HORSE_ARMOR", "ENTITY_HORSE_ARMOR",
@@ -229,20 +229,20 @@ public class TypeSound extends TypeEnum<Sound>
 		"HORSE_SADDLE", "ENTITY_HORSE_SADDLE",
 		"HORSE_SOFT", "ENTITY_HORSE_STEP",
 		"HORSE_WOOD", "ENTITY_HORSE_STEP_WOOD",
-	
+		
 		"DONKEY_ANGRY", "ENTITY_DONKEY_ANGRY",
 		"DONKEY_DEATH", "ENTITY_DONKEY_DEATH",
 		"DONKEY_HIT", "ENTITY_DONKEY_HURT",
 		"DONKEY_IDLE", "ENTITY_DONKEY_AMBIENT",
-	
+		
 		"HORSE_SKELETON_DEATH", "ENTITY_SKELETON_HORSE_DEATH",
 		"HORSE_SKELETON_HIT", "ENTITY_SKELETON_HORSE_HURT",
 		"HORSE_SKELETON_IDLE", "ENTITY_SKELETON_HORSE_AMBIENT",
-	
+		
 		"HORSE_ZOMBIE_DEATH", "ENTITY_ZOMBIE_HORSE_DEATH",
 		"HORSE_ZOMBIE_HIT", "ENTITY_ZOMBIE_HORSE_HURT",
 		"HORSE_ZOMBIE_IDLE", "ENTITY_ZOMBIE_HORSE_AMBIENT",
-	
+		
 		// Villager
 		"VILLAGER_DEATH", "ENTITY_VILLAGER_DEATH",
 		"VILLAGER_HAGGLE", "ENTITY_VILLAGER_TRADING",
@@ -302,7 +302,7 @@ public class TypeSound extends TypeEnum<Sound>
 	public Set<String> getIdsInner(Sound value)
 	{
 		// Create
-		Set<String> ret = new MassiveSet<String>();
+		Set<String> ret = new MassiveSet<>();
 		
 		// Fill
 		String current = value.name();
diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeWeatherType.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeWeatherType.java
index e4354732..056cef24 100644
--- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeWeatherType.java
+++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeWeatherType.java
@@ -46,7 +46,7 @@ public class TypeWeatherType extends TypeEnum<WeatherType>
 	@Override
 	public Set<String> getNamesInner(WeatherType value)
 	{
-		Set<String> ret = new MassiveSet<String>();
+		Set<String> ret = new MassiveSet<>();
 		
 		switch (value)
 		{
diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java
index 90ceb036..ff787704 100644
--- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java
+++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java
@@ -25,7 +25,7 @@ public class TypeWorldType extends TypeEnum<WorldType>
 	@Override
 	public Set<String> getNamesInner(WorldType value)
 	{
-		Set<String> ret = new MassiveSet<String>(super.getNamesInner(value));
+		Set<String> ret = new MassiveSet<>(super.getNamesInner(value));
 		
 		if (value == WorldType.NORMAL)
 		{
diff --git a/src/com/massivecraft/massivecore/command/type/primitive/TypeBooleanAbstract.java b/src/com/massivecraft/massivecore/command/type/primitive/TypeBooleanAbstract.java
index 4eab281e..0749231d 100644
--- a/src/com/massivecraft/massivecore/command/type/primitive/TypeBooleanAbstract.java
+++ b/src/com/massivecraft/massivecore/command/type/primitive/TypeBooleanAbstract.java
@@ -21,13 +21,13 @@ public abstract class TypeBooleanAbstract extends TypeAbstractChoice<Boolean>
 	public static final String NAME_FALSE = "False";
 	public static final String NAME_OFF = "Off";
 	
-	public static final Set<String> NAMES_TRUE = new MassiveSet<String>(
+	public static final Set<String> NAMES_TRUE = new MassiveSet<>(
 		NAME_YES,
 		NAME_TRUE,
 		NAME_ON
 	);
 	
-	public static final Set<String> NAMES_FALSE = new MassiveSet<String>(
+	public static final Set<String> NAMES_FALSE = new MassiveSet<>(
 		NAME_NO,
 		NAME_FALSE,
 		NAME_OFF
@@ -86,7 +86,7 @@ public abstract class TypeBooleanAbstract extends TypeAbstractChoice<Boolean>
 	public Set<String> getNamesInner(Boolean value)
 	{
 		// Create
-		Set<String> ret = new MassiveSet<String>();
+		Set<String> ret = new MassiveSet<>();
 		
 		// Fill
 		ret.add(this.getNameInner(value));
diff --git a/src/com/massivecraft/massivecore/command/type/primitive/TypeObject.java b/src/com/massivecraft/massivecore/command/type/primitive/TypeObject.java
index 3aae578e..88ec1a47 100644
--- a/src/com/massivecraft/massivecore/command/type/primitive/TypeObject.java
+++ b/src/com/massivecraft/massivecore/command/type/primitive/TypeObject.java
@@ -21,7 +21,7 @@ public class TypeObject<T> extends TypeAbstract<T>
 	@SuppressWarnings("unchecked")
 	public static <T> TypeObject<T> get() { return (TypeObject<T>) i; }*/
 	
-	public static <T> TypeObject<T> get(Class<T> clazz) { return new TypeObject<T>(clazz); }
+	public static <T> TypeObject<T> get(Class<T> clazz) { return new TypeObject<>(clazz); }
 	
 	public TypeObject(Class<T> clazz)
 	{
diff --git a/src/com/massivecraft/massivecore/command/type/sender/TypeSenderEntity.java b/src/com/massivecraft/massivecore/command/type/sender/TypeSenderEntity.java
index a72c0fc3..acb3f671 100644
--- a/src/com/massivecraft/massivecore/command/type/sender/TypeSenderEntity.java
+++ b/src/com/massivecraft/massivecore/command/type/sender/TypeSenderEntity.java
@@ -46,10 +46,10 @@ public class TypeSenderEntity<T extends SenderEntity<T>> extends TypeSenderIdAbs
 	// GET
 	// -------------------------------------------- //
 	
-	public static <T extends SenderEntity<T>> TypeSenderEntity<T> get(SenderColl<T> coll, SenderPresence presence, SenderType type) { return new TypeSenderEntity<T>(coll, presence, type); }
-	public static <T extends SenderEntity<T>> TypeSenderEntity<T> get(SenderColl<T> coll, SenderPresence presence) { return new TypeSenderEntity<T>(coll, presence); }
-	public static <T extends SenderEntity<T>> TypeSenderEntity<T> get(SenderColl<T> coll, SenderType type) { return new TypeSenderEntity<T>(coll, type); }
-	public static <T extends SenderEntity<T>> TypeSenderEntity<T> get(SenderColl<T> coll) { return new TypeSenderEntity<T>(coll); }
+	public static <T extends SenderEntity<T>> TypeSenderEntity<T> get(SenderColl<T> coll, SenderPresence presence, SenderType type) { return new TypeSenderEntity<>(coll, presence, type); }
+	public static <T extends SenderEntity<T>> TypeSenderEntity<T> get(SenderColl<T> coll, SenderPresence presence) { return new TypeSenderEntity<>(coll, presence); }
+	public static <T extends SenderEntity<T>> TypeSenderEntity<T> get(SenderColl<T> coll, SenderType type) { return new TypeSenderEntity<>(coll, type); }
+	public static <T extends SenderEntity<T>> TypeSenderEntity<T> get(SenderColl<T> coll) { return new TypeSenderEntity<>(coll); }
 	
 	// -------------------------------------------- //
 	// OVERRIDE
diff --git a/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java b/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java
index d004a7e9..a43ebcb0 100644
--- a/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java
+++ b/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java
@@ -166,7 +166,7 @@ public abstract class TypeSenderIdAbstract<T> extends TypeAbstract<T>
 		boolean addIds = (arg.length() >= TAB_LIST_UUID_THRESHOLD);
 		int size = ids.size();
 		if (addIds) size *= 2;
-		Set<String> ret = new MassiveSet<String>(size);
+		Set<String> ret = new MassiveSet<>(size);
 		for (String id : ids)
 		{
 			if ( ! MixinVisibility.get().isVisible(id, sender)) continue;
diff --git a/src/com/massivecraft/massivecore/comparator/ComparatorEntryKey.java b/src/com/massivecraft/massivecore/comparator/ComparatorEntryKey.java
index 5eabe1ce..77931787 100644
--- a/src/com/massivecraft/massivecore/comparator/ComparatorEntryKey.java
+++ b/src/com/massivecraft/massivecore/comparator/ComparatorEntryKey.java
@@ -9,7 +9,7 @@ public class ComparatorEntryKey<K, V> extends ComparatorAbstractTransformer<Entr
 	// INSTANCE & CONSTRUCT
 	// -------------------------------------------- //
 	
-	public static <K, V> ComparatorEntryKey<K, V> get(Comparator<K> comparator) { return new ComparatorEntryKey<K, V>(comparator); }
+	public static <K, V> ComparatorEntryKey<K, V> get(Comparator<K> comparator) { return new ComparatorEntryKey<>(comparator); }
 	public ComparatorEntryKey(Comparator<K> comparator)
 	{
 		super(comparator);
diff --git a/src/com/massivecraft/massivecore/comparator/ComparatorEntryValue.java b/src/com/massivecraft/massivecore/comparator/ComparatorEntryValue.java
index b319edc1..f1696e5a 100644
--- a/src/com/massivecraft/massivecore/comparator/ComparatorEntryValue.java
+++ b/src/com/massivecraft/massivecore/comparator/ComparatorEntryValue.java
@@ -9,7 +9,7 @@ public class ComparatorEntryValue<K, V> extends ComparatorAbstractTransformer<En
 	// INSTANCE & CONSTRUCT
 	// -------------------------------------------- //
 	
-	public static <K, V> ComparatorEntryValue<K, V> get(Comparator<V> comparator) { return new ComparatorEntryValue<K, V>(comparator); }
+	public static <K, V> ComparatorEntryValue<K, V> get(Comparator<V> comparator) { return new ComparatorEntryValue<>(comparator); }
 	public ComparatorEntryValue(Comparator<V> comparator)
 	{
 		super(comparator);
diff --git a/src/com/massivecraft/massivecore/comparator/ComparatorReversed.java b/src/com/massivecraft/massivecore/comparator/ComparatorReversed.java
index 79fbfb42..970b69b9 100644
--- a/src/com/massivecraft/massivecore/comparator/ComparatorReversed.java
+++ b/src/com/massivecraft/massivecore/comparator/ComparatorReversed.java
@@ -8,7 +8,7 @@ public class ComparatorReversed<T> extends ComparatorAbstractWrapper<T, T>
 	// INSTANCE & CONSTRUCT
 	// -------------------------------------------- //
 	
-	public static <T> ComparatorReversed<T> get(Comparator<T> comparator) { return new ComparatorReversed<T>(comparator); }
+	public static <T> ComparatorReversed<T> get(Comparator<T> comparator) { return new ComparatorReversed<>(comparator); }
 	public ComparatorReversed(Comparator<T> comparator)
 	{
 		super(comparator);
diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreCommandRegistration.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreCommandRegistration.java
index 1128d17e..a36aec7e 100644
--- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreCommandRegistration.java
+++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreCommandRegistration.java
@@ -50,7 +50,7 @@ public class EngineMassiveCoreCommandRegistration extends Engine
 		Map<String, Command> knownCommands = getSimpleCommandMapDotKnownCommands(simpleCommandMap);
 		
 		// Step #2: Create a "name --> target" map that contains the MassiveCommands that /should/ be registered in Bukkit. 
-		Map<String, MassiveCommand> nameTargets = new HashMap<String, MassiveCommand>();
+		Map<String, MassiveCommand> nameTargets = new HashMap<>();
 		// For each MassiveCommand that is supposed to be registered ...
 		for (MassiveCommand massiveCommand : MassiveCommand.getAllInstances())
 		{
diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDatabase.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDatabase.java
index 692a7be6..4262b955 100644
--- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDatabase.java
+++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDatabase.java
@@ -38,7 +38,7 @@ public class EngineMassiveCoreDatabase extends Engine
 	// PLAYER AND SENDER REFERENCES
 	// -------------------------------------------- //
 	
-	public static Map<String, PlayerLoginEvent> idToPlayerLoginEvent = new MassiveMap<String, PlayerLoginEvent>();
+	public static Map<String, PlayerLoginEvent> idToPlayerLoginEvent = new MassiveMap<>();
 	
 	// Immediately set the sender reference and cached PlayerLoginEvent.
 	public static void setSenderReferences(CommandSender sender, CommandSender reference, PlayerLoginEvent event)
@@ -170,7 +170,7 @@ public class EngineMassiveCoreDatabase extends Engine
 	public Map<SenderColl<?>, Entry<JsonObject, Long>> createRemoteEntries(String playerId)
 	{
 		// Create Ret
-		Map<SenderColl<?>, Entry<JsonObject, Long>> ret = new HashMap<SenderColl<?>, Entry<JsonObject, Long>>();
+		Map<SenderColl<?>, Entry<JsonObject, Long>> ret = new HashMap<>();
 		
 		// Fill Ret
 		for (final SenderColl<?> coll : Coll.getSenderInstances())
diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDestination.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDestination.java
index 93c5babb..7dc8094d 100644
--- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDestination.java
+++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreDestination.java
@@ -81,12 +81,12 @@ public class EngineMassiveCoreDestination extends Engine
 		event.setCancelled(true);
 	}
 	
-	public static final Set<String> ALIASES_TOP = new MassiveSet<String>("top");
-	public static final Set<String> ALIASES_THERE = new MassiveSet<String>("there");
-	public static final Set<String> ALIASES_THAT = new MassiveSet<String>("that");
-	public static final Set<String> ALIASES_JUMP = new MassiveSet<String>("jump");
-	public static final Set<String> ALIASES_WORLD = new MassiveSet<String>("world", "w", "spawn", "wspawn", "worldspawn");
-	public static final Set<String> ALIASES_PLAYER = new MassiveSet<String>("player", "p", "here", "me", "self");
+	public static final Set<String> ALIASES_TOP = new MassiveSet<>("top");
+	public static final Set<String> ALIASES_THERE = new MassiveSet<>("there");
+	public static final Set<String> ALIASES_THAT = new MassiveSet<>("that");
+	public static final Set<String> ALIASES_JUMP = new MassiveSet<>("jump");
+	public static final Set<String> ALIASES_WORLD = new MassiveSet<>("world", "w", "spawn", "wspawn", "worldspawn");
+	public static final Set<String> ALIASES_PLAYER = new MassiveSet<>("player", "p", "here", "me", "self");
 	
 	public Destination destinationArg(String arg, CommandSender sender) throws MassiveException
 	{
diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreGank.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreGank.java
index 4037c0a0..4cdc2f30 100644
--- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreGank.java
+++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreGank.java
@@ -28,7 +28,7 @@ public class EngineMassiveCoreGank extends Engine
 	// -------------------------------------------- //
 	
 	// NOTE: The usage of WeakHashMap here is important. We would create a memory leak otherwise. WeakHashMap works very well for meta data storage.
-	protected WeakHashMap<Entity, WeakHashMap<Player, Double>> entityToPlayerDamages = new WeakHashMap<Entity, WeakHashMap<Player, Double>>();
+	protected WeakHashMap<Entity, WeakHashMap<Player, Double>> entityToPlayerDamages = new WeakHashMap<>();
 	
 	protected Map<Player, Double> getPlayerDamages(Entity entity, boolean store)
 	{
@@ -36,7 +36,7 @@ public class EngineMassiveCoreGank extends Engine
 		
 		if (ret == null)
 		{
-			ret = new WeakHashMap<Player, Double>(4);
+			ret = new WeakHashMap<>(4);
 			if (store)
 			{
 				this.entityToPlayerDamages.put(entity, ret);
@@ -73,7 +73,7 @@ public class EngineMassiveCoreGank extends Engine
 		}
 		
 		// Create Ret
-		Map<Player, Double> ret = new MassiveMap<Player, Double>(playerDamages.size());
+		Map<Player, Double> ret = new MassiveMap<>(playerDamages.size());
 		
 		// Fill Ret
 		for (Entry<Player, Double> playerDamage : playerDamages.entrySet())
diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreMain.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreMain.java
index 8a6db71f..b6948068 100644
--- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreMain.java
+++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreMain.java
@@ -66,7 +66,7 @@ public class EngineMassiveCoreMain extends Engine
 		String format = event.getFormat();
 		
 		// Pick the recipients to avoid the message getting sent without canceling the event.
-		Set<Player> players = new HashSet<Player>(event.getRecipients());
+		Set<Player> players = new HashSet<>(event.getRecipients());
 		event.getRecipients().clear();
 		
 		// For each of the players
@@ -121,7 +121,7 @@ public class EngineMassiveCoreMain extends Engine
 		Predicate<String> predicate = PredicateStartsWithIgnoreCase.get(event.getLastToken());
 		
 		// Create a case insensitive set to check for already added stuff
-		Set<String> current = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
+		Set<String> current = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
 		current.addAll(event.getTabCompletions());
 		
 		// Add names of all online senders that match and isn't added yet.
@@ -180,7 +180,7 @@ public class EngineMassiveCoreMain extends Engine
 	// EVENT TOOL: causedByKick
 	// -------------------------------------------- //
 	
-	public static Map<UUID, String> kickedPlayerReasons = new HashMap<UUID, String>();
+	public static Map<UUID, String> kickedPlayerReasons = new HashMap<>();
 	
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void causedByKick(PlayerKickEvent event)
diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerState.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerState.java
index ab5930fb..5593e49f 100644
--- a/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerState.java
+++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerState.java
@@ -45,7 +45,7 @@ public class EngineMassiveCorePlayerState extends Engine
 	// STATE STORAGE
 	// -------------------------------------------- //
 	
-	private Map<UUID, PlayerState> idToState = new ConcurrentHashMap<UUID, PlayerState>();
+	private Map<UUID, PlayerState> idToState = new ConcurrentHashMap<>();
 	
 	public PlayerState getState(Player player)
 	{
diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerUpdate.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerUpdate.java
index 3513fd46..7c70b1e8 100644
--- a/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerUpdate.java
+++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCorePlayerUpdate.java
@@ -91,7 +91,7 @@ public class EngineMassiveCorePlayerUpdate extends Engine
 	// FIX NO CHEAT PLUS BUG
 	// -------------------------------------------- //
 	
-	public static Map<UUID, Long> idToLastFlyActive = new HashMap<UUID, Long>();
+	public static Map<UUID, Long> idToLastFlyActive = new HashMap<>();
 	public static Long getLastFlyActive(Player player)
 	{
 		return idToLastFlyActive.get(player.getUniqueId());
diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreScheduledTeleport.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreScheduledTeleport.java
index 5e5c4e50..ac4a9efa 100644
--- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreScheduledTeleport.java
+++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreScheduledTeleport.java
@@ -39,7 +39,7 @@ public class EngineMassiveCoreScheduledTeleport extends Engine
 	// SCHEDULED TELEPORT INDEX
 	// -------------------------------------------- //
 	
-	protected Map<String, ScheduledTeleport> teleporteeIdToScheduledTeleport = new ConcurrentHashMap<String, ScheduledTeleport>();
+	protected Map<String, ScheduledTeleport> teleporteeIdToScheduledTeleport = new ConcurrentHashMap<>();
 	
 	public boolean isScheduled(ScheduledTeleport st)
 	{
diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreVariable.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreVariable.java
index 09a396d9..310dd912 100644
--- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreVariable.java
+++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreVariable.java
@@ -107,7 +107,7 @@ public class EngineMassiveCoreVariable extends Engine
 	// VARIABLE BUFFER
 	// -------------------------------------------- //
 	
-	public static final Map<String, String> idToBuffer = new HashMap<String, String>();
+	public static final Map<String, String> idToBuffer = new HashMap<>();
 	
 	public static String getBuffer(Object senderObject)
 	{
diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreWorldNameSet.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreWorldNameSet.java
index 9aa99baf..6f213e2a 100644
--- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreWorldNameSet.java
+++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreWorldNameSet.java
@@ -41,7 +41,7 @@ public class EngineMassiveCoreWorldNameSet extends Engine
 	// FIELDS
 	// -------------------------------------------- //
 	
-	private final TreeSet<String> worldNamesInner = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
+	private final TreeSet<String> worldNamesInner = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
 	private final Set<String> worldNamesOuter = Collections.unmodifiableSet(this.worldNamesInner);
 	public Set<String> getWorldNames() { return this.worldNamesOuter; }
 	
diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCoreDestinationTabList.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreDestinationTabList.java
index 120030fa..5139753a 100644
--- a/src/com/massivecraft/massivecore/event/EventMassiveCoreDestinationTabList.java
+++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreDestinationTabList.java
@@ -37,7 +37,7 @@ public class EventMassiveCoreDestinationTabList extends EventMassiveCore
 	{
 		this.arg = arg;
 		this.sender = sender;
-		this.suggestions = new MassiveList<String>();
+		this.suggestions = new MassiveList<>();
 	}
 	
 }
diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCoreLorePriority.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreLorePriority.java
index 1ff7c2da..811c4a86 100644
--- a/src/com/massivecraft/massivecore/event/EventMassiveCoreLorePriority.java
+++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreLorePriority.java
@@ -61,7 +61,7 @@ public class EventMassiveCoreLorePriority extends EventMassiveCore
 		List<Entry<String, Integer>> ret = new MassiveList<>();
 		for (String line : meta.getLore())
 		{
-			ret.add(new SimpleEntry<String, Integer>(line, PRIORITY_DEFAULT));
+			ret.add(new SimpleEntry<>(line, PRIORITY_DEFAULT));
 		}
 		return ret;
 	}
diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerLeave.java b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerLeave.java
index 7e70a5a0..bb521335 100644
--- a/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerLeave.java
+++ b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerLeave.java
@@ -88,6 +88,6 @@ public class EventMassiveCorePlayerLeave extends Event implements Runnable
 	// -------------------------------------------- //
 	// STORING THE ACTIVE PLAYER EVENT
 	// -------------------------------------------- //
-	public static Map<UUID, EventMassiveCorePlayerLeave> player2event = new HashMap<UUID, EventMassiveCorePlayerLeave>();
+	public static Map<UUID, EventMassiveCorePlayerLeave> player2event = new HashMap<>();
 	
 }
diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java
index 2cabcef3..73955555 100644
--- a/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java
+++ b/src/com/massivecraft/massivecore/event/EventMassiveCorePlayerUpdate.java
@@ -137,7 +137,7 @@ public class EventMassiveCorePlayerUpdate extends EventMassiveCore
 	// -------------------------------------------- //
 	
 	// For backwards version compatibility we use the enumeration names rather than the enumerations themselves.
-	public static Set<String> FLY_DEFAULT_GAME_MODE_NAMES = new MassiveSet<String>(
+	public static Set<String> FLY_DEFAULT_GAME_MODE_NAMES = new MassiveSet<>(
 		"CREATIVE",
 		"SPECTATOR"
 	);
diff --git a/src/com/massivecraft/massivecore/fetcher/Fetcher.java b/src/com/massivecraft/massivecore/fetcher/Fetcher.java
index 067c4c1c..c819444d 100644
--- a/src/com/massivecraft/massivecore/fetcher/Fetcher.java
+++ b/src/com/massivecraft/massivecore/fetcher/Fetcher.java
@@ -51,11 +51,11 @@ public class Fetcher implements Callable<Set<IdAndName>>
 	// STATIC
 	// -------------------------------------------- //
 	
-	public static Set<IdAndName> fetch(Collection<? extends Object> objects) throws Exception
+	public static Set<IdAndName> fetch(Collection<?> objects) throws Exception
 	{
 		// Separate names and ids
-		final Set<String> names = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
-		final Set<UUID> ids = new HashSet<UUID>();
+		final Set<String> names = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+		final Set<UUID> ids = new HashSet<>();
 		for (Object object : objects)
 		{
 			if (object instanceof UUID)
@@ -83,7 +83,7 @@ public class Fetcher implements Callable<Set<IdAndName>>
 			@Override
 			public Set<IdAndName> call() throws Exception
 			{
-				return new HashSet<IdAndName>(new FetcherByName(names).call().values());
+				return new HashSet<>(new FetcherByName(names).call().values());
 			}
 		};
 		
@@ -92,11 +92,11 @@ public class Fetcher implements Callable<Set<IdAndName>>
 			@Override
 			public Set<IdAndName> call() throws Exception
 			{
-				return new HashSet<IdAndName>(new FetcherById(ids).call().values());
+				return new HashSet<>(new FetcherById(ids).call().values());
 			}
 		};
 		
-		final List<Callable<Set<IdAndName>>> tasks = new ArrayList<Callable<Set<IdAndName>>>();
+		final List<Callable<Set<IdAndName>>> tasks = new ArrayList<>();
 		tasks.add(taskName);
 		tasks.add(taskId);
 		
@@ -104,7 +104,7 @@ public class Fetcher implements Callable<Set<IdAndName>>
 		List<Future<Set<IdAndName>>> futures = ES.invokeAll(tasks);
 		
 		// Merge Return Value
-		Set<IdAndName> ret = new HashSet<IdAndName>();
+		Set<IdAndName> ret = new HashSet<>();
 		for (Future<Set<IdAndName>> future : futures)
 		{
 			Set<IdAndName> set = future.get();
diff --git a/src/com/massivecraft/massivecore/fetcher/FetcherById.java b/src/com/massivecraft/massivecore/fetcher/FetcherById.java
index 3ca8c90a..9f38527a 100644
--- a/src/com/massivecraft/massivecore/fetcher/FetcherById.java
+++ b/src/com/massivecraft/massivecore/fetcher/FetcherById.java
@@ -3,6 +3,7 @@ package com.massivecraft.massivecore.fetcher;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -52,17 +53,17 @@ public class FetcherById implements Callable<Map<Object, IdAndName>>
 	public static Map<Object, IdAndName> fetch(Collection<UUID> ids) throws Exception
 	{
 		// Create Tasks
-		final List<Callable<Map<UUID, IdAndName>>> tasks = new ArrayList<Callable<Map<UUID, IdAndName>>>();
+		final List<Callable<Map<UUID, IdAndName>>> tasks = new ArrayList<>();
 		for (UUID id : ids)
 		{
-			tasks.add(new FetcherByIdSingle(Arrays.asList(id)));
+			tasks.add(new FetcherByIdSingle(Collections.singletonList(id)));
 		}
 		
 		// Invoke All Tasks
 		List<Future<Map<UUID, IdAndName>>> futures = ES.invokeAll(tasks);
 		
 		// Merge Return Value
-		Map<Object, IdAndName> ret = new HashMap<Object, IdAndName>();
+		Map<Object, IdAndName> ret = new HashMap<>();
 		for (Future<Map<UUID, IdAndName>> future : futures)
 		{
 			Map<UUID, IdAndName> map = future.get();
diff --git a/src/com/massivecraft/massivecore/fetcher/FetcherByIdSingle.java b/src/com/massivecraft/massivecore/fetcher/FetcherByIdSingle.java
index 0bc684a1..35acc366 100644
--- a/src/com/massivecraft/massivecore/fetcher/FetcherByIdSingle.java
+++ b/src/com/massivecraft/massivecore/fetcher/FetcherByIdSingle.java
@@ -60,7 +60,7 @@ public class FetcherByIdSingle implements Callable<Map<UUID, IdAndName>>
 	
 	public static Map<UUID, IdAndName> fetch(Collection<UUID> ids) throws Exception
 	{
-		Map<UUID, IdAndName> ret = new HashMap<UUID, IdAndName>();
+		Map<UUID, IdAndName> ret = new HashMap<>();
 		JSONParser jsonParser = new JSONParser();
 		
 		for (UUID id : ids)
diff --git a/src/com/massivecraft/massivecore/fetcher/FetcherByName.java b/src/com/massivecraft/massivecore/fetcher/FetcherByName.java
index fbe4c418..31115609 100644
--- a/src/com/massivecraft/massivecore/fetcher/FetcherByName.java
+++ b/src/com/massivecraft/massivecore/fetcher/FetcherByName.java
@@ -52,8 +52,8 @@ public class FetcherByName implements Callable<Map<String, IdAndName>>
 	public static Map<String, IdAndName> fetch(Collection<String> names) throws Exception
 	{
 		// Create batches
-		List<List<String>> batches = new ArrayList<List<String>>();
-		names = new ArrayList<String>(names);
+		List<List<String>> batches = new ArrayList<>();
+		names = new ArrayList<>(names);
 		while (names.size() > 0)
 		{
 			List<String> batch = take(names, BATCH_SIZE);
@@ -61,7 +61,7 @@ public class FetcherByName implements Callable<Map<String, IdAndName>>
 		}
 		
 		// Create Tasks
-		final List<Callable<Map<String, IdAndName>>> tasks = new ArrayList<Callable<Map<String, IdAndName>>>();
+		final List<Callable<Map<String, IdAndName>>> tasks = new ArrayList<>();
 		for (List<String> batch : batches)
 		{
 			tasks.add(new FetcherByNameSingle(batch));
@@ -71,7 +71,7 @@ public class FetcherByName implements Callable<Map<String, IdAndName>>
 		List<Future<Map<String, IdAndName>>> futures = ES.invokeAll(tasks);
 		
 		// Merge Return Value
-		Map<String, IdAndName> ret = new TreeMap<String, IdAndName> (String.CASE_INSENSITIVE_ORDER);
+		Map<String, IdAndName> ret = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
 		for (Future<Map<String, IdAndName>> future : futures)
 		{
 			ret.putAll(future.get());
@@ -82,7 +82,7 @@ public class FetcherByName implements Callable<Map<String, IdAndName>>
 	
 	public static <T> List<T> take(Collection<T> coll, int count)
 	{
-		List<T> ret = new ArrayList<T>();
+		List<T> ret = new ArrayList<>();
 		
 		Iterator<T> iter = coll.iterator();
 		int i = 0;
diff --git a/src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java b/src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java
index d7070b81..2344786e 100644
--- a/src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java
+++ b/src/com/massivecraft/massivecore/fetcher/FetcherByNameSingle.java
@@ -13,6 +13,7 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -79,8 +80,8 @@ public class FetcherByNameSingle implements Callable<Map<String, IdAndName>>
 	
 	public static Map<String, IdAndName> fetch(Collection<String> namesCollection, boolean rateLimiting) throws Exception
 	{
-		List<String> names = new ArrayList<String>(namesCollection);
-		Map<String, IdAndName> ret = new TreeMap<String, IdAndName>(String.CASE_INSENSITIVE_ORDER);
+		List<String> names = new ArrayList<>(namesCollection);
+		Map<String, IdAndName> ret = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
 		JSONParser jsonParser = new JSONParser();
 		
 		int requests = (int) Math.ceil(names.size() / (double) PROFILES_PER_REQUEST);
@@ -172,7 +173,7 @@ public class FetcherByNameSingle implements Callable<Map<String, IdAndName>>
 
 	public static IdAndName get(String name) throws Exception
 	{
-		return fetch(Arrays.asList(name)).get(name);
+		return fetch(Collections.singletonList(name)).get(name);
 	}
 	
 }
diff --git a/src/com/massivecraft/massivecore/item/ConverterDefault.java b/src/com/massivecraft/massivecore/item/ConverterDefault.java
index 60b400e7..3eee2e15 100644
--- a/src/com/massivecraft/massivecore/item/ConverterDefault.java
+++ b/src/com/massivecraft/massivecore/item/ConverterDefault.java
@@ -6,7 +6,7 @@ public class ConverterDefault<X, Y> extends Converter<X, Y>
 	// INSTANCE & CONSTRUCT
 	// -------------------------------------------- //
 	
-	private static final ConverterDefault<Object, Object> i = new ConverterDefault<Object, Object>();
+	private static final ConverterDefault<Object, Object> i = new ConverterDefault<>();
 	@SuppressWarnings("unchecked")
 	public static <X, Y> ConverterDefault<X, Y> get() { return (ConverterDefault<X, Y>) i; }
 	@SuppressWarnings("unchecked")
diff --git a/src/com/massivecraft/massivecore/mixin/MixinWorld.java b/src/com/massivecraft/massivecore/mixin/MixinWorld.java
index aff76a30..2d90d927 100644
--- a/src/com/massivecraft/massivecore/mixin/MixinWorld.java
+++ b/src/com/massivecraft/massivecore/mixin/MixinWorld.java
@@ -35,7 +35,7 @@ public class MixinWorld extends Mixin
 	public List<String> getWorldIds()
 	{
 		// Create
-		List<String> ret = new ArrayList<String>();
+		List<String> ret = new ArrayList<>();
 		
 		// Fill
 		for (World world : Bukkit.getWorlds())
@@ -50,7 +50,7 @@ public class MixinWorld extends Mixin
 	public List<String> getVisibleWorldIds(Permissible permissible)
 	{
 		// Create
-		List<String> ret = new ArrayList<String>();
+		List<String> ret = new ArrayList<>();
 		
 		// Fill
 		for (String worldId : this.getWorldIds())
@@ -70,7 +70,7 @@ public class MixinWorld extends Mixin
 	
 	public List<String> getWorldAliases(String worldId)
 	{
-		return new ArrayList<String>();
+		return new ArrayList<>();
 	}
 	
 	public String getWorldAliasOrId(String worldId)
diff --git a/src/com/massivecraft/massivecore/money/Money.java b/src/com/massivecraft/massivecore/money/Money.java
index b2a4a7d1..3f046f20 100644
--- a/src/com/massivecraft/massivecore/money/Money.java
+++ b/src/com/massivecraft/massivecore/money/Money.java
@@ -11,7 +11,8 @@ public class Money
 	// -------------------------------------------- //
 	
 	private static MoneyMixin mixin = null;
-	public static MoneyMixin mixin() { return mixin; };
+	public static MoneyMixin mixin() { return mixin; }
+	
 	public static void mixin(MoneyMixin mixin) { Money.mixin = mixin; }
 	
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/massivecore/money/MoneyMixin.java b/src/com/massivecraft/massivecore/money/MoneyMixin.java
index 2584c06a..980dd169 100644
--- a/src/com/massivecraft/massivecore/money/MoneyMixin.java
+++ b/src/com/massivecraft/massivecore/money/MoneyMixin.java
@@ -8,64 +8,64 @@ public interface MoneyMixin
 	// ENABLED
 	// -------------------------------------------- //
 	
-	public boolean enabled();
+	boolean enabled();
 	
 	// -------------------------------------------- //
 	// FORMAT AND NAME
 	// -------------------------------------------- //
 	
-	public String format(double amount);
-	public String format(double amount, boolean includeUnit);
-	public String singular();
-	public String plural();
+	String format(double amount);
+	String format(double amount, boolean includeUnit);
+	String singular();
+	String plural();
 	
 	// -------------------------------------------- //
 	// FRACTIONAL DIGITS
 	// -------------------------------------------- //
 	
-	public int fractionalDigits();
-	public double prepare(double amount);
+	int fractionalDigits();
+	double prepare(double amount);
 	
 	// -------------------------------------------- //
 	// EXISTANCE
 	// -------------------------------------------- //
 	
-	public boolean exists(String accountId);
-	public boolean create(String accountId);
+	boolean exists(String accountId);
+	boolean create(String accountId);
 	
 	// -------------------------------------------- //
 	// CHECK
 	// -------------------------------------------- //
 	
-	public double get(String accountId);
-	public boolean has(String accountId, double amount);
+	double get(String accountId);
+	boolean has(String accountId, double amount);
 	
 	// -------------------------------------------- //
 	// MODIFY
 	// -------------------------------------------- //
 	
-	public boolean move(String fromId, String toId, String byId, double amount, Collection<String> categories, Object message);
-	public boolean move(String fromId, String toId, String byId, double amount, String category, Object message);
-	public boolean move(String fromId, String toId, String byId, double amount, Collection<String> categories);
-	public boolean move(String fromId, String toId, String byId, double amount, String category);
-	public boolean move(String fromId, String toId, String byId, double amount);
+	boolean move(String fromId, String toId, String byId, double amount, Collection<String> categories, Object message);
+	boolean move(String fromId, String toId, String byId, double amount, String category, Object message);
+	boolean move(String fromId, String toId, String byId, double amount, Collection<String> categories);
+	boolean move(String fromId, String toId, String byId, double amount, String category);
+	boolean move(String fromId, String toId, String byId, double amount);
 	
-	public boolean spawn(String toId, String byId, double amount, Collection<String> categories, Object message);
-	public boolean spawn(String toId, String byId, double amount, String category, Object message);
-	public boolean spawn(String toId, String byId, double amount, Collection<String> categories);
-	public boolean spawn(String toId, String byId, double amount, String category);
-	public boolean spawn(String toId, String byId, double amount);
+	boolean spawn(String toId, String byId, double amount, Collection<String> categories, Object message);
+	boolean spawn(String toId, String byId, double amount, String category, Object message);
+	boolean spawn(String toId, String byId, double amount, Collection<String> categories);
+	boolean spawn(String toId, String byId, double amount, String category);
+	boolean spawn(String toId, String byId, double amount);
 	
-	public boolean despawn(String fromId, String byId, double amount, Collection<String> categories, Object message);
-	public boolean despawn(String fromId, String byId, double amount, String category, Object message);
-	public boolean despawn(String fromId, String byId, double amount, Collection<String> categories);
-	public boolean despawn(String fromId, String byId, double amount, String category);
-	public boolean despawn(String fromId, String byId, double amount);
+	boolean despawn(String fromId, String byId, double amount, Collection<String> categories, Object message);
+	boolean despawn(String fromId, String byId, double amount, String category, Object message);
+	boolean despawn(String fromId, String byId, double amount, Collection<String> categories);
+	boolean despawn(String fromId, String byId, double amount, String category);
+	boolean despawn(String fromId, String byId, double amount);
 	
-	public boolean set(String accountId, String byId, double amount, Collection<String> categories, Object message);
-	public boolean set(String accountId, String byId, double amount, String category, Object message);
-	public boolean set(String accountId, String byId, double amount, Collection<String> categories);
-	public boolean set(String accountId, String byId, double amount, String category);
-	public boolean set(String accountId, String byId, double amount);
+	boolean set(String accountId, String byId, double amount, Collection<String> categories, Object message);
+	boolean set(String accountId, String byId, double amount, String category, Object message);
+	boolean set(String accountId, String byId, double amount, Collection<String> categories);
+	boolean set(String accountId, String byId, double amount, String category);
+	boolean set(String accountId, String byId, double amount);
 	
 }
diff --git a/src/com/massivecraft/massivecore/mson/Mson.java b/src/com/massivecraft/massivecore/mson/Mson.java
index 750cdea9..677c092f 100644
--- a/src/com/massivecraft/massivecore/mson/Mson.java
+++ b/src/com/massivecraft/massivecore/mson/Mson.java
@@ -312,7 +312,7 @@ public class Mson implements Serializable
 	
 	public Mson add(Iterable<?> parts)
 	{
-		List<Mson> extra = new MassiveList<Mson>(this.getExtra());
+		List<Mson> extra = new MassiveList<>(this.getExtra());
 		List<Mson> msons = msons(parts);
 		extra.addAll(msons);
 		return this.extra(extra);
@@ -996,7 +996,7 @@ public class Mson implements Serializable
 		
 		Mson ret = this.text("");
 		
-		List<Mson> msons = new ArrayList<Mson>();
+		List<Mson> msons = new ArrayList<>();
 		StringBuffer currentString = new StringBuffer();
 		Matcher matcher = pattern.matcher(this.getText());
 		while (matcher.find())
@@ -1102,17 +1102,17 @@ public class Mson implements Serializable
 	{
 		return implode(list, glue, null);
 	}
-	public static Mson implode(final Collection<? extends Object> coll, final Mson glue, final Mson format)
+	public static Mson implode(final Collection<?> coll, final Mson glue, final Mson format)
 	{
 		return implode(coll.toArray(new Object[0]), glue, format);
 	}
-	public static Mson implode(final Collection<? extends Object> coll, final Mson glue)
+	public static Mson implode(final Collection<?> coll, final Mson glue)
 	{
 		return implode(coll, glue, null);
 	}
 	
 	// Implode comma and dot
-	public static Mson implodeCommaAndDot(Collection<? extends Object> objects, Mson format, Mson comma, Mson and, Mson dot)
+	public static Mson implodeCommaAndDot(Collection<?> objects, Mson format, Mson comma, Mson and, Mson dot)
 	{
 		if (objects.size() == 0) return mson();
 		if (objects.size() == 1)
@@ -1135,27 +1135,27 @@ public class Mson implements Serializable
 		return implode(ourObjects, comma, format).add(mson(dot));
 	}
 	
-	public static Mson implodeCommaAndDot(final Collection<? extends Object> objects, Mson comma, Mson and, Mson dot)
+	public static Mson implodeCommaAndDot(final Collection<?> objects, Mson comma, Mson and, Mson dot)
 	{
 		return implodeCommaAndDot(objects, null, comma, and, dot);
 	}
-	public static Mson implodeCommaAnd(final Collection<? extends Object> objects, Mson comma, Mson and)
+	public static Mson implodeCommaAnd(final Collection<?> objects, Mson comma, Mson and)
 	{
 		return implodeCommaAndDot(objects, comma, and, mson());
 	}
-	public static Mson implodeCommaAndDot(final Collection<? extends Object> objects, ChatColor color)
+	public static Mson implodeCommaAndDot(final Collection<?> objects, ChatColor color)
 	{
 		return implodeCommaAndDot(objects, mson(", ").color(color), mson(" and ").color(color), mson(".").color(color));
 	}
-	public static Mson implodeCommaAnd(final Collection<? extends Object> objects, ChatColor color)
+	public static Mson implodeCommaAnd(final Collection<?> objects, ChatColor color)
 	{
 		return implodeCommaAndDot(objects, mson(", ").color(color), mson(" and ").color(color), mson());
 	}
-	public static Mson implodeCommaAndDot(final Collection<? extends Object> objects)
+	public static Mson implodeCommaAndDot(final Collection<?> objects)
 	{
 		return implodeCommaAndDot(objects, null);
 	}
-	public static Mson implodeCommaAnd(final Collection<? extends Object> objects)
+	public static Mson implodeCommaAnd(final Collection<?> objects)
 	{
 		return implodeCommaAnd(objects, null);
 	}
diff --git a/src/com/massivecraft/massivecore/mson/MsonReplacement.java b/src/com/massivecraft/massivecore/mson/MsonReplacement.java
index 15fdbe41..9e8fd92d 100644
--- a/src/com/massivecraft/massivecore/mson/MsonReplacement.java
+++ b/src/com/massivecraft/massivecore/mson/MsonReplacement.java
@@ -2,5 +2,5 @@ package com.massivecraft.massivecore.mson;
 
 public interface MsonReplacement
 {
-	public Mson getReplacement(String match, Mson parent);
+	Mson getReplacement(String match, Mson parent);
 }
diff --git a/src/com/massivecraft/massivecore/mson/Test.java b/src/com/massivecraft/massivecore/mson/Test.java
index 0b0d0daa..6333df83 100644
--- a/src/com/massivecraft/massivecore/mson/Test.java
+++ b/src/com/massivecraft/massivecore/mson/Test.java
@@ -37,7 +37,7 @@ public class Test
 		test("ofMson");
 		
 		mson = mson(
-			new MassiveList<String>("hello ", "you!")
+			new MassiveList<>("hello ", "you!")
 		);
 		test("ofCollection");
 		
diff --git a/src/com/massivecraft/massivecore/nms/NmsEntityGet18R1P.java b/src/com/massivecraft/massivecore/nms/NmsEntityGet18R1P.java
index 7612ad0c..14a1a39e 100644
--- a/src/com/massivecraft/massivecore/nms/NmsEntityGet18R1P.java
+++ b/src/com/massivecraft/massivecore/nms/NmsEntityGet18R1P.java
@@ -79,7 +79,7 @@ public class NmsEntityGet18R1P extends NmsEntityGet
 	// INTERNAL
 	// -------------------------------------------- //
 	
-	private Map<World, Map<UUID, Object>> worldMaps = new WeakHashMap<World, Map<UUID, Object>>();
+	private Map<World, Map<UUID, Object>> worldMaps = new WeakHashMap<>();
 	
 	private Map<UUID, Object> getWorldMap(Object handle)
 	{
diff --git a/src/com/massivecraft/massivecore/nms/NmsSkullMeta.java b/src/com/massivecraft/massivecore/nms/NmsSkullMeta.java
index 71d0ac81..51d75862 100644
--- a/src/com/massivecraft/massivecore/nms/NmsSkullMeta.java
+++ b/src/com/massivecraft/massivecore/nms/NmsSkullMeta.java
@@ -83,7 +83,7 @@ public class NmsSkullMeta extends Mixin
 		}
 		
 		// Return Ret
-		return new Couple<String, UUID>(retName, retId);
+		return new Couple<>(retName, retId);
 	}
 	
 }
diff --git a/src/com/massivecraft/massivecore/pager/Msonifier.java b/src/com/massivecraft/massivecore/pager/Msonifier.java
index d3b717ee..0d162aba 100644
--- a/src/com/massivecraft/massivecore/pager/Msonifier.java
+++ b/src/com/massivecraft/massivecore/pager/Msonifier.java
@@ -4,5 +4,5 @@ import com.massivecraft.massivecore.mson.Mson;
 
 public interface Msonifier<T>
 {
-	public Mson toMson(T item, int index);
+	Mson toMson(T item, int index);
 }
diff --git a/src/com/massivecraft/massivecore/pager/Pager.java b/src/com/massivecraft/massivecore/pager/Pager.java
index c7f454d8..2e808228 100644
--- a/src/com/massivecraft/massivecore/pager/Pager.java
+++ b/src/com/massivecraft/massivecore/pager/Pager.java
@@ -54,7 +54,7 @@ public class Pager<T>
 		if (ret != null) return ret;
 		
 		MassiveCommand command = this.getCommand();
-		if (command != null) return new ArrayList<String>(command.getArgs());
+		if (command != null) return new ArrayList<>(command.getArgs());
 		
 		return null;
 	}
@@ -199,7 +199,7 @@ public class Pager<T>
 		}
 		else
 		{
-			items = new ArrayList<T>(this.getItems());
+			items = new ArrayList<>(this.getItems());
 		}
 		
 		int index = number - 1;
@@ -223,7 +223,7 @@ public class Pager<T>
 	public List<Mson> get()
 	{
 		// Create ret
-		List<Mson> ret = new ArrayList<Mson>();
+		List<Mson> ret = new ArrayList<>();
 		
 		// Add title
 		ret.add(Txt.titleizeMson(this.getTitle(), this.size(), this.getNumber(), this.getCommand(), this.getArgs()));
diff --git a/src/com/massivecraft/massivecore/pager/Stringifier.java b/src/com/massivecraft/massivecore/pager/Stringifier.java
index 7879945c..ce0ac010 100644
--- a/src/com/massivecraft/massivecore/pager/Stringifier.java
+++ b/src/com/massivecraft/massivecore/pager/Stringifier.java
@@ -2,5 +2,5 @@ package com.massivecraft.massivecore.pager;
 
 public interface Stringifier<T>
 {
-	public String toString(T item, int index);
+	String toString(T item, int index);
 }
diff --git a/src/com/massivecraft/massivecore/particleeffect/ParticleEffect.java b/src/com/massivecraft/massivecore/particleeffect/ParticleEffect.java
index d7df6ae1..07bd1ebf 100644
--- a/src/com/massivecraft/massivecore/particleeffect/ParticleEffect.java
+++ b/src/com/massivecraft/massivecore/particleeffect/ParticleEffect.java
@@ -382,8 +382,8 @@ public enum ParticleEffect {
 	 */
 	MOB_APPEARANCE("mobappearance", 41, 8);
 
-	private static final Map<String, ParticleEffect> NAME_MAP = new HashMap<String, ParticleEffect>();
-	private static final Map<Integer, ParticleEffect> ID_MAP = new HashMap<Integer, ParticleEffect>();
+	private static final Map<String, ParticleEffect> NAME_MAP = new HashMap<>();
+	private static final Map<Integer, ParticleEffect> ID_MAP = new HashMap<>();
 	private final String name;
 	private final int id;
 	private final int requiredVersion;
@@ -405,7 +405,7 @@ public enum ParticleEffect {
 	 * @param requiredVersion Version which is required (1.x)
 	 * @param properties Properties of this particle effect
 	 */
-	private ParticleEffect(String name, int id, int requiredVersion, ParticleProperty... properties) {
+	ParticleEffect(String name, int id, int requiredVersion, ParticleProperty... properties) {
 		this.name = name;
 		this.id = id;
 		this.requiredVersion = requiredVersion;
@@ -907,7 +907,7 @@ public enum ParticleEffect {
 	 * @author DarkBlade12
 	 * @since 1.7
 	 */
-	public static enum ParticleProperty {
+	public enum ParticleProperty {
 		/**
 		 * The particle effect requires water to be displayed
 		 */
@@ -923,7 +923,7 @@ public enum ParticleEffect {
 		/**
 		 * The particle effect uses the offsets as color values
 		 */
-		COLORABLE;
+		COLORABLE
 	}
 
 	/**
diff --git a/src/com/massivecraft/massivecore/particleeffect/ReflectionUtils.java b/src/com/massivecraft/massivecore/particleeffect/ReflectionUtils.java
index d8104dea..2f23e1e8 100644
--- a/src/com/massivecraft/massivecore/particleeffect/ReflectionUtils.java
+++ b/src/com/massivecraft/massivecore/particleeffect/ReflectionUtils.java
@@ -382,7 +382,7 @@ public final class ReflectionUtils {
 		 * 
 		 * @param path Path of the package
 		 */
-		private PackageType(String path) {
+		PackageType(String path) {
 			this.path = path;
 		}
 
@@ -392,7 +392,7 @@ public final class ReflectionUtils {
 		 * @param parent Parent package of the package
 		 * @param path Path of the package
 		 */
-		private PackageType(PackageType parent, String path) {
+		PackageType(PackageType parent, String path) {
 			this(parent + "." + path);
 		}
 
@@ -450,7 +450,7 @@ public final class ReflectionUtils {
 		DOUBLE(double.class, Double.class),
 		BOOLEAN(boolean.class, Boolean.class);
 
-		private static final Map<Class<?>, DataType> CLASS_MAP = new HashMap<Class<?>, DataType>();
+		private static final Map<Class<?>, DataType> CLASS_MAP = new HashMap<>();
 		private final Class<?> primitive;
 		private final Class<?> reference;
 
@@ -468,7 +468,7 @@ public final class ReflectionUtils {
 		 * @param primitive Primitive class of this data type
 		 * @param reference Reference class of this data type
 		 */
-		private DataType(Class<?> primitive, Class<?> reference) {
+		DataType(Class<?> primitive, Class<?> reference) {
 			this.primitive = primitive;
 			this.reference = reference;
 		}
diff --git a/src/com/massivecraft/massivecore/predicate/Predicate.java b/src/com/massivecraft/massivecore/predicate/Predicate.java
index 12a52a58..50f9247d 100644
--- a/src/com/massivecraft/massivecore/predicate/Predicate.java
+++ b/src/com/massivecraft/massivecore/predicate/Predicate.java
@@ -2,5 +2,5 @@ package com.massivecraft.massivecore.predicate;
 
 public interface Predicate<T>
 {
-	public boolean apply(T type);
+	boolean apply(T type);
 }
diff --git a/src/com/massivecraft/massivecore/predicate/PredicateAnd.java b/src/com/massivecraft/massivecore/predicate/PredicateAnd.java
index e7ab24d9..4f71d7fc 100644
--- a/src/com/massivecraft/massivecore/predicate/PredicateAnd.java
+++ b/src/com/massivecraft/massivecore/predicate/PredicateAnd.java
@@ -12,8 +12,8 @@ public class PredicateAnd<T> implements Predicate<T>
 	// -------------------------------------------- //
 	
 	@SafeVarargs
-	public static <T> PredicateAnd<T> get(Predicate<? super T>... predicates) { return new PredicateAnd<T>(predicates); }
-	public static <T> PredicateAnd<T> get(Collection<Predicate<? super T>> predicates) { return new PredicateAnd<T>(predicates); }
+	public static <T> PredicateAnd<T> get(Predicate<? super T>... predicates) { return new PredicateAnd<>(predicates); }
+	public static <T> PredicateAnd<T> get(Collection<Predicate<? super T>> predicates) { return new PredicateAnd<>(predicates); }
 	
 	// -------------------------------------------- //
 	// CONSTRUCT
diff --git a/src/com/massivecraft/massivecore/predicate/PredicateNot.java b/src/com/massivecraft/massivecore/predicate/PredicateNot.java
index 4431a360..793673d1 100644
--- a/src/com/massivecraft/massivecore/predicate/PredicateNot.java
+++ b/src/com/massivecraft/massivecore/predicate/PredicateNot.java
@@ -6,7 +6,7 @@ public class PredicateNot<T> implements Predicate<T>
 	// INSTANCE
 	// -------------------------------------------- //
 	
-	public static <T> PredicateNot<T> get(Predicate<? super T> predicate) { return new PredicateNot<T>(predicate); }
+	public static <T> PredicateNot<T> get(Predicate<? super T> predicate) { return new PredicateNot<>(predicate); }
 	
 	// -------------------------------------------- //
 	// CONSTRUCT
diff --git a/src/com/massivecraft/massivecore/ps/PSFormat.java b/src/com/massivecraft/massivecore/ps/PSFormat.java
index 94133b96..f5566c10 100644
--- a/src/com/massivecraft/massivecore/ps/PSFormat.java
+++ b/src/com/massivecraft/massivecore/ps/PSFormat.java
@@ -2,5 +2,5 @@ package com.massivecraft.massivecore.ps;
 
 public interface PSFormat
 {
-	public String format(PS ps);
+	String format(PS ps);
 }
diff --git a/src/com/massivecraft/massivecore/ps/PSFormatAbstract.java b/src/com/massivecraft/massivecore/ps/PSFormatAbstract.java
index cdf8c07e..37749f6d 100644
--- a/src/com/massivecraft/massivecore/ps/PSFormatAbstract.java
+++ b/src/com/massivecraft/massivecore/ps/PSFormatAbstract.java
@@ -84,7 +84,7 @@ public class PSFormatAbstract implements PSFormat
 	
 	public List<String> formatEntries(PS ps)
 	{
-		List<String> ret = new ArrayList<String>();
+		List<String> ret = new ArrayList<>();
 		
 		Object val = null;
 		
diff --git a/src/com/massivecraft/massivecore/store/Coll.java b/src/com/massivecraft/massivecore/store/Coll.java
index e82c6da8..464645cf 100644
--- a/src/com/massivecraft/massivecore/store/Coll.java
+++ b/src/com/massivecraft/massivecore/store/Coll.java
@@ -42,7 +42,7 @@ public class Coll<E extends Entity<E>> extends CollAbstract<E>
 	public final static String TOTAL = "*total*"; 
 	
 	// All instances registered here are considered inited.
-	private static Map<String, Coll<?>> name2instance = new ConcurrentSkipListMap<String, Coll<?>>(ComparatorNaturalOrder.get());
+	private static Map<String, Coll<?>> name2instance = new ConcurrentSkipListMap<>(ComparatorNaturalOrder.get());
 	
 	private static Map<String, Coll<?>> umap = Collections.unmodifiableMap(name2instance);
 	private static Set<String> unames = Collections.unmodifiableSet(name2instance.keySet());
@@ -53,7 +53,7 @@ public class Coll<E extends Entity<E>> extends CollAbstract<E>
 	public static Collection<Coll<?>> getInstances() { return uinstances; }
 	public static Collection<SenderColl<?>> getSenderInstances()
 	{
-		List<SenderColl<?>> ret = new ArrayList<SenderColl<?>>();
+		List<SenderColl<?>> ret = new ArrayList<>();
 		for (Coll<?> coll : getInstances())
 		{
 			if ( ! (coll instanceof SenderColl)) continue;
@@ -402,8 +402,8 @@ public class Coll<E extends Entity<E>> extends CollAbstract<E>
 	// -------------------------------------------- //
 
 	// Log database synchronization for display in the "/massivecore mstore stats" command.
-	private Map<String, Long> id2out = new TreeMap<String, Long>();
-	private Map<String, Long> id2in = new TreeMap<String, Long>();
+	private Map<String, Long> id2out = new TreeMap<>();
+	private Map<String, Long> id2in = new TreeMap<>();
 	
 	@Override
 	public Map<String, Long> getSyncMap(boolean in)
@@ -996,8 +996,8 @@ public class Coll<E extends Entity<E>> extends CollAbstract<E>
 		this.collDriverObject = db.createCollDriverObject(this);
 		
 		// Collections
-		this.id2entity = new ConcurrentHashMap<String, E>();
-		this.identifiedModifications = new ConcurrentHashMap<String, Modification>();
+		this.id2entity = new ConcurrentHashMap<>();
+		this.identifiedModifications = new ConcurrentHashMap<>();
 
 		// Migration
 		int version = 0;
diff --git a/src/com/massivecraft/massivecore/store/CollAbstract.java b/src/com/massivecraft/massivecore/store/CollAbstract.java
index 363d2390..f3b5afbe 100644
--- a/src/com/massivecraft/massivecore/store/CollAbstract.java
+++ b/src/com/massivecraft/massivecore/store/CollAbstract.java
@@ -79,7 +79,7 @@ public abstract class CollAbstract<E extends Entity<E>> implements CollInterface
 	@Override public List<E> getAll(Iterable<?> oids)
 	{
 		// Return Create
-		List<E> ret = new ArrayList<E>();
+		List<E> ret = new ArrayList<>();
 		
 		// Return Fill
 		for (Object oid : oids)
diff --git a/src/com/massivecraft/massivecore/store/CollInterface.java b/src/com/massivecraft/massivecore/store/CollInterface.java
index e403237f..b8b87809 100644
--- a/src/com/massivecraft/massivecore/store/CollInterface.java
+++ b/src/com/massivecraft/massivecore/store/CollInterface.java
@@ -19,128 +19,128 @@ public interface CollInterface<E extends Entity<E>> extends Named, Active, Ident
 	// WHAT DO WE HANDLE?
 	// -------------------------------------------- //
 	
-	public String getId();
-	public String getBasename();
-	public String getUniverse();
-	public Class<E> getEntityClass();
+	String getId();
+	String getBasename();
+	String getUniverse();
+	Class<E> getEntityClass();
 	
 	// -------------------------------------------- //
 	// SUPPORTING SYSTEM
 	// -------------------------------------------- //
 	
-	public MassivePlugin getPlugin();
+	MassivePlugin getPlugin();
 	
-	public Db getDb();
-	public Object getCollDriverObject();
+	Db getDb();
+	Object getCollDriverObject();
 	
-	public boolean supportsPusher();
-	public PusherColl getPusher();
+	boolean supportsPusher();
+	PusherColl getPusher();
 	
-	public String getDebugName();
+	String getDebugName();
 	
 	// -------------------------------------------- //
 	// STORAGE
 	// -------------------------------------------- //
 	
-	public String fixId(Object oid);
-	public String fixIdOrThrow(Object oid) throws IllegalArgumentException;
+	String fixId(Object oid);
+	String fixIdOrThrow(Object oid) throws IllegalArgumentException;
 	
-	public Map<String, E> getId2entity();
-	public E get(Object oid);
-	public E get(Object oid, boolean creative);
-	public E getFixed(String id);
-	public E getFixed(String id, boolean creative);
-	public Collection<String> getIds();
-	public Collection<String> getIdsRemote();
-	public boolean containsId(Object oid);
-	public boolean containsIdFixed(String id);
+	Map<String, E> getId2entity();
+	E get(Object oid);
+	E get(Object oid, boolean creative);
+	E getFixed(String id);
+	E getFixed(String id, boolean creative);
+	Collection<String> getIds();
+	Collection<String> getIdsRemote();
+	boolean containsId(Object oid);
+	boolean containsIdFixed(String id);
 	
-	public boolean containsEntity(Object entity);
+	boolean containsEntity(Object entity);
 	
-	public Collection<E> getAll();
+	Collection<E> getAll();
 	
-	public List<E> getAll(Iterable<?> oids, Predicate<? super E> where, Comparator<? super E> orderby, Integer limit, Integer offset);
-	public List<E> getAll(Iterable<?> oids, Predicate<? super E> where, Comparator<? super E> orderby, Integer limit);
-	public List<E> getAll(Iterable<?> oids, Predicate<? super E> where, Comparator<? super E> orderby);
-	public List<E> getAll(Iterable<?> oids, Predicate<? super E> where, Integer limit, Integer offset);
-	public List<E> getAll(Iterable<?> oids, Predicate<? super E> where, Integer limit);
-	public List<E> getAll(Iterable<?> oids, Comparator<? super E> orderby, Integer limit, Integer offset);
-	public List<E> getAll(Iterable<?> oids, Comparator<? super E> orderby, Integer limit);
-	public List<E> getAll(Iterable<?> oids, Predicate<? super E> where);
-	public List<E> getAll(Iterable<?> oids, Comparator<? super E> orderby);
-	public List<E> getAll(Iterable<?> oids, Integer limit, Integer offset);
-	public List<E> getAll(Iterable<?> oids, Integer limit);
-	public List<E> getAll(Iterable<?> oids);
+	List<E> getAll(Iterable<?> oids, Predicate<? super E> where, Comparator<? super E> orderby, Integer limit, Integer offset);
+	List<E> getAll(Iterable<?> oids, Predicate<? super E> where, Comparator<? super E> orderby, Integer limit);
+	List<E> getAll(Iterable<?> oids, Predicate<? super E> where, Comparator<? super E> orderby);
+	List<E> getAll(Iterable<?> oids, Predicate<? super E> where, Integer limit, Integer offset);
+	List<E> getAll(Iterable<?> oids, Predicate<? super E> where, Integer limit);
+	List<E> getAll(Iterable<?> oids, Comparator<? super E> orderby, Integer limit, Integer offset);
+	List<E> getAll(Iterable<?> oids, Comparator<? super E> orderby, Integer limit);
+	List<E> getAll(Iterable<?> oids, Predicate<? super E> where);
+	List<E> getAll(Iterable<?> oids, Comparator<? super E> orderby);
+	List<E> getAll(Iterable<?> oids, Integer limit, Integer offset);
+	List<E> getAll(Iterable<?> oids, Integer limit);
+	List<E> getAll(Iterable<?> oids);
 	
-	public List<E> getAll(Predicate<? super E> where, Comparator<? super E> orderby, Integer limit, Integer offset);
-	public List<E> getAll(Predicate<? super E> where, Comparator<? super E> orderby, Integer limit);
-	public List<E> getAll(Predicate<? super E> where, Comparator<? super E> orderby);
-	public List<E> getAll(Predicate<? super E> where, Integer limit, Integer offset);
-	public List<E> getAll(Predicate<? super E> where, Integer limit);
-	public List<E> getAll(Comparator<? super E> orderby, Integer limit, Integer offset);
-	public List<E> getAll(Comparator<? super E> orderby, Integer limit);
-	public List<E> getAll(Predicate<? super E> where);
-	public List<E> getAll(Comparator<? super E> orderby);
-	public List<E> getAll(Integer limit, Integer offset);
-	public List<E> getAll(Integer limit);
+	List<E> getAll(Predicate<? super E> where, Comparator<? super E> orderby, Integer limit, Integer offset);
+	List<E> getAll(Predicate<? super E> where, Comparator<? super E> orderby, Integer limit);
+	List<E> getAll(Predicate<? super E> where, Comparator<? super E> orderby);
+	List<E> getAll(Predicate<? super E> where, Integer limit, Integer offset);
+	List<E> getAll(Predicate<? super E> where, Integer limit);
+	List<E> getAll(Comparator<? super E> orderby, Integer limit, Integer offset);
+	List<E> getAll(Comparator<? super E> orderby, Integer limit);
+	List<E> getAll(Predicate<? super E> where);
+	List<E> getAll(Comparator<? super E> orderby);
+	List<E> getAll(Integer limit, Integer offset);
+	List<E> getAll(Integer limit);
 		
 	// -------------------------------------------- //
 	// BEHAVIOR
 	// -------------------------------------------- //
 	
-	public boolean isCreative();
-	public void setCreative(boolean creative);
+	boolean isCreative();
+	void setCreative(boolean creative);
 	
-	public boolean isLowercasing();
-	public void setLowercasing(boolean lowercasing);
+	boolean isLowercasing();
+	void setLowercasing(boolean lowercasing);
 	
 	// A default entity will not be saved.
 	// This is often used together with creative collections to save disc space.
-	public boolean isDefault(E entity);
+	boolean isDefault(E entity);
 
-	public int getEntityTargetVersion();
+	int getEntityTargetVersion();
 	
 	// -------------------------------------------- //
 	// COPY AND CREATE
 	// -------------------------------------------- //
 	
-	public void copy(E fromo, E too);
+	void copy(E fromo, E too);
 	
 	// This simply creates and returns a new instance
 	// It does not detach/attach or anything. Just creates a new instance.
-	public E createNewInstance();
+	E createNewInstance();
 	
 	// Create new instance with automatic id
-	public E create();
+	E create();
 	// Create new instance with the requested id
-	public E create(Object oid);
+	E create(Object oid);
 	
 	// -------------------------------------------- //
 	// ATTACH AND DETACH
 	// -------------------------------------------- //
 	
-	public String attach(E entity);
-	public String attach(E entity, Object oid);
+	String attach(E entity);
+	String attach(E entity, Object oid);
 	
-	public E detachEntity(E entity);
-	public E detachId(Object oid);
-	public E detachIdFixed(String id);
+	E detachEntity(E entity);
+	E detachId(Object oid);
+	E detachIdFixed(String id);
 	
-	public void preAttach(E entity, String id);
-	public void postAttach(E entity, String id);
+	void preAttach(E entity, String id);
+	void postAttach(E entity, String id);
 	
-	public void preDetach(E entity, String id);
-	public void postDetach(E entity, String id);
+	void preDetach(E entity, String id);
+	void postDetach(E entity, String id);
 	
 	// -------------------------------------------- //
 	// IDENTIFIED MODIFICATIONS
 	// -------------------------------------------- //
 
-	public void putIdentifiedModification(Object oid, Modification modification);
-	public void putIdentifiedModificationFixed(String id, Modification modification);
+	void putIdentifiedModification(Object oid, Modification modification);
+	void putIdentifiedModificationFixed(String id, Modification modification);
 	
-	public void removeIdentifiedModification(Object oid);
-	public void removeIdentifiedModificationFixed(String id);
+	void removeIdentifiedModification(Object oid);
+	void removeIdentifiedModificationFixed(String id);
 	
 	// -------------------------------------------- //
 	// SYNC LOG
@@ -153,68 +153,68 @@ public interface CollInterface<E extends Entity<E>> extends Named, Active, Ident
 	public void clearSynclog(Object oid);
 	*/
 	
-	public Map<String, Long> getSyncMap(boolean in);
-	public long getSyncCountFixed(String name, boolean in);
-	public void addSyncCountFixed(String name, boolean in);
+	Map<String, Long> getSyncMap(boolean in);
+	long getSyncCountFixed(String name, boolean in);
+	void addSyncCountFixed(String name, boolean in);
 	
 	// -------------------------------------------- //
 	// SYNC LOWLEVEL IO ACTIONS
 	// -------------------------------------------- //
 	
 	// oid
-	public E removeAtLocal(Object oid);
-	public void removeAtRemote(Object oid);
-	public void saveToRemote(Object oid);
-	public void loadFromRemote(Object oid, Entry<JsonObject, Long> remoteEntry);
+	E removeAtLocal(Object oid);
+	void removeAtRemote(Object oid);
+	void saveToRemote(Object oid);
+	void loadFromRemote(Object oid, Entry<JsonObject, Long> remoteEntry);
 	
 	// Fixed id
-	public E removeAtLocalFixed(String id);
-	public void removeAtRemoteFixed(String id);
-	public void saveToRemoteFixed(String id);
-	public void loadFromRemoteFixed(String id, Entry<JsonObject, Long> remoteEntry);
+	E removeAtLocalFixed(String id);
+	void removeAtRemoteFixed(String id);
+	void saveToRemoteFixed(String id);
+	void loadFromRemoteFixed(String id, Entry<JsonObject, Long> remoteEntry);
 	
 	// -------------------------------------------- //
 	// SYNC EXAMINE AND DO
 	// -------------------------------------------- //
 	
 	// oid
-	public Modification examineId(Object oid, Long remoteMtime, boolean local, boolean remote);
+	Modification examineId(Object oid, Long remoteMtime, boolean local, boolean remote);
 	
 	// Fixed id
-	public Modification examineIdFixed(String id, Long remoteMtime, boolean local, boolean remote);
+	Modification examineIdFixed(String id, Long remoteMtime, boolean local, boolean remote);
 	
 	// Sync
-	public Modification syncId(Object oid);
-	public Modification syncId(Object oid, Modification modification);
-	public Modification syncId(Object oid, Modification modification, Entry<JsonObject, Long> remoteEntry);
+	Modification syncId(Object oid);
+	Modification syncId(Object oid, Modification modification);
+	Modification syncId(Object oid, Modification modification, Entry<JsonObject, Long> remoteEntry);
 	
 	// Sync fixed
-	public Modification syncIdFixed(String id);
-	public Modification syncIdFixed(String id, Modification modification);
-	public Modification syncIdFixed(String id, Modification modification, Entry<JsonObject, Long> remoteEntry);
+	Modification syncIdFixed(String id);
+	Modification syncIdFixed(String id, Modification modification);
+	Modification syncIdFixed(String id, Modification modification, Entry<JsonObject, Long> remoteEntry);
 	
-	public void syncIdentified();
-	public void syncAll();
+	void syncIdentified();
+	void syncAll();
 	
 	// Identity
-	public void identifyModifications(Modification veto);
-	public void identifyModificationFixed(String id, Long remoteMtime, Modification veto);
+	void identifyModifications(Modification veto);
+	void identifyModificationFixed(String id, Long remoteMtime, Modification veto);
 	
-	public void identifyLocalModifications(Modification veto);
-	public void identifyLocalModificationFixed(String id, Modification veto);
+	void identifyLocalModifications(Modification veto);
+	void identifyLocalModificationFixed(String id, Modification veto);
 	
-	public void identifyRemoteModifications(Modification veto);
-	public void identifyRemoteModificationFixed(String id, Long remoteMtime, Modification veto);
+	void identifyRemoteModifications(Modification veto);
+	void identifyRemoteModificationFixed(String id, Long remoteMtime, Modification veto);
 	
 	// Init
-	public void initLoadAllFromRemote();
+	void initLoadAllFromRemote();
 	
 	// -------------------------------------------- //
 	// SYNC RUNNABLES / SCHEDULING
 	// -------------------------------------------- //
 	
 	// The tickTask simply runs the onTick method.
-	public Runnable getTickTask();
-	public void onTick();
+	Runnable getTickTask();
+	void onTick();
 	
 }
diff --git a/src/com/massivecraft/massivecore/store/Colls.java b/src/com/massivecraft/massivecore/store/Colls.java
index 9ad5eeee..b82aa76e 100644
--- a/src/com/massivecraft/massivecore/store/Colls.java
+++ b/src/com/massivecraft/massivecore/store/Colls.java
@@ -13,7 +13,7 @@ import java.util.Map;
 
 public abstract class Colls<C extends Coll<E>, E extends Entity<E>> implements Active
 {
-	protected Map<String, C> name2coll = new HashMap<String, C>();
+	protected Map<String, C> name2coll = new HashMap<>();
 	
 	public abstract Aspect getAspect();
 	public abstract String getBasename();
@@ -25,7 +25,7 @@ public abstract class Colls<C extends Coll<E>, E extends Entity<E>> implements A
 	
 	public List<C> getColls()
 	{
-		List<C> ret = new ArrayList<C>(); 
+		List<C> ret = new ArrayList<>();
 		Aspect a = this.getAspect();
 		Multiverse m = a.getMultiverse();
 		for (String universe : m.getUniverses())
diff --git a/src/com/massivecraft/massivecore/store/Db.java b/src/com/massivecraft/massivecore/store/Db.java
index bdaa09f9..1c87f089 100644
--- a/src/com/massivecraft/massivecore/store/Db.java
+++ b/src/com/massivecraft/massivecore/store/Db.java
@@ -14,33 +14,33 @@ public interface Db
 	// -------------------------------------------- //
 	
 	// Returns the name of the database.
-	public String getDbName();
+	String getDbName();
 	
 	// Returns the driver running this database.
-	public Driver getDriver();
+	Driver getDriver();
 	
 	// Creates a new collection driver object.
 	// This object will be stored inside the Coll.
-	public Object createCollDriverObject(Coll<?> coll);
+	Object createCollDriverObject(Coll<?> coll);
 	
 	// -------------------------------------------- //
 	// DRIVER
 	// -------------------------------------------- //
 	
-	public String getDriverName();
-	public Db getDb(String uri); // TODO: This seems a bit odd.
-	public boolean dropDb();
-	public Set<String> getCollnames();
-	public boolean renameColl(String from, String to);
-	public boolean containsId(Coll<?> coll, String id);
-	public long getMtime(Coll<?> coll, String id);
-	public Collection<String> getIds(Coll<?> coll);
-	public Map<String, Long> getId2mtime(Coll<?> coll);
-	public Entry<JsonObject, Long> load(Coll<?> coll, String id);
-	public Map<String, Entry<JsonObject, Long>> loadAll(Coll<?> coll);
-	public long save(Coll<?> coll, String id, JsonObject data);
-	public void delete(Coll<?> coll, String id);
-	public boolean supportsPusher();
-	public PusherColl getPusher(Coll<?> coll);
+	String getDriverName();
+	Db getDb(String uri); // TODO: This seems a bit odd.
+	boolean dropDb();
+	Set<String> getCollnames();
+	boolean renameColl(String from, String to);
+	boolean containsId(Coll<?> coll, String id);
+	long getMtime(Coll<?> coll, String id);
+	Collection<String> getIds(Coll<?> coll);
+	Map<String, Long> getId2mtime(Coll<?> coll);
+	Entry<JsonObject, Long> load(Coll<?> coll, String id);
+	Map<String, Entry<JsonObject, Long>> loadAll(Coll<?> coll);
+	long save(Coll<?> coll, String id, JsonObject data);
+	void delete(Coll<?> coll, String id);
+	boolean supportsPusher();
+	PusherColl getPusher(Coll<?> coll);
 	
 }
diff --git a/src/com/massivecraft/massivecore/store/Driver.java b/src/com/massivecraft/massivecore/store/Driver.java
index 05360e20..6a61ffd4 100644
--- a/src/com/massivecraft/massivecore/store/Driver.java
+++ b/src/com/massivecraft/massivecore/store/Driver.java
@@ -10,55 +10,55 @@ import java.util.Set;
 public interface Driver
 {
 	// Returns the name of the driver.
-	public String getDriverName();
+	String getDriverName();
 	
 	// Get a database instance from the driver
-	public Db getDb(String uri);
+	Db getDb(String uri);
 	
 	// This will delete the whole database and all collections therein.
-	public boolean dropDb(Db db);
+	boolean dropDb(Db db);
 	
 	// What collections are in the database?
-	public Set<String> getCollnames(Db db);
+	Set<String> getCollnames(Db db);
 	
 	// Rename a collection
-	public boolean renameColl(Db db, String from, String to);
+	boolean renameColl(Db db, String from, String to);
 	
 	// Is id X in the collection?
-	public boolean containsId(Coll<?> coll, String id);
+	boolean containsId(Coll<?> coll, String id);
 	
 	// When was X last altered?
 	// return == null will never happen.
 	// return != 0 means X exists and return is when it last was altered.
 	// return == 0 means X does not exist in the database.
-	public long getMtime(Coll<?> coll, String id);
+	long getMtime(Coll<?> coll, String id);
 		
 	// What ids are in the collection?
-	public Collection<String> getIds(Coll<?> coll);
+	Collection<String> getIds(Coll<?> coll);
 	
 	// Return a map of all ids with their corresponding mtimes
-	public Map<String, Long> getId2mtime(Coll<?> coll);
+	Map<String, Long> getId2mtime(Coll<?> coll);
 	
 	// Load the raw data for X. The second part of the entry is the remote mtime at the load.
 	// return == null will never happen.
 	// return.getKey() == null || return.getValue() == 0 means something failed.
-	public Entry<JsonObject, Long> load(Coll<?> coll, String id);
+	Entry<JsonObject, Long> load(Coll<?> coll, String id);
 	
 	// Load all database content at once
 	// NOTE: This method is assumed to be based on the one above.
 	// NOTE: Values where JsonObject == null and Long == 0 may occur.
-	public Map<String, Entry<JsonObject, Long>> loadAll(Coll<?> coll);
+	Map<String, Entry<JsonObject, Long>> loadAll(Coll<?> coll);
 	
 	// Save raw data as X
 	// Return value is the new mtime (we caused the change).
 	// return == null will never happen.
 	// return == 0 means something failed. Usually failures are not catched, though. System.currentTimeMillis() is returned most of the time.
-	public long save(Coll<?> coll, String id, JsonObject data);
+	long save(Coll<?> coll, String id, JsonObject data);
 	
 	// Delete X
-	public void delete(Coll<?> coll, String id);
+	void delete(Coll<?> coll, String id);
 	
 	// Database pusher
-	public boolean supportsPusher();
-	public PusherColl getPusher(Coll<?> coll);
+	boolean supportsPusher();
+	PusherColl getPusher(Coll<?> coll);
 }
diff --git a/src/com/massivecraft/massivecore/store/DriverFlatfile.java b/src/com/massivecraft/massivecore/store/DriverFlatfile.java
index b97c388d..b50d2282 100644
--- a/src/com/massivecraft/massivecore/store/DriverFlatfile.java
+++ b/src/com/massivecraft/massivecore/store/DriverFlatfile.java
@@ -68,7 +68,7 @@ public class DriverFlatfile extends DriverAbstract
 	@Override
 	public Set<String> getCollnames(Db db)
 	{
-		Set<String> ret = new LinkedHashSet<String>();
+		Set<String> ret = new LinkedHashSet<>();
 		
 		for (File file : ((DbFlatfile)db).directory.listFiles())
 		{
@@ -105,7 +105,7 @@ public class DriverFlatfile extends DriverAbstract
 	@Override
 	public Collection<String> getIds(Coll<?> coll)
 	{
-		List<String> ret = new ArrayList<String>();
+		List<String> ret = new ArrayList<>();
 		
 		// Scan the collection folder for .json files
 		File collDir = getDirectory(coll);
@@ -122,7 +122,7 @@ public class DriverFlatfile extends DriverAbstract
 	public Map<String, Long> getId2mtime(Coll<?> coll)
 	{
 		// Create Ret
-		Map<String, Long> ret = new HashMap<String, Long>();
+		Map<String, Long> ret = new HashMap<>();
 		
 		// Get Directory
 		File directory = getDirectory(coll);
@@ -153,7 +153,7 @@ public class DriverFlatfile extends DriverAbstract
 		long mtime = file.lastModified();
 		JsonObject raw = loadFileJson(file);
 		
-		return new SimpleEntry<JsonObject, Long>(raw, mtime);
+		return new SimpleEntry<>(raw, mtime);
 	}
 	
 	public JsonObject loadFileJson(File file)
@@ -181,7 +181,7 @@ public class DriverFlatfile extends DriverAbstract
 		File[] files = directory.listFiles(JsonFileFilter.get());
 		
 		// Create Ret
-		ret = new LinkedHashMap<String, Entry<JsonObject, Long>>(files.length);
+		ret = new LinkedHashMap<>(files.length);
 		
 		// For Each Found
 		for (File file : files)
diff --git a/src/com/massivecraft/massivecore/store/DriverMongo.java b/src/com/massivecraft/massivecore/store/DriverMongo.java
index d3f940f7..e5c5496c 100644
--- a/src/com/massivecraft/massivecore/store/DriverMongo.java
+++ b/src/com/massivecraft/massivecore/store/DriverMongo.java
@@ -124,7 +124,7 @@ public class DriverMongo extends DriverAbstract
 		DBCursor cursor = dbcoll.find(dboEmpty, dboKeysId);
 		try
 		{
-			ret = new ArrayList<String>(cursor.count());
+			ret = new ArrayList<>(cursor.count());
 			while (cursor.hasNext())
 			{
 				Object remoteId = cursor.next().get(ID_FIELD);
@@ -149,7 +149,7 @@ public class DriverMongo extends DriverAbstract
 		DBCursor cursor = dbcoll.find(dboEmpty, dboKeysIdandMtime);
 		try
 		{
-			ret = new HashMap<String, Long>(cursor.count());
+			ret = new HashMap<>(cursor.count());
 			while (cursor.hasNext())
 			{
 				BasicDBObject raw = (BasicDBObject)cursor.next();
@@ -181,7 +181,7 @@ public class DriverMongo extends DriverAbstract
 	
 	public Entry<JsonObject, Long> loadRaw(BasicDBObject raw)
 	{
-		if (raw == null) return new SimpleEntry<JsonObject, Long>(null, 0L);
+		if (raw == null) return new SimpleEntry<>(null, 0L);
 		
 		// Throw away the id field
 		raw.removeField(ID_FIELD);
@@ -199,7 +199,7 @@ public class DriverMongo extends DriverAbstract
 		// Convert MongoDB --> GSON
 		JsonObject element = GsonMongoConverter.mongo2GsonObject(raw);
 		
-		return new SimpleEntry<JsonObject, Long>(element, mtime);
+		return new SimpleEntry<>(element, mtime);
 	}
 	
 	@Override
@@ -217,7 +217,7 @@ public class DriverMongo extends DriverAbstract
 		try
 		{
 			// Create Ret
-			ret = new LinkedHashMap<String, Entry<JsonObject, Long>>(cursor.count());
+			ret = new LinkedHashMap<>(cursor.count());
 			
 			// For Each Found
 			while (cursor.hasNext())
diff --git a/src/com/massivecraft/massivecore/store/IndexUniqueField.java b/src/com/massivecraft/massivecore/store/IndexUniqueField.java
index 6d7a22ff..5a044448 100644
--- a/src/com/massivecraft/massivecore/store/IndexUniqueField.java
+++ b/src/com/massivecraft/massivecore/store/IndexUniqueField.java
@@ -19,7 +19,7 @@ public class IndexUniqueField<F, O>
 	public IndexUniqueField(Map<F, O> map)
 	{
 		this.f2o = map;
-		this.o2f = new HashMap<O, F>();
+		this.o2f = new HashMap<>();
 	}
 	
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/massivecore/store/MStore.java b/src/com/massivecraft/massivecore/store/MStore.java
index f3cbc10c..f9154ff9 100644
--- a/src/com/massivecraft/massivecore/store/MStore.java
+++ b/src/com/massivecraft/massivecore/store/MStore.java
@@ -22,7 +22,7 @@ public class MStore
 	// DRIVER REGISTRY
 	// -------------------------------------------- //
 	
-	private static Map<String, Driver> drivers = new HashMap<String, Driver>();
+	private static Map<String, Driver> drivers = new HashMap<>();
 	public static boolean registerDriver(Driver driver)
 	{
 		if (drivers.containsKey(driver.getDriverName())) return false;
@@ -67,7 +67,7 @@ public class MStore
 	// -------------------------------------------- //
 	
 	// We cache databases here
-	private static Map<String, Db> uri2db = new HashMap<String, Db>();
+	private static Map<String, Db> uri2db = new HashMap<>();
 	
 	public static String resolveAlias(String alias)
 	{
diff --git a/src/com/massivecraft/massivecore/store/Modification.java b/src/com/massivecraft/massivecore/store/Modification.java
index fede663e..d6a4854a 100644
--- a/src/com/massivecraft/massivecore/store/Modification.java
+++ b/src/com/massivecraft/massivecore/store/Modification.java
@@ -38,7 +38,7 @@ public enum Modification
 	// CONSTRUCT
 	// -------------------------------------------- //
 	
-	private Modification(boolean modified, int priority)
+	Modification(boolean modified, int priority)
 	{
 		this.modified = modified;
 		this.priority = priority;
diff --git a/src/com/massivecraft/massivecore/store/PusherColl.java b/src/com/massivecraft/massivecore/store/PusherColl.java
index 54aed630..9c5fd410 100644
--- a/src/com/massivecraft/massivecore/store/PusherColl.java
+++ b/src/com/massivecraft/massivecore/store/PusherColl.java
@@ -2,6 +2,6 @@ package com.massivecraft.massivecore.store;
 
 public interface PusherColl
 {
-	public void init();
-	public void deinit();
+	void init();
+	void deinit();
 }
diff --git a/src/com/massivecraft/massivecore/store/PusherCollFlatfile.java b/src/com/massivecraft/massivecore/store/PusherCollFlatfile.java
index 3b1989af..7eb35840 100644
--- a/src/com/massivecraft/massivecore/store/PusherCollFlatfile.java
+++ b/src/com/massivecraft/massivecore/store/PusherCollFlatfile.java
@@ -39,7 +39,7 @@ public class PusherCollFlatfile extends Thread implements PusherColl
 	private final WatchService watcher;
 	private final Map<WatchKey, Path> keys;
 	private final Coll<?> coll;
-	private final Set<String> handledIds = new HashSet<String>();
+	private final Set<String> handledIds = new HashSet<>();
 	
 	// -------------------------------------------- //
 	// OVERRIDE: THREAD
@@ -215,7 +215,7 @@ public class PusherCollFlatfile extends Thread implements PusherColl
 		if ( ! (db instanceof DbFlatfile)) throw new IllegalArgumentException("Coll doesn't use flatfile database");
 		this.folderUri = db.getDbName() + "/" + coll.getBasename();
 		this.watcher = FileSystems.getDefault().newWatchService();
-		this.keys = new HashMap<WatchKey, Path>();
+		this.keys = new HashMap<>();
 		this.coll = coll;
 		
 		// We must make sure that the paths exists,
diff --git a/src/com/massivecraft/massivecore/store/SenderColl.java b/src/com/massivecraft/massivecore/store/SenderColl.java
index ae1072a6..e0ccf9d2 100644
--- a/src/com/massivecraft/massivecore/store/SenderColl.java
+++ b/src/com/massivecraft/massivecore/store/SenderColl.java
@@ -103,7 +103,7 @@ public class SenderColl<E extends SenderEntity<E>> extends Coll<E> implements Se
 	@Override
 	public Collection<Collection<String>> getSenderIdCollections()
 	{
-		List<Collection<String>> ret = new ArrayList<Collection<String>>();
+		List<Collection<String>> ret = new ArrayList<>();
 		
 		ret.add(this.getIds());
 		
diff --git a/src/com/massivecraft/massivecore/store/SenderIdSource.java b/src/com/massivecraft/massivecore/store/SenderIdSource.java
index 17f22fa8..217fb685 100644
--- a/src/com/massivecraft/massivecore/store/SenderIdSource.java
+++ b/src/com/massivecraft/massivecore/store/SenderIdSource.java
@@ -4,5 +4,5 @@ import java.util.Collection;
 
 public interface SenderIdSource
 {
-	public Collection<Collection<String>> getSenderIdCollections();
+	Collection<Collection<String>> getSenderIdCollections();
 }
diff --git a/src/com/massivecraft/massivecore/store/SenderIdSourceMixinAllSenderIds.java b/src/com/massivecraft/massivecore/store/SenderIdSourceMixinAllSenderIds.java
index ab549b8a..3aee4455 100644
--- a/src/com/massivecraft/massivecore/store/SenderIdSourceMixinAllSenderIds.java
+++ b/src/com/massivecraft/massivecore/store/SenderIdSourceMixinAllSenderIds.java
@@ -24,7 +24,7 @@ public class SenderIdSourceMixinAllSenderIds implements SenderIdSource
 	@Override
 	public Collection<Collection<String>> getSenderIdCollections()
 	{
-		List<Collection<String>> ret = new ArrayList<Collection<String>>();
+		List<Collection<String>> ret = new ArrayList<>();
 		ret.add(IdUtil.getIds(SenderPresence.ANY, SenderType.ANY));
 		return ret;
 	}
diff --git a/src/com/massivecraft/massivecore/store/accessor/Accessor.java b/src/com/massivecraft/massivecore/store/accessor/Accessor.java
index 3a41481f..012cd4a5 100644
--- a/src/com/massivecraft/massivecore/store/accessor/Accessor.java
+++ b/src/com/massivecraft/massivecore/store/accessor/Accessor.java
@@ -20,7 +20,7 @@ public class Accessor
 	private final Class<?> clazz;
 	public Class<?> getClazz() { return this.clazz; }
 		
-	private Map<String, FieldAccessor> fieldToAccessor = new LinkedHashMap<String, FieldAccessor>();
+	private Map<String, FieldAccessor> fieldToAccessor = new LinkedHashMap<>();
 	public Map<String, FieldAccessor> getFieldToAccessor() { return this.fieldToAccessor; }
 	
 	public FieldAccessor getFieldAccessor(String fieldName)
@@ -44,7 +44,7 @@ public class Accessor
 	// CONSTRUCT / FACTORY
 	// -------------------------------------------- //
 	
-	private static Map<Class<?>, Accessor> classToAccessor = new HashMap<Class<?>, Accessor>();
+	private static Map<Class<?>, Accessor> classToAccessor = new HashMap<>();
 	
 	public static Accessor get(Class<?> clazz)
 	{
@@ -126,7 +126,7 @@ public class Accessor
 	
 	public static List<Field> getFieldList(Class<?> clazz)
 	{
-		List<Field> fields = new ArrayList<Field>();
+		List<Field> fields = new ArrayList<>();
 		
 		for (Class<?> c = clazz; c != null; c = c.getSuperclass())
 		{
@@ -138,7 +138,7 @@ public class Accessor
 	
 	public static Map<String, Field> getFieldMap(Class<?> clazz)
 	{
-		Map<String, Field> ret = new LinkedHashMap<String, Field>();
+		Map<String, Field> ret = new LinkedHashMap<>();
 		
 		for (Field field : getFieldList(clazz))
 		{
diff --git a/src/com/massivecraft/massivecore/store/migration/VersionMigrator.java b/src/com/massivecraft/massivecore/store/migration/VersionMigrator.java
index a5a2d155..8a4de7a4 100644
--- a/src/com/massivecraft/massivecore/store/migration/VersionMigrator.java
+++ b/src/com/massivecraft/massivecore/store/migration/VersionMigrator.java
@@ -8,6 +8,6 @@ public interface VersionMigrator
 	// MIGRATION
 	// -------------------------------------------- //
 
-	public void migrate(JsonObject entity);
+	void migrate(JsonObject entity);
 
 }
diff --git a/src/com/massivecraft/massivecore/teleport/Destination.java b/src/com/massivecraft/massivecore/teleport/Destination.java
index 7e6c94ff..6f57a853 100644
--- a/src/com/massivecraft/massivecore/teleport/Destination.java
+++ b/src/com/massivecraft/massivecore/teleport/Destination.java
@@ -7,10 +7,10 @@ import java.io.Serializable;
 
 public interface Destination extends Serializable
 {
-	public PS getPs(Object watcherObject) throws MassiveException;
-	public boolean hasPs();
-	public String getMessagePsNull(Object watcherObject);
+	PS getPs(Object watcherObject) throws MassiveException;
+	boolean hasPs();
+	String getMessagePsNull(Object watcherObject);
 	
-	public String getDesc(Object watcherObject);
-	public void setDesc(String desc);
+	String getDesc(Object watcherObject);
+	void setDesc(String desc);
 }
diff --git a/src/com/massivecraft/massivecore/util/ContainerUtil.java b/src/com/massivecraft/massivecore/util/ContainerUtil.java
index 95a4ddfa..81ce3799 100644
--- a/src/com/massivecraft/massivecore/util/ContainerUtil.java
+++ b/src/com/massivecraft/massivecore/util/ContainerUtil.java
@@ -198,7 +198,7 @@ public class ContainerUtil
 		throw new IllegalArgumentException(container.getClass().getName() + " is not a container.");
 	}
 	
-	public static void setElements(Object container, Iterable<? extends Object> elements)
+	public static void setElements(Object container, Iterable<?> elements)
 	{
 		clear(container);
 		addElements(container, elements);
@@ -228,7 +228,7 @@ public class ContainerUtil
 		throw new IllegalArgumentException(container.getClass().getName() + " is not a container.");
 	}
 	
-	public static void addElements(Object container, Iterable<? extends Object> elements)
+	public static void addElements(Object container, Iterable<?> elements)
 	{
 		if (container == null) throw new NullPointerException("container");
 		if (elements == null) throw new NullPointerException("elements");
@@ -246,7 +246,7 @@ public class ContainerUtil
 	public static <E> Collection<E> getAdditions(Object before, Object after)
 	{
 		Collection<E> elements = ContainerUtil.getElements(after);
-		Set<E> ret = new MassiveSet<E>(elements);
+		Set<E> ret = new MassiveSet<>(elements);
 		ret.removeAll(ContainerUtil.getElements(before));
 		return ret;
 	}
@@ -254,7 +254,7 @@ public class ContainerUtil
 	public static <E> Collection<E> getDeletions(Object before, Object after)
 	{
 		Collection<E> elements = ContainerUtil.getElements(before);
-		Set<E> ret = new MassiveSet<E>(elements);
+		Set<E> ret = new MassiveSet<>(elements);
 		ret.removeAll(ContainerUtil.getElements(after));
 		return ret;
 	}
diff --git a/src/com/massivecraft/massivecore/util/IdUtil.java b/src/com/massivecraft/massivecore/util/IdUtil.java
index 2cbeeaa8..b96988b3 100644
--- a/src/com/massivecraft/massivecore/util/IdUtil.java
+++ b/src/com/massivecraft/massivecore/util/IdUtil.java
@@ -97,11 +97,11 @@ public class IdUtil implements Listener, Runnable
 	public static Set<IdData> getDatas() { return datas; }
 	
 	// Id Index
-	private static Map<String, IdData> idToData = new ConcurrentSkipListMap<String, IdData>(String.CASE_INSENSITIVE_ORDER);
+	private static Map<String, IdData> idToData = new ConcurrentSkipListMap<>(String.CASE_INSENSITIVE_ORDER);
 	public static Map<String, IdData> getIdToData() { return idToData;  }
 	
 	// Name Index
-	private static Map<String, IdData> nameToData = new ConcurrentSkipListMap<String, IdData>(String.CASE_INSENSITIVE_ORDER);
+	private static Map<String, IdData> nameToData = new ConcurrentSkipListMap<>(String.CASE_INSENSITIVE_ORDER);
 	public static Map<String, IdData> getNameToData() { return nameToData; }
 	
 	// -------------------------------------------- //
@@ -129,10 +129,10 @@ public class IdUtil implements Listener, Runnable
 	// For registering extra custom CommandSender implementations.
 	// It's assumed that the getName() returns the name which is also the id.
 	
-	private static Map<String, CommandSender> registryIdToSender = new ConcurrentHashMap<String, CommandSender>();
+	private static Map<String, CommandSender> registryIdToSender = new ConcurrentHashMap<>();
 	public static Map<String, CommandSender> getRegistryIdToSender() { return Collections.unmodifiableMap(registryIdToSender); }
 	
-	private static Map<CommandSender, String> registrySenderToId = new ConcurrentHashMap<CommandSender, String>();
+	private static Map<CommandSender, String> registrySenderToId = new ConcurrentHashMap<>();
 	public static Map<CommandSender, String> getRegistrySenderToId() { return Collections.unmodifiableMap(registrySenderToId); }
 	
 	public static void register(CommandSender sender)
@@ -177,7 +177,7 @@ public class IdUtil implements Listener, Runnable
 	
 	public static Set<CommandSender> getLocalSenders()
 	{
-		Set<CommandSender> ret = new LinkedHashSet<CommandSender>();
+		Set<CommandSender> ret = new LinkedHashSet<>();
 		
 		// Add Online Players
 		ret.addAll(MUtil.getOnlinePlayers());
@@ -900,9 +900,9 @@ public class IdUtil implements Listener, Runnable
 		{
 			String content = DiscUtil.readCatch(CACHEFILE);
 			
-			if (content == null) return new HashSet<IdData>();
+			if (content == null) return new HashSet<>();
 			content = content.trim();
-			if (content.length() == 0) return new HashSet<IdData>();
+			if (content.length() == 0) return new HashSet<>();
 			
 			Set<IdData> ret = MassiveCore.gson.fromJson(content, CACHEFILE_TYPE);
 			return ret;
@@ -922,7 +922,7 @@ public class IdUtil implements Listener, Runnable
 	
 	public static Set<IdData> getLocalPlayerDatas()
 	{
-		Set<IdData> ret = new LinkedHashSet<IdData>();
+		Set<IdData> ret = new LinkedHashSet<>();
 		
 		long millis = System.currentTimeMillis();
 		
diff --git a/src/com/massivecraft/massivecore/util/IntervalUtil.java b/src/com/massivecraft/massivecore/util/IntervalUtil.java
index 26f7876b..7bfbfd8b 100644
--- a/src/com/massivecraft/massivecore/util/IntervalUtil.java
+++ b/src/com/massivecraft/massivecore/util/IntervalUtil.java
@@ -50,7 +50,7 @@ public class IntervalUtil
 	{
 		if (interval == null)
 		{
-			return new SimpleEntry<Double, Double>(dmin, dmax);
+			return new SimpleEntry<>(dmin, dmax);
 		}
 		
 		if (interval.contains("to"))
@@ -60,18 +60,18 @@ public class IntervalUtil
 			{
 				Double min = parseDouble(parts[0], dmin);
 				Double max = parseDouble(parts[1], dmax);
-				return new SimpleEntry<Double, Double>(min, max);
+				return new SimpleEntry<>(min, max);
 			}
 		}
 		Double single = parseDouble(interval, dmin);
-		return new SimpleEntry<Double, Double>(single, single);
+		return new SimpleEntry<>(single, single);
 	}
 	
 	public static Entry<Integer, Integer> parseIntegerInterval(String interval, Integer dmin, Integer dmax)
 	{
 		if (interval == null)
 		{
-			return new SimpleEntry<Integer, Integer>(dmin, dmax);
+			return new SimpleEntry<>(dmin, dmax);
 		}
 		
 		if (interval.contains("to"))
@@ -81,11 +81,11 @@ public class IntervalUtil
 			{
 				Integer min = parseInteger(parts[0], dmin);
 				Integer max = parseInteger(parts[1], dmax);
-				return new SimpleEntry<Integer, Integer>(min, max);
+				return new SimpleEntry<>(min, max);
 			}
 		}
 		Integer single = parseInteger(interval, dmin);
-		return new SimpleEntry<Integer, Integer>(single, single);
+		return new SimpleEntry<>(single, single);
 	}
 	
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/massivecore/util/InventoryUtil.java b/src/com/massivecraft/massivecore/util/InventoryUtil.java
index 4277e2bc..46bab49a 100644
--- a/src/com/massivecraft/massivecore/util/InventoryUtil.java
+++ b/src/com/massivecraft/massivecore/util/InventoryUtil.java
@@ -784,7 +784,7 @@ public class InventoryUtil
 			}
 			
 			amount *= -1;
-			ret.add(new SimpleEntry<ItemStack, Integer>(item, amount));
+			ret.add(new SimpleEntry<>(item, amount));
 		}
 		
 		// Take
@@ -796,7 +796,7 @@ public class InventoryUtil
 			if (action == InventoryAction.PICKUP_ONE) amount = 1;
 			if (action == InventoryAction.PICKUP_HALF) amount = (int) Math.ceil(amount / 2.0);
 			
-			ret.add(new SimpleEntry<ItemStack, Integer>(item, amount));			
+			ret.add(new SimpleEntry<>(item, amount));
 		}
 		
 		// Return
@@ -821,10 +821,10 @@ public class InventoryUtil
 			if (InventoryUtil.isBottomInventory(rawSlot, inventory)) continue;
 			
 			ItemStack take = inventory.getItem(rawSlot);
-			if (isSomething(take)) ret.add(new SimpleEntry<ItemStack, Integer>(take, +take.getAmount()));
+			if (isSomething(take)) ret.add(new SimpleEntry<>(take, +take.getAmount()));
 			
 			ItemStack give = entry.getValue();
-			if (isSomething(give)) ret.add(new SimpleEntry<ItemStack, Integer>(give, -give.getAmount()));
+			if (isSomething(give)) ret.add(new SimpleEntry<>(give, -give.getAmount()));
 		}
 		
 		// Return
diff --git a/src/com/massivecraft/massivecore/util/MUtil.java b/src/com/massivecraft/massivecore/util/MUtil.java
index 4a78d835..1effe032 100644
--- a/src/com/massivecraft/massivecore/util/MUtil.java
+++ b/src/com/massivecraft/massivecore/util/MUtil.java
@@ -513,7 +513,7 @@ public class MUtil
 	
 	public static List<String> getStackTraceStrings(List<StackTraceElement> stackTrace, boolean color)
 	{
-		List<String> ret = new MassiveList<String>();
+		List<String> ret = new MassiveList<>();
 		
 		for (StackTraceElement element : stackTrace)
 		{
@@ -638,7 +638,7 @@ public class MUtil
 	
 	public static <T> List<T> repeat(T object, int times)
 	{
-		List<T> ret = new ArrayList<T>(times);
+		List<T> ret = new ArrayList<>(times);
 		for (int i = 1; i <= times; i++)
 		{
 			ret.add(object);
@@ -749,13 +749,13 @@ public class MUtil
 	
 	public static <T> List<List<T>> transpose(List<List<T>> rows)
 	{
-		List<List<T>> ret = new ArrayList<List<T>>();
+		List<List<T>> ret = new ArrayList<>();
 		
 		final int n = rows.get(0).size();
 		
 		for (int i = 0; i < n; i++)
 		{
-			List<T> col = new ArrayList<T>();
+			List<T> col = new ArrayList<>();
 			for (List<T> row : rows)
 			{
 				col.add(row.get(i));
@@ -1014,7 +1014,7 @@ public class MUtil
 	
 	public static List<Block> getBlocks(World world, int xmin, int ymin, int zmin, int xmax, int ymax, int zmax)
 	{
-		List<Block> blocks = new ArrayList<Block>();
+		List<Block> blocks = new ArrayList<>();
 		
 		for (int x = xmin; x <= xmax; x++)
 		{
@@ -1097,7 +1097,7 @@ public class MUtil
 	
 	// FOOD
 	
-	public final static Set<Material> FOOD_MATERIALS = new HashSet<Material>(MUtil.list(
+	public final static Set<Material> FOOD_MATERIALS = new HashSet<>(MUtil.list(
 		Material.APPLE,
 		Material.BREAD,
 		Material.COOKED_BEEF,
@@ -1417,7 +1417,7 @@ public class MUtil
 		if (itemStack == null) return null;
 		if (itemStack.getType() != Material.POTION) return null;
 
-		List<PotionEffect> ret = new ArrayList<PotionEffect>();
+		List<PotionEffect> ret = new ArrayList<>();
 		
 		if (isWaterPotion(itemStack)) return ret;
 		
@@ -1498,11 +1498,11 @@ public class MUtil
 		{
 			if (collection != null)
 			{
-				ret = new ArrayList<T>(collection);
+				ret = new ArrayList<>(collection);
 			}
 			else
 			{
-				ret = new ArrayList<T>();
+				ret = new ArrayList<>();
 				for (T item : items)
 				{
 					ret.add(item);
@@ -1513,11 +1513,11 @@ public class MUtil
 		{
 			if (collection != null)
 			{
-				ret = new ArrayList<T>(collection.size());
+				ret = new ArrayList<>(collection.size());
 			}
 			else
 			{
-				ret = new ArrayList<T>();
+				ret = new ArrayList<>();
 			}
 			
 			for (T item : items)
@@ -1571,7 +1571,7 @@ public class MUtil
 		// No limit?
 		if (fromIndex == 0 && toIndex == ret.size()-1) return ret;
 		
-		return new ArrayList<T>(ret.subList(fromIndex, toIndex));
+		return new ArrayList<>(ret.subList(fromIndex, toIndex));
 	}
 	public static <T> List<T> transform(Iterable<T> items, Predicate<? super T> where) { return transform(items, where, null, null, null); }
 	public static <T> List<T> transform(Iterable<T> items, Predicate<? super T> where, Comparator<? super T> orderby) { return transform(items, where, orderby, null, null); }
@@ -1591,7 +1591,7 @@ public class MUtil
 	@SafeVarargs
 	public static <T> List<T> list(T... items)
 	{
-		List<T> ret = new MassiveList<T>(items.length);
+		List<T> ret = new MassiveList<>(items.length);
 		Collections.addAll(ret, items);
 		return ret;
 	}
@@ -1599,7 +1599,7 @@ public class MUtil
 	@SafeVarargs
 	public static <T> Set<T> set(T... items)
 	{
-		Set<T> ret = new MassiveSet<T>(items.length);
+		Set<T> ret = new MassiveSet<>(items.length);
 		Collections.addAll(ret, items);
 		return ret;
 	}
@@ -1612,7 +1612,7 @@ public class MUtil
 	@SuppressWarnings("unchecked")
 	public static <K, V> Map<K, V> map(K key1, V value1, Object... objects)
 	{
-		Map<K, V> ret = new LinkedHashMap<K, V>();
+		Map<K, V> ret = new LinkedHashMap<>();
 		
 		ret.put(key1, value1);
 		
@@ -1629,7 +1629,7 @@ public class MUtil
 	
 	public static <K, V> Map<V, K> flippedMap(Map<K, V> map)
 	{
-		Map<V, K> ret = new LinkedHashMap<V, K>();
+		Map<V, K> ret = new LinkedHashMap<>();
 		
 		for(Entry<K, V> entry : map.entrySet())
 		{
@@ -1645,7 +1645,7 @@ public class MUtil
 	
 	public static <K, V> Map<V, Set<K>> reverseIndex(Map<K, V> map)
 	{
-		Map<V, Set<K>> ret = new LinkedHashMap<V, Set<K>>();
+		Map<V, Set<K>> ret = new LinkedHashMap<>();
 		
 		for (Entry<K, V> entry : map.entrySet())
 		{
@@ -1655,7 +1655,7 @@ public class MUtil
 			Set<K> set = ret.get(value);
 			if (set == null)
 			{
-				set = new HashSet<K>();
+				set = new HashSet<>();
 				ret.put(value, set);
 			}
 			set.add(key);
@@ -1710,7 +1710,7 @@ public class MUtil
 		}
 		else
 		{
-			list = new ArrayList<T>(coll);
+			list = new ArrayList<>(coll);
 		}
 		
 		int index = MassiveCore.random.nextInt(list.size());
@@ -1723,7 +1723,7 @@ public class MUtil
 		if (count < 0) count = 0;
 		
 		// Create Ret
-		List<T> ret = new ArrayList<T>(coll);
+		List<T> ret = new ArrayList<>(coll);
 		while (ret.size() > count)
 		{
 			int index = MassiveCore.random.nextInt(ret.size());
@@ -1737,7 +1737,7 @@ public class MUtil
 	public static <E> List<E> random(List<E> list, int count)
 	{
 		// Create Ret
-		List<E> ret = new MassiveList<E>();
+		List<E> ret = new MassiveList<>();
 		
 		// Empty
 		if (list.isEmpty()) return ret;
@@ -1823,10 +1823,11 @@ public class MUtil
 	
 	public static <K,V extends Comparable<? super V>> SortedSet<Map.Entry<K,V>> entriesSortedByValues(Map<K,V> map, final boolean ascending)
 	{
-		SortedSet<Map.Entry<K,V>> sortedEntries = new TreeSet<Map.Entry<K,V>>(
-			new Comparator<Map.Entry<K,V>>()
+		SortedSet<Map.Entry<K,V>> sortedEntries = new TreeSet<>(
+			new Comparator<Map.Entry<K, V>>()
 			{
-				@Override public int compare(Map.Entry<K,V> e1, Map.Entry<K,V> e2)
+				@Override
+				public int compare(Map.Entry<K, V> e1, Map.Entry<K, V> e2)
 				{
 					int res;
 					if (ascending)
@@ -1892,13 +1893,13 @@ public class MUtil
 	// EXTRACTION
 	// -------------------------------------------- //
 	
-	protected static Map<Class<?>, Map<String, Set<Extractor>>> classesPropertiesExtractors = new HashMap<Class<?>, Map<String, Set<Extractor>>>();
+	protected static Map<Class<?>, Map<String, Set<Extractor>>> classesPropertiesExtractors = new HashMap<>();
 	protected static Map<String, Set<Extractor>> getPropertiesExtractors(Class<?> propertyClass)
 	{
 		Map<String, Set<Extractor>> ret = classesPropertiesExtractors.get(propertyClass);
 		if (ret == null)
 		{
-			ret = new HashMap<String, Set<Extractor>>();
+			ret = new HashMap<>();
 			classesPropertiesExtractors.put(propertyClass, ret);
 		}
 		return ret;
@@ -1910,7 +1911,7 @@ public class MUtil
 		Set<Extractor> ret = propertiesExtractors.get(propertyName);
 		if (ret == null)
 		{
-			ret = new HashSet<Extractor>();
+			ret = new HashSet<>();
 			propertiesExtractors.put(propertyName, ret);
 		}
 		return ret;
diff --git a/src/com/massivecraft/massivecore/util/PeriodUtil.java b/src/com/massivecraft/massivecore/util/PeriodUtil.java
index 0d81f2a9..da709ad1 100644
--- a/src/com/massivecraft/massivecore/util/PeriodUtil.java
+++ b/src/com/massivecraft/massivecore/util/PeriodUtil.java
@@ -11,7 +11,7 @@ public class PeriodUtil
 	// MILLIS STORE
 	// -------------------------------------------- //
 	
-	private static Map<Object, Long> objectToMillis = new HashMap<Object, Long>();
+	private static Map<Object, Long> objectToMillis = new HashMap<>();
 	
 	public static long getMillis(Object object)
 	{
@@ -36,7 +36,7 @@ public class PeriodUtil
 	// TICKS STORE
 	// -------------------------------------------- //
 	
-	private static Map<Object, Long> objectToTicks = new HashMap<Object, Long>();
+	private static Map<Object, Long> objectToTicks = new HashMap<>();
 	
 	public static long getTicks(Object object)
 	{
diff --git a/src/com/massivecraft/massivecore/util/PlayerUtil.java b/src/com/massivecraft/massivecore/util/PlayerUtil.java
index 8579e51e..a51abb63 100644
--- a/src/com/massivecraft/massivecore/util/PlayerUtil.java
+++ b/src/com/massivecraft/massivecore/util/PlayerUtil.java
@@ -60,7 +60,7 @@ public class PlayerUtil extends Engine
 	// LAST MOVE & STAND STILL (MILLIS)
 	// -------------------------------------------- //
 	
-	private static Map<UUID, Long> idToLastMoveMillis = new HashMap<UUID, Long>(); 
+	private static Map<UUID, Long> idToLastMoveMillis = new HashMap<>();
 	
 	public static void setLastMoveMillis(Player player, long millis)
 	{
@@ -118,7 +118,7 @@ public class PlayerUtil extends Engine
 	// LAST DAMAGE & NO DAMAGE (MILLIS)
 	// -------------------------------------------- //
 	
-	private static Map<UUID, Long> idToLastDamageMillis = new HashMap<UUID, Long>(); 
+	private static Map<UUID, Long> idToLastDamageMillis = new HashMap<>();
 	
 	public static void setLastDamageMillis(Player player, long millis)
 	{
@@ -178,7 +178,7 @@ public class PlayerUtil extends Engine
 	// Some times when players die the PlayerDeathEvent is fired twice.
 	// We want to ignore the extra calls.
 	
-	private static Map<UUID, PlayerDeathEvent> idToDeathEvent = new HashMap<UUID, PlayerDeathEvent>();
+	private static Map<UUID, PlayerDeathEvent> idToDeathEvent = new HashMap<>();
 	
 	public static boolean isDuplicateDeathEvent(PlayerDeathEvent event)
 	{
@@ -209,7 +209,7 @@ public class PlayerUtil extends Engine
 	// -------------------------------------------- //
 	// An entity damage by entity event is considered to be a duplicate if the damager already damaged the damagee this tick.
 	
-	private static Map<String, EntityDamageByEntityEvent> idToDamageEvent = new HashMap<String, EntityDamageByEntityEvent>();
+	private static Map<String, EntityDamageByEntityEvent> idToDamageEvent = new HashMap<>();
 	
 	public static boolean isDuplicateDamageEvent(EntityDamageByEntityEvent event)
 	{
@@ -244,7 +244,7 @@ public class PlayerUtil extends Engine
 	// -------------------------------------------- //
 	// An entity damage by entity event is considered to be a duplicate if the damager already damaged the damagee this tick.
 	
-	private static Map<UUID, PlayerAnimationEvent> idToArmSwingEvent = new HashMap<UUID, PlayerAnimationEvent>();
+	private static Map<UUID, PlayerAnimationEvent> idToArmSwingEvent = new HashMap<>();
 	
 	public static boolean isDuplicateArmSwingEvent(PlayerAnimationEvent event)
 	{
diff --git a/src/com/massivecraft/massivecore/util/ReflectionUtil.java b/src/com/massivecraft/massivecore/util/ReflectionUtil.java
index 6f1c7261..d63fa676 100644
--- a/src/com/massivecraft/massivecore/util/ReflectionUtil.java
+++ b/src/com/massivecraft/massivecore/util/ReflectionUtil.java
@@ -343,7 +343,7 @@ public class ReflectionUtil
 	{
 		if (fieldNames == null)
 		{
-			fieldNames = new ArrayList<String>();
+			fieldNames = new ArrayList<>();
 			for (Field field : clazz.getDeclaredFields())
 			{
 				fieldNames.add(field.getName());
@@ -368,7 +368,7 @@ public class ReflectionUtil
 	public static List<Class<?>> getSuperclasses(Class<?> clazz, boolean includeSelf)
 	{
 		// Create
-		List<Class<?>> ret = new ArrayList<Class<?>>();
+		List<Class<?>> ret = new ArrayList<>();
 		
 		// Fill
 		if ( ! includeSelf) clazz = clazz.getSuperclass();
diff --git a/src/com/massivecraft/massivecore/util/SenderMap.java b/src/com/massivecraft/massivecore/util/SenderMap.java
index 6c86b2b0..9fe3a208 100644
--- a/src/com/massivecraft/massivecore/util/SenderMap.java
+++ b/src/com/massivecraft/massivecore/util/SenderMap.java
@@ -30,13 +30,13 @@ public final class SenderMap
 	
 	public SenderMap()
 	{
-		innerMap = new EnumMap<SenderPresence, Map<SenderType, Set<String>>>(SenderPresence.class);
+		innerMap = new EnumMap<>(SenderPresence.class);
 		for (SenderPresence presence : SenderPresence.values())
 		{
-			Map<SenderType, Set<String>> map = new EnumMap<SenderType, Set<String>>(SenderType.class);
+			Map<SenderType, Set<String>> map = new EnumMap<>(SenderType.class);
 			for (SenderType type : SenderType.values())
 			{
-				Set<String> set = new ConcurrentSkipListSet<String>(String.CASE_INSENSITIVE_ORDER);
+				Set<String> set = new ConcurrentSkipListSet<>(String.CASE_INSENSITIVE_ORDER);
 				map.put(type, set);
 			}
 			innerMap.put(presence, map);
diff --git a/src/com/massivecraft/massivecore/util/SignUtil.java b/src/com/massivecraft/massivecore/util/SignUtil.java
index 229b2e85..a7f8dc7b 100644
--- a/src/com/massivecraft/massivecore/util/SignUtil.java
+++ b/src/com/massivecraft/massivecore/util/SignUtil.java
@@ -161,7 +161,7 @@ public class SignUtil
 		if (block == null) throw new NullPointerException("block");
 		if (getSpecialTitle(block, true) == null) throw new InvalidParameterException("block");
 		
-		List<Block> ret = new ArrayList<Block>();
+		List<Block> ret = new ArrayList<>();
 		
 		do
 		{
@@ -276,7 +276,7 @@ public class SignUtil
 	{
 		if (blocks == null) throw new NullPointerException("blocks");
 		
-		List<String> ret = new ArrayList<String>();
+		List<String> ret = new ArrayList<>();
 		
 		for (Block block : blocks)
 		{
@@ -305,7 +305,7 @@ public class SignUtil
 		if (sign == null) throw new NullPointerException("sign");
 		
 		// Create
-		List<String> ret = new ArrayList<String>();
+		List<String> ret = new ArrayList<>();
 		
 		// Fill
 		for (String line : sign.getLines())
diff --git a/src/com/massivecraft/massivecore/util/SmokeUtil.java b/src/com/massivecraft/massivecore/util/SmokeUtil.java
index 9069c2e7..59707278 100644
--- a/src/com/massivecraft/massivecore/util/SmokeUtil.java
+++ b/src/com/massivecraft/massivecore/util/SmokeUtil.java
@@ -90,7 +90,7 @@ public class SmokeUtil
 		fakeExplosion(location, 4F);
 	}
 	
-	public static MutableBoolean fakeExplosion = new MutableBoolean(false);
+	public static final MutableBoolean fakeExplosion = new MutableBoolean(false);
 	public static void fakeExplosion(Location location, float power)
 	{
 		synchronized (fakeExplosion)
diff --git a/src/com/massivecraft/massivecore/util/TimeDiffUtil.java b/src/com/massivecraft/massivecore/util/TimeDiffUtil.java
index f7ae8e84..8f2ec486 100644
--- a/src/com/massivecraft/massivecore/util/TimeDiffUtil.java
+++ b/src/com/massivecraft/massivecore/util/TimeDiffUtil.java
@@ -70,7 +70,7 @@ public class TimeDiffUtil
 		Matcher matcherFull = patternFull.matcher(formated);
 		if (!matcherFull.matches()) throw new NullPointerException("Invalid time diff format.");
 		
-		LinkedHashMap<TimeUnit, Long> ret = new LinkedHashMap<TimeUnit, Long>();
+		LinkedHashMap<TimeUnit, Long> ret = new LinkedHashMap<>();
 		if (formated.equals("0")) return ret;
 		
 		Matcher matcherPart = patternPart.matcher(formated);
@@ -112,7 +112,7 @@ public class TimeDiffUtil
 		// Create non-negative millis decumulator
 		long millisLeft = Math.abs(millis);
 		
-		LinkedHashMap<TimeUnit, Long> ret = new LinkedHashMap<TimeUnit, Long>();
+		LinkedHashMap<TimeUnit, Long> ret = new LinkedHashMap<>();
 		
 		for (TimeUnit unit : units)
 		{
@@ -132,7 +132,7 @@ public class TimeDiffUtil
 	
 	public static LinkedHashMap<TimeUnit, Long> limit(LinkedHashMap<TimeUnit, Long> unitcounts, int limit)
 	{
-		LinkedHashMap<TimeUnit, Long> ret = new LinkedHashMap<TimeUnit, Long>();
+		LinkedHashMap<TimeUnit, Long> ret = new LinkedHashMap<>();
 		
 		Iterator<Entry<TimeUnit, Long>> iter = unitcounts.entrySet().iterator();
 		int i = 0;
@@ -173,7 +173,7 @@ public class TimeDiffUtil
 			return formated(TimeUnit.SECOND, 0, entryFormat);
 		}
 		
-		List<String> parts = new ArrayList<String>();
+		List<String> parts = new ArrayList<>();
 		for (Entry<TimeUnit, Long> entry : unitcounts.entrySet())
 		{
 			parts.add(formated(entry.getKey(), entry.getValue(), entryFormat));
diff --git a/src/com/massivecraft/massivecore/util/TimeUnit.java b/src/com/massivecraft/massivecore/util/TimeUnit.java
index 49a71fab..2a5ca36d 100644
--- a/src/com/massivecraft/massivecore/util/TimeUnit.java
+++ b/src/com/massivecraft/massivecore/util/TimeUnit.java
@@ -34,12 +34,12 @@ public class TimeUnit implements Comparable<TimeUnit>
 	// REGISTRY
 	// -------------------------------------------- //
 		
-	private static final TreeSet<TimeUnit> all = new TreeSet<TimeUnit>();
-	public static TreeSet<TimeUnit> getAll() { return new TreeSet<TimeUnit>(all); }
+	private static final TreeSet<TimeUnit> all = new TreeSet<>();
+	public static TreeSet<TimeUnit> getAll() { return new TreeSet<>(all); }
 	
 	public static TreeSet<TimeUnit> getAllBut(TimeUnit... timeUnits)
 	{
-		TreeSet<TimeUnit> ret = new TreeSet<TimeUnit>(all);
+		TreeSet<TimeUnit> ret = new TreeSet<>(all);
 		for (TimeUnit timeUnit : timeUnits)
 		{
 			ret.remove(timeUnit);
@@ -64,7 +64,7 @@ public class TimeUnit implements Comparable<TimeUnit>
 	
 	public static TreeSet<TimeUnit> getSpecific(TimeUnit... timeUnits)
 	{
-		TreeSet<TimeUnit> ret = new TreeSet<TimeUnit>(Arrays.asList(timeUnits));
+		TreeSet<TimeUnit> ret = new TreeSet<>(Arrays.asList(timeUnits));
 		return ret;
 	}
 	
@@ -124,7 +124,7 @@ public class TimeUnit implements Comparable<TimeUnit>
 		this.pluralName = pluralName;
 		this.singularUnit = singularUnit;
 		this.pluralUnit = pluralUnit;
-		this.aliases = new ArrayList<String>(Arrays.asList(aliases));
+		this.aliases = new ArrayList<>(Arrays.asList(aliases));
 	}
 	
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/massivecore/util/Txt.java b/src/com/massivecraft/massivecore/util/Txt.java
index 168fab54..6fc5ea58 100644
--- a/src/com/massivecraft/massivecore/util/Txt.java
+++ b/src/com/massivecraft/massivecore/util/Txt.java
@@ -71,7 +71,7 @@ public class Txt
 	static
 	{
 		// Create the parce replacements map
-		parseReplacements = new HashMap<String, String>();
+		parseReplacements = new HashMap<>();
 		
 		// Color by name
 		parseReplacements.put("<empty>", "");
@@ -188,7 +188,7 @@ public class Txt
 	
 	public static ArrayList<String> parse(Collection<String> strings)
 	{
-		ArrayList<String> ret = new ArrayList<String>(strings.size());
+		ArrayList<String> ret = new ArrayList<>(strings.size());
 		for (String string : strings)
 		{
 			ret.add(parse(string));
@@ -203,12 +203,12 @@ public class Txt
 	public static ArrayList<String> wrap(final String string)
 	{
 		if (string == null) return null;
-		return new ArrayList<String>(Arrays.asList(PATTERN_NEWLINE.split(string)));
+		return new ArrayList<>(Arrays.asList(PATTERN_NEWLINE.split(string)));
 	}
 	
 	public static ArrayList<String> wrap(final Collection<String> strings)
 	{
-		ArrayList<String> ret = new ArrayList<String>();
+		ArrayList<String> ret = new ArrayList<>();
 		for (String string : strings)
 		{
 			ret.addAll(wrap(string));
@@ -298,16 +298,16 @@ public class Txt
 	{
 		return implode(list, glue, null);
 	}
-	public static String implode(final Collection<? extends Object> coll, final String glue, final String format)
+	public static String implode(final Collection<?> coll, final String glue, final String format)
 	{
 		return implode(coll.toArray(new Object[0]), glue, format);
 	}
-	public static String implode(final Collection<? extends Object> coll, final String glue)
+	public static String implode(final Collection<?> coll, final String glue)
 	{
 		return implode(coll, glue, null);
 	}
 	
-	public static String implodeCommaAndDot(final Collection<? extends Object> objects, final String format, final String comma, final String and, final String dot)
+	public static String implodeCommaAndDot(final Collection<?> objects, final String format, final String comma, final String and, final String dot)
 	{
 		if (objects.size() == 0) return "";
 		if (objects.size() == 1)
@@ -315,7 +315,7 @@ public class Txt
 			return implode(objects, comma, format);
 		}
 		
-		List<Object> ourObjects = new ArrayList<Object>(objects);
+		List<Object> ourObjects = new ArrayList<>(objects);
 		
 		String lastItem = ourObjects.get(ourObjects.size()-1).toString();
 		String nextToLastItem = ourObjects.get(ourObjects.size()-2).toString();
@@ -331,28 +331,28 @@ public class Txt
 		return implode(ourObjects, comma, format)+dot;
 	}
 	
-	public static String implodeCommaAndDot(final Collection<? extends Object> objects, final String comma, final String and, final String dot)
+	public static String implodeCommaAndDot(final Collection<?> objects, final String comma, final String and, final String dot)
 	{
 		return implodeCommaAndDot(objects, null, comma, and, dot);
 	}
 	
-	public static String implodeCommaAnd(final Collection<? extends Object> objects, final String comma, final String and)
+	public static String implodeCommaAnd(final Collection<?> objects, final String comma, final String and)
 	{
 		return implodeCommaAndDot(objects, comma, and, "");
 	}
-	public static String implodeCommaAndDot(final Collection<? extends Object> objects, final String color)
+	public static String implodeCommaAndDot(final Collection<?> objects, final String color)
 	{
 		return implodeCommaAndDot(objects, color+", ", color+" and ", color+".");
 	}
-	public static String implodeCommaAnd(final Collection<? extends Object> objects, final String color)
+	public static String implodeCommaAnd(final Collection<?> objects, final String color)
 	{
 		return implodeCommaAndDot(objects, color+", ", color+" and ", "");
 	}
-	public static String implodeCommaAndDot(final Collection<? extends Object> objects)
+	public static String implodeCommaAndDot(final Collection<?> objects)
 	{
 		return implodeCommaAndDot(objects, "");
 	}
-	public static String implodeCommaAnd(final Collection<? extends Object> objects)
+	public static String implodeCommaAnd(final Collection<?> objects)
 	{
 		return implodeCommaAnd(objects, "");
 	}
@@ -387,7 +387,7 @@ public class Txt
 		{
 			second = parts[1];
 		}
-		return new SimpleEntry<String, String>(first, second);
+		return new SimpleEntry<>(first, second);
 	}
 	
 	public static boolean isVowel(String str)
@@ -423,7 +423,7 @@ public class Txt
 	protected static Pattern PATTERN_ENUM_SPLIT = Pattern.compile("[\\s_]+");
 	public static String getNicedEnumString(String str)
 	{
-		List<String> parts = new ArrayList<String>();  
+		List<String> parts = new ArrayList<>();
 		for (String part : PATTERN_ENUM_SPLIT.split(str.toLowerCase()))
 		{
 			parts.add(upperCaseFirst(part));
@@ -688,7 +688,7 @@ public class Txt
 		String commandLine;
 		if (args != null && args.contains(oldNumber))
 		{
-			List<String> arguments = new ArrayList<String>(args);
+			List<String> arguments = new ArrayList<>(args);
 			arguments.set(arguments.indexOf(oldNumber), number);
 
 			commandLine = command.getCommandLine(arguments);
@@ -724,7 +724,7 @@ public class Txt
 		
 		double millisLeft = (double) Math.abs(millis);
 		
-		List<String> unitCountParts = new ArrayList<String>();
+		List<String> unitCountParts = new ArrayList<>();
 		for (Entry<String, Long> entry : unitMillis.entrySet())
 		{
 			if (unitCountParts.size() == 3 ) break;
@@ -835,7 +835,7 @@ public class Txt
 	public static <T> List<T> getFiltered(Iterable<T> elements, Predicate<T> predicate)
 	{
 		// Create Ret
-		List<T> ret = new ArrayList<T>();
+		List<T> ret = new ArrayList<>();
 		
 		// Fill Ret
 		for (T element : elements)
@@ -869,7 +869,7 @@ public class Txt
 	
 	public static List<String> tokenizeArguments(String str)
 	{
-		List<String> ret = new ArrayList<String>();
+		List<String> ret = new ArrayList<>();
 		StringBuilder token = null;
 		boolean escaping = false;
 		boolean citing = false;
@@ -936,10 +936,10 @@ public class Txt
 	public static List<String> prepondfix(String prefix, List<String> strings, String suffix)
 	{
 		// Create
-		List<String> ret = new MassiveList<String>();
+		List<String> ret = new MassiveList<>();
 		
 		// Fill
-		List<String> parts = new MassiveList<String>();
+		List<String> parts = new MassiveList<>();
 		if (prefix != null) parts.add(prefix);
 		if (strings.size() == 1) parts.add(strings.get(0));
 		if (suffix != null) parts.add(suffix);
diff --git a/src/com/massivecraft/massivecore/util/WebUtil.java b/src/com/massivecraft/massivecore/util/WebUtil.java
index 00fe3b2d..9afa16ac 100644
--- a/src/com/massivecraft/massivecore/util/WebUtil.java
+++ b/src/com/massivecraft/massivecore/util/WebUtil.java
@@ -108,7 +108,7 @@ public class WebUtil
 			isr = new InputStreamReader(is, "UTF-8");
 			br = new BufferedReader(isr);
 			
-			List<String> lines = new ArrayList<String>();
+			List<String> lines = new ArrayList<>();
 			String line = null;
 			while ( (line = br.readLine()) != null )
 			{
diff --git a/src/com/massivecraft/massivecore/util/extractor/Extractor.java b/src/com/massivecraft/massivecore/util/extractor/Extractor.java
index a561cd0e..1ec02a62 100644
--- a/src/com/massivecraft/massivecore/util/extractor/Extractor.java
+++ b/src/com/massivecraft/massivecore/util/extractor/Extractor.java
@@ -2,5 +2,5 @@ package com.massivecraft.massivecore.util.extractor;
 
 public interface Extractor
 {
-	public Object extract(Object o);
+	Object extract(Object o);
 }
diff --git a/src/com/massivecraft/massivecore/xlib/bson/BSON.java b/src/com/massivecraft/massivecore/xlib/bson/BSON.java
index 25ef76dc..1f578113 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/BSON.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/BSON.java
@@ -131,7 +131,7 @@ public class BSON {
         return buf.toString();
     }
 
-    private static enum RegexFlag {
+    private enum RegexFlag {
         CANON_EQ( Pattern.CANON_EQ, 'c', "Pattern.CANON_EQ" ),
         UNIX_LINES(Pattern.UNIX_LINES, 'd', "Pattern.UNIX_LINES" ),
         GLOBAL( GLOBAL_FLAG, 'g', null ),
@@ -142,7 +142,7 @@ public class BSON {
         UNICODE_CASE( Pattern.UNICODE_CASE, 'u', "Pattern.UNICODE_CASE" ),
         COMMENTS( Pattern.COMMENTS, 'x', null );
 
-        private static final Map<Character, RegexFlag> byCharacter = new HashMap<Character, RegexFlag>();
+        private static final Map<Character, RegexFlag> byCharacter = new HashMap<>();
 
         static {
             for (RegexFlag flag : values()) {
@@ -178,7 +178,7 @@ public class BSON {
         _encodeHooks = true;
         List<Transformer> l = _encodingHooks.get( c );
         if ( l == null ){
-            l = new CopyOnWriteArrayList<Transformer>();
+            l = new CopyOnWriteArrayList<>();
             _encodingHooks.put( c , l );
         }
         l.add( t );
@@ -188,7 +188,7 @@ public class BSON {
         _decodeHooks = true;
         List<Transformer> l = _decodingHooks.get( c );
         if ( l == null ){
-            l = new CopyOnWriteArrayList<Transformer>();
+            l = new CopyOnWriteArrayList<>();
             _decodingHooks.put( c , l );
         }
         l.add( t );
@@ -293,10 +293,10 @@ public class BSON {
     private static boolean _encodeHooks = false;
     private static boolean _decodeHooks = false;
     static ClassMap<List<Transformer>> _encodingHooks =
-	new ClassMap<List<Transformer>>();
+        new ClassMap<>();
 
     static ClassMap<List<Transformer>> _decodingHooks =
-        new ClassMap<List<Transformer>>();
+        new ClassMap<>();
 
     /**
      * @deprecated Use {@link Charset#forName(String)} to create UTF-8 charset.
diff --git a/src/com/massivecraft/massivecore/xlib/bson/BSONDecoder.java b/src/com/massivecraft/massivecore/xlib/bson/BSONDecoder.java
index 6b91230a..716282f3 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/BSONDecoder.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/BSONDecoder.java
@@ -23,12 +23,12 @@ import java.io.InputStream;
 
 public interface BSONDecoder {
     
-    public BSONObject readObject( byte[] b );
+    BSONObject readObject(byte[] b);
     
-    public BSONObject readObject( InputStream in ) throws IOException;
+    BSONObject readObject(InputStream in) throws IOException;
     
-    public int decode( byte[] b , BSONCallback callback );
+    int decode(byte[] b, BSONCallback callback);
 
-    public int decode( InputStream in , BSONCallback callback ) throws IOException;
+    int decode(InputStream in, BSONCallback callback) throws IOException;
 
 }
diff --git a/src/com/massivecraft/massivecore/xlib/bson/BSONEncoder.java b/src/com/massivecraft/massivecore/xlib/bson/BSONEncoder.java
index 810d36b6..53f7bb81 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/BSONEncoder.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/BSONEncoder.java
@@ -20,11 +20,11 @@ import com.massivecraft.massivecore.xlib.bson.io.OutputBuffer;
 
 
 public interface BSONEncoder {
-    public byte[] encode( BSONObject o );
+    byte[] encode(BSONObject o);
 
-    public int putObject( BSONObject o );
+    int putObject(BSONObject o);
 
-    public void done();
+    void done();
 
     void set( OutputBuffer out );
 }
diff --git a/src/com/massivecraft/massivecore/xlib/bson/BSONObject.java b/src/com/massivecraft/massivecore/xlib/bson/BSONObject.java
index be0d2995..a456d57b 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/BSONObject.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/BSONObject.java
@@ -33,39 +33,39 @@ public interface BSONObject {
      * @param v Corresponding value
      * @return <tt>v</tt>
      */
-    public Object put( String key , Object v );
+	Object put(String key, Object v);
 
     /**
      * Sets all key/value pairs from an object into this object
      * @param o the object
      */
-    public void putAll( BSONObject o );
+	void putAll(BSONObject o);
 
     /**
      * Sets all key/value pairs from a map into this object
      * @param m the map
      */
-    public void putAll( Map m );
+	void putAll(Map m);
 
     /**
      * Gets a field from this object by a given name.
      * @param key The name of the field fetch
      * @return The field, if found
      */
-    public Object get( String key );
+	Object get(String key);
 
     /**
      * Returns a map representing this BSONObject.
      * @return the map
      */
-    public Map toMap();
+	Map toMap();
 
     /**
      * Removes a field with a given name from this object.
      * @param key The name of the field to remove
      * @return The value removed from this object
      */
-    public Object removeField( String key );
+	Object removeField(String key);
 
     /**
      * Deprecated
@@ -74,19 +74,19 @@ public interface BSONObject {
      * @deprecated
      */
     @Deprecated
-    public boolean containsKey( String s );
+	boolean containsKey(String s);
 
     /**
      * Checks if this object contains a field with the given name.
      * @param s Field name for which to check
      * @return True if the field is present
      */
-    public boolean containsField(String s);
+	boolean containsField(String s);
 
     /**
      * Returns this object's fields' names
      * @return The names of the fields in this object
      */
-    public Set<String> keySet();
+	Set<String> keySet();
 }
 
diff --git a/src/com/massivecraft/massivecore/xlib/bson/BasicBSONCallback.java b/src/com/massivecraft/massivecore/xlib/bson/BasicBSONCallback.java
index f62a2244..1cb3c652 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/BasicBSONCallback.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/BasicBSONCallback.java
@@ -211,6 +211,6 @@ public class BasicBSONCallback implements BSONCallback {
     }
 
     private Object _root;
-    private final LinkedList<BSONObject> _stack = new LinkedList<BSONObject>();
-    private final LinkedList<String> _nameStack = new LinkedList<String>();
+    private final LinkedList<BSONObject> _stack = new LinkedList<>();
+    private final LinkedList<String> _nameStack = new LinkedList<>();
 }
diff --git a/src/com/massivecraft/massivecore/xlib/bson/BasicBSONObject.java b/src/com/massivecraft/massivecore/xlib/bson/BasicBSONObject.java
index c400998a..c296fa5b 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/BasicBSONObject.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/BasicBSONObject.java
@@ -80,7 +80,7 @@ public class BasicBSONObject extends LinkedHashMap<String,Object> implements BSO
      * @return the DBObject
      */
     public Map toMap() {
-        return new LinkedHashMap<String,Object>(this);
+        return new LinkedHashMap<>(this);
     }
 
     /** Deletes a field from this object.
@@ -370,8 +370,8 @@ public class BasicBSONObject extends LinkedHashMap<String,Object> implements BSO
     }
 
     private static Map<String, Object> canonicalizeMap(final Map<String, Object> from) {
-        Map<String, Object> canonicalized = new LinkedHashMap<String, Object>(from.size());
-        TreeSet<String> keysInOrder = new TreeSet<String>(from.keySet());
+        Map<String, Object> canonicalized = new LinkedHashMap<>(from.size());
+        TreeSet<String> keysInOrder = new TreeSet<>(from.keySet());
         for (String key : keysInOrder) {
             Object val = from.get(key);
             canonicalized.put(key, canonicalize(val));
@@ -381,7 +381,7 @@ public class BasicBSONObject extends LinkedHashMap<String,Object> implements BSO
 
     private static BasicBSONObject canonicalizeBSONObject(final BSONObject from) {
         BasicBSONObject canonicalized = new BasicBSONObject();
-        TreeSet<String> keysInOrder = new TreeSet<String>(from.keySet());
+        TreeSet<String> keysInOrder = new TreeSet<>(from.keySet());
         for (String key : keysInOrder) {
             Object val = from.get(key);
             canonicalized.put(key, canonicalize(val));
@@ -390,7 +390,7 @@ public class BasicBSONObject extends LinkedHashMap<String,Object> implements BSO
     }
 
     private static List canonicalizeList(final List<Object> list) {
-        List<Object> canonicalized = new ArrayList<Object>(list.size());
+        List<Object> canonicalized = new ArrayList<>(list.size());
         for (Object cur : list) {
             canonicalized.add(canonicalize(cur));
         }
diff --git a/src/com/massivecraft/massivecore/xlib/bson/KeyCachingLazyBSONObject.java b/src/com/massivecraft/massivecore/xlib/bson/KeyCachingLazyBSONObject.java
index 395dd7bc..0e2fbef2 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/KeyCachingLazyBSONObject.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/KeyCachingLazyBSONObject.java
@@ -64,11 +64,11 @@ public class KeyCachingLazyBSONObject extends LazyBSONObject {
                 offset += ( fieldSize + elementSize );
             }
         } catch (Exception e) {
-            fieldIndex = new HashMap<String, ElementRecord>();
+            fieldIndex = new HashMap<>();
         }
     }
     
     
-    private HashMap<String, ElementRecord> fieldIndex = new HashMap<String, ElementRecord>();
+    private HashMap<String, ElementRecord> fieldIndex = new HashMap<>();
 
 }
diff --git a/src/com/massivecraft/massivecore/xlib/bson/LazyBSONObject.java b/src/com/massivecraft/massivecore/xlib/bson/LazyBSONObject.java
index 41c74f4a..a4c77924 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/LazyBSONObject.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/LazyBSONObject.java
@@ -402,7 +402,7 @@ public class LazyBSONObject implements BSONObject {
      */
     List<ElementRecord> getElements(){
         int offset = _doc_start_offset + FIRST_ELMT_OFFSET;
-        ArrayList<ElementRecord> elements = new ArrayList<LazyBSONObject.ElementRecord>();
+        ArrayList<ElementRecord> elements = new ArrayList<>();
 
         while ( !isElementEmpty( offset ) ){
             int fieldSize = sizeCString( offset + 1 );
diff --git a/src/com/massivecraft/massivecore/xlib/bson/Transformer.java b/src/com/massivecraft/massivecore/xlib/bson/Transformer.java
index e5345340..e1105c7e 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/Transformer.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/Transformer.java
@@ -23,5 +23,5 @@ public interface Transformer {
     /**
      * @return the new object.  return passed in object if no change
      */
-    public Object transform( Object o );
+	Object transform(Object o);
 }
diff --git a/src/com/massivecraft/massivecore/xlib/bson/io/PoolOutputBuffer.java b/src/com/massivecraft/massivecore/xlib/bson/io/PoolOutputBuffer.java
index be7cdc79..2bb48739 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/io/PoolOutputBuffer.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/io/PoolOutputBuffer.java
@@ -252,7 +252,7 @@ public class PoolOutputBuffer extends OutputBuffer {
 
     final byte[] _mine = new byte[BUF_SIZE];
     final char[] _chars = new char[BUF_SIZE];
-    final List<byte[]> _fromPool = new ArrayList<byte[]>();
+    final List<byte[]> _fromPool = new ArrayList<>();
     final UTF8Encoding _encoding = new UTF8Encoding();
 
     private static final String DEFAULT_ENCODING_1 = "UTF-8";
diff --git a/src/com/massivecraft/massivecore/xlib/bson/util/AbstractCopyOnWriteMap.java b/src/com/massivecraft/massivecore/xlib/bson/util/AbstractCopyOnWriteMap.java
index 70a5d548..74203595 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/util/AbstractCopyOnWriteMap.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/util/AbstractCopyOnWriteMap.java
@@ -499,7 +499,7 @@ abstract class AbstractCopyOnWriteMap<K, V, M extends Map<K, V>> implements Conc
         }
 
         public final Iterator<E> iterator() {
-            return new UnmodifiableIterator<E>(getDelegate().iterator());
+            return new UnmodifiableIterator<>(getDelegate().iterator());
         }
 
         public final boolean isEmpty() {
diff --git a/src/com/massivecraft/massivecore/xlib/bson/util/ClassAncestry.java b/src/com/massivecraft/massivecore/xlib/bson/util/ClassAncestry.java
index 266dd8b9..6409336c 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/util/ClassAncestry.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/util/ClassAncestry.java
@@ -52,11 +52,11 @@ class ClassAncestry {
      * computeAncestry, starting with children and going back to parents
      */
     private static List<Class<?>> computeAncestry(Class<?> c) {
-        final List<Class<?>> result = new ArrayList<Class<?>>();
+        final List<Class<?>> result = new ArrayList<>();
         result.add(Object.class);
         computeAncestry(c, result);
         Collections.reverse(result);
-        return unmodifiableList(new ArrayList<Class<?>>(result));
+        return unmodifiableList(new ArrayList<>(result));
     }
 
     private static <T> void computeAncestry(Class<T> c, List<Class<?>> result) {
diff --git a/src/com/massivecraft/massivecore/xlib/bson/util/ClassMap.java b/src/com/massivecraft/massivecore/xlib/bson/util/ClassMap.java
index 53b63e57..3a34ecd9 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/util/ClassMap.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/util/ClassMap.java
@@ -59,8 +59,8 @@ public class ClassMap<T>  {
             }
             return null;
         }
-    };
-
+    }
+    
     private final Map<Class<?>, T> map = CopyOnWriteMap.newHashMap();
     private final Map<Class<?>, T> cache = ComputingMap.create(new ComputeFunction());
 
diff --git a/src/com/massivecraft/massivecore/xlib/bson/util/ComputingMap.java b/src/com/massivecraft/massivecore/xlib/bson/util/ComputingMap.java
index 24aa2514..4b5ce000 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/util/ComputingMap.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/util/ComputingMap.java
@@ -27,7 +27,7 @@ import static com.massivecraft.massivecore.xlib.bson.util.Assertions.notNull;
 final class ComputingMap<K, V> implements Map<K, V>, Function<K, V> {
 
     public static <K, V> Map<K, V> create(Function<K, V> function) {
-        return new ComputingMap<K, V>(CopyOnWriteMap.<K, V> newHashMap(), function);
+        return new ComputingMap<>(CopyOnWriteMap.<K, V>newHashMap(), function);
     }
 
     private final ConcurrentMap<K, V> map;
diff --git a/src/com/massivecraft/massivecore/xlib/bson/util/CopyOnWriteMap.java b/src/com/massivecraft/massivecore/xlib/bson/util/CopyOnWriteMap.java
index 05b7ed65..16900c26 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/util/CopyOnWriteMap.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/util/CopyOnWriteMap.java
@@ -89,7 +89,7 @@ abstract class CopyOnWriteMap<K, V> extends AbstractCopyOnWriteMap<K, V, Map<K,
      * @return a fresh builder
      */
     public static <K, V> Builder<K, V> builder() {
-        return new Builder<K, V>();
+        return new Builder<>();
     }
 
     /**
@@ -100,7 +100,7 @@ abstract class CopyOnWriteMap<K, V> extends AbstractCopyOnWriteMap<K, V, Map<K,
      */
     public static class Builder<K, V> {
         private View.Type viewType = View.Type.STABLE;
-        private final Map<K, V> initialValues = new HashMap<K, V>();
+        private final Map<K, V> initialValues = new HashMap<>();
 
         Builder() {}
 
@@ -131,11 +131,11 @@ abstract class CopyOnWriteMap<K, V> extends AbstractCopyOnWriteMap<K, V, Map<K,
         }
 
         public CopyOnWriteMap<K, V> newHashMap() {
-            return new Hash<K, V>(initialValues, viewType);
+            return new Hash<>(initialValues, viewType);
         }
 
         public CopyOnWriteMap<K, V> newLinkedMap() {
-            return new Linked<K, V>(initialValues, viewType);
+            return new Linked<>(initialValues, viewType);
         }
     }
 
@@ -251,7 +251,7 @@ abstract class CopyOnWriteMap<K, V> extends AbstractCopyOnWriteMap<K, V, Map<K,
 
         @Override
         public <N extends Map<? extends K, ? extends V>> Map<K, V> copy(final N map) {
-            return new HashMap<K, V>(map);
+            return new HashMap<>(map);
         }
     }
 
@@ -267,7 +267,7 @@ abstract class CopyOnWriteMap<K, V> extends AbstractCopyOnWriteMap<K, V, Map<K,
 
         @Override
         public <N extends Map<? extends K, ? extends V>> Map<K, V> copy(final N map) {
-            return new LinkedHashMap<K, V>(map);
+            return new LinkedHashMap<>(map);
         }
     }
 }
diff --git a/src/com/massivecraft/massivecore/xlib/bson/util/SimplePool.java b/src/com/massivecraft/massivecore/xlib/bson/util/SimplePool.java
index cb9e9967..21a9913d 100644
--- a/src/com/massivecraft/massivecore/xlib/bson/util/SimplePool.java
+++ b/src/com/massivecraft/massivecore/xlib/bson/util/SimplePool.java
@@ -58,5 +58,5 @@ public abstract class SimplePool<T> {
     }
     
     final int _max;
-    private Queue<T> _stored = new ConcurrentLinkedQueue<T>();
+    private Queue<T> _stored = new ConcurrentLinkedQueue<>();
 }
diff --git a/src/com/massivecraft/massivecore/xlib/gson/ExclusionStrategy.java b/src/com/massivecraft/massivecore/xlib/gson/ExclusionStrategy.java
index db2563f3..150dbd6b 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/ExclusionStrategy.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/ExclusionStrategy.java
@@ -99,11 +99,11 @@ public interface ExclusionStrategy {
    * @param f the field object that is under test
    * @return true if the field should be ignored; otherwise false
    */
-  public boolean shouldSkipField(FieldAttributes f);
+  boolean shouldSkipField(FieldAttributes f);
 
   /**
    * @param clazz the class object that is under test
    * @return true if the class should be ignored; otherwise false
    */
-  public boolean shouldSkipClass(Class<?> clazz);
+  boolean shouldSkipClass(Class<?> clazz);
 }
diff --git a/src/com/massivecraft/massivecore/xlib/gson/FieldNamingStrategy.java b/src/com/massivecraft/massivecore/xlib/gson/FieldNamingStrategy.java
index 6fda689f..d6f745ab 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/FieldNamingStrategy.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/FieldNamingStrategy.java
@@ -36,5 +36,5 @@ public interface FieldNamingStrategy {
    * @return the translated field name.
    * @since 1.3
    */
-  public String translateName(Field f);
+  String translateName(Field f);
 }
diff --git a/src/com/massivecraft/massivecore/xlib/gson/Gson.java b/src/com/massivecraft/massivecore/xlib/gson/Gson.java
index 527800db..81b22e4e 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/Gson.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/Gson.java
@@ -109,7 +109,7 @@ public final class Gson {
    * The proxy is wired up once the initial adapter has been created.
    */
   private final ThreadLocal<Map<TypeToken<?>, FutureTypeAdapter<?>>> calls
-      = new ThreadLocal<Map<TypeToken<?>, FutureTypeAdapter<?>>>();
+      = new ThreadLocal<>();
 
   private final Map<TypeToken<?>, TypeAdapter<?>> typeTokenCache
       = Collections.synchronizedMap(new HashMap<TypeToken<?>, TypeAdapter<?>>());
@@ -191,7 +191,7 @@ public final class Gson {
     this.htmlSafe = htmlSafe;
     this.prettyPrinting = prettyPrinting;
 
-    List<TypeAdapterFactory> factories = new ArrayList<TypeAdapterFactory>();
+    List<TypeAdapterFactory> factories = new ArrayList<>();
 
     // built-in type adapters that cannot be overridden
     factories.add(TypeAdapters.JSON_ELEMENT_FACTORY);
@@ -340,7 +340,7 @@ public final class Gson {
     Map<TypeToken<?>, FutureTypeAdapter<?>> threadCalls = calls.get();
     boolean requiresThreadLocalCleanup = false;
     if (threadCalls == null) {
-      threadCalls = new HashMap<TypeToken<?>, FutureTypeAdapter<?>>();
+      threadCalls = new HashMap<>();
       calls.set(threadCalls);
       requiresThreadLocalCleanup = true;
     }
@@ -352,7 +352,7 @@ public final class Gson {
     }
 
     try {
-      FutureTypeAdapter<T> call = new FutureTypeAdapter<T>();
+      FutureTypeAdapter<T> call = new FutureTypeAdapter<>();
       threadCalls.put(type, call);
 
       for (TypeAdapterFactory factory : factories) {
diff --git a/src/com/massivecraft/massivecore/xlib/gson/GsonBuilder.java b/src/com/massivecraft/massivecore/xlib/gson/GsonBuilder.java
index 032672db..d1727108 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/GsonBuilder.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/GsonBuilder.java
@@ -70,10 +70,10 @@ public final class GsonBuilder {
   private LongSerializationPolicy longSerializationPolicy = LongSerializationPolicy.DEFAULT;
   private FieldNamingStrategy fieldNamingPolicy = FieldNamingPolicy.IDENTITY;
   private final Map<Type, InstanceCreator<?>> instanceCreators
-      = new HashMap<Type, InstanceCreator<?>>();
-  private final List<TypeAdapterFactory> factories = new ArrayList<TypeAdapterFactory>();
+      = new HashMap<>();
+  private final List<TypeAdapterFactory> factories = new ArrayList<>();
   /** tree-style hierarchy factories. These come after factories for backwards compatibility. */
-  private final List<TypeAdapterFactory> hierarchyFactories = new ArrayList<TypeAdapterFactory>();
+  private final List<TypeAdapterFactory> hierarchyFactories = new ArrayList<>();
   private boolean serializeNulls;
   private String datePattern;
   private int dateStyle = DateFormat.DEFAULT;
@@ -536,7 +536,7 @@ public final class GsonBuilder {
    * @return an instance of Gson configured with the options currently set in this builder
    */
   public Gson create() {
-    List<TypeAdapterFactory> factories = new ArrayList<TypeAdapterFactory>();
+    List<TypeAdapterFactory> factories = new ArrayList<>();
     factories.addAll(this.factories);
     Collections.reverse(factories);
     factories.addAll(this.hierarchyFactories);
diff --git a/src/com/massivecraft/massivecore/xlib/gson/InstanceCreator.java b/src/com/massivecraft/massivecore/xlib/gson/InstanceCreator.java
index cb9d25e5..926b9339 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/InstanceCreator.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/InstanceCreator.java
@@ -88,5 +88,5 @@ public interface InstanceCreator<T> {
    * @param type the parameterized T represented as a {@link Type}.
    * @return a default object instance of type T.
    */
-  public T createInstance(Type type);
+  T createInstance(Type type);
 }
diff --git a/src/com/massivecraft/massivecore/xlib/gson/JsonArray.java b/src/com/massivecraft/massivecore/xlib/gson/JsonArray.java
index d5420c4c..f0a15896 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/JsonArray.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonArray.java
@@ -37,7 +37,7 @@ public final class JsonArray extends JsonElement implements Iterable<JsonElement
    * Creates an empty JsonArray.
    */
   public JsonArray() {
-    elements = new ArrayList<JsonElement>();
+    elements = new ArrayList<>();
   }
 
   @Override
diff --git a/src/com/massivecraft/massivecore/xlib/gson/JsonDeserializationContext.java b/src/com/massivecraft/massivecore/xlib/gson/JsonDeserializationContext.java
index 8e446c34..0d0784ff 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/JsonDeserializationContext.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonDeserializationContext.java
@@ -40,5 +40,5 @@ public interface JsonDeserializationContext {
    * @return An object of type typeOfT.
    * @throws JsonParseException if the parse tree does not contain expected data.
    */
-  public <T> T deserialize(JsonElement json, Type typeOfT) throws JsonParseException;
+  <T> T deserialize(JsonElement json, Type typeOfT) throws JsonParseException;
 }
\ No newline at end of file
diff --git a/src/com/massivecraft/massivecore/xlib/gson/JsonDeserializer.java b/src/com/massivecraft/massivecore/xlib/gson/JsonDeserializer.java
index b4e1d6e1..d1b92ad3 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/JsonDeserializer.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonDeserializer.java
@@ -86,6 +86,6 @@ public interface JsonDeserializer<T> {
    * @return a deserialized object of the specified type typeOfT which is a subclass of {@code T}
    * @throws JsonParseException if json is not in the expected format of {@code typeofT}
    */
-  public T deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+  T deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
       throws JsonParseException;
 }
diff --git a/src/com/massivecraft/massivecore/xlib/gson/JsonObject.java b/src/com/massivecraft/massivecore/xlib/gson/JsonObject.java
index 9294505a..d9a2e931 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/JsonObject.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonObject.java
@@ -31,7 +31,7 @@ import java.util.Set;
  */
 public final class JsonObject extends JsonElement {
   private final LinkedTreeMap<String, JsonElement> members =
-      new LinkedTreeMap<String, JsonElement>();
+	  new LinkedTreeMap<>();
 
   @Override
   JsonObject deepCopy() {
diff --git a/src/com/massivecraft/massivecore/xlib/gson/JsonSerializationContext.java b/src/com/massivecraft/massivecore/xlib/gson/JsonSerializationContext.java
index ed310f08..f4671253 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/JsonSerializationContext.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonSerializationContext.java
@@ -33,7 +33,7 @@ public interface JsonSerializationContext {
    * @param src the object that needs to be serialized.
    * @return a tree of {@link JsonElement}s corresponding to the serialized form of {@code src}.
    */
-  public JsonElement serialize(Object src);
+  JsonElement serialize(Object src);
 
   /**
    * Invokes default serialization on the specified object passing the specific type information.
@@ -45,5 +45,5 @@ public interface JsonSerializationContext {
    * @param typeOfSrc the actual genericized type of src object.
    * @return a tree of {@link JsonElement}s corresponding to the serialized form of {@code src}.
    */
-  public JsonElement serialize(Object src, Type typeOfSrc);
+  JsonElement serialize(Object src, Type typeOfSrc);
 }
diff --git a/src/com/massivecraft/massivecore/xlib/gson/JsonSerializer.java b/src/com/massivecraft/massivecore/xlib/gson/JsonSerializer.java
index accc0ec7..2f4d78e3 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/JsonSerializer.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/JsonSerializer.java
@@ -85,5 +85,5 @@ public interface JsonSerializer<T> {
    * @param typeOfSrc the actual type (fully genericized version) of the source object.
    * @return a JsonElement corresponding to the specified object.
    */
-  public JsonElement serialize(T src, Type typeOfSrc, JsonSerializationContext context);
+  JsonElement serialize(T src, Type typeOfSrc, JsonSerializationContext context);
 }
diff --git a/src/com/massivecraft/massivecore/xlib/gson/TreeTypeAdapter.java b/src/com/massivecraft/massivecore/xlib/gson/TreeTypeAdapter.java
index 17fa18ba..6ffa5a24 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/TreeTypeAdapter.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/TreeTypeAdapter.java
@@ -133,8 +133,9 @@ final class TreeTypeAdapter<T> extends TypeAdapter<T> {
           ? exactType.equals(type) || matchRawType && exactType.getType() == type.getRawType()
           : hierarchyType.isAssignableFrom(type.getRawType());
       return matches
-          ? new TreeTypeAdapter<T>((JsonSerializer<T>) serializer,
-              (JsonDeserializer<T>) deserializer, gson, type, this)
+          ? new TreeTypeAdapter<>((JsonSerializer<T>) serializer,
+									 (JsonDeserializer<T>) deserializer, gson, type, this
+	  )
           : null;
     }
   }
diff --git a/src/com/massivecraft/massivecore/xlib/gson/annotations/Expose.java b/src/com/massivecraft/massivecore/xlib/gson/annotations/Expose.java
index ec24a2ba..0e29f08a 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/annotations/Expose.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/annotations/Expose.java
@@ -67,7 +67,7 @@ public @interface Expose {
    * serialized output. Defaults to {@code true}.
    * @since 1.4
    */
-  public boolean serialize() default true;
+  boolean serialize() default true;
 
   /**
    * If {@code true}, the field marked with this annotation is deserialized from the JSON.
@@ -75,5 +75,5 @@ public @interface Expose {
    * Defaults to {@code true}.
    * @since 1.4
    */
-  public boolean deserialize() default true;
+  boolean deserialize() default true;
 }
diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/ConstructorConstructor.java b/src/com/massivecraft/massivecore/xlib/gson/internal/ConstructorConstructor.java
index ec4046e0..79ca0e1b 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/internal/ConstructorConstructor.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/ConstructorConstructor.java
@@ -131,7 +131,7 @@ public final class ConstructorConstructor {
       if (SortedSet.class.isAssignableFrom(rawType)) {
         return new ObjectConstructor<T>() {
           public T construct() {
-            return (T) new TreeSet<Object>();
+            return (T) new TreeSet<>();
           }
         };
       } else if (EnumSet.class.isAssignableFrom(rawType)) {
@@ -153,19 +153,19 @@ public final class ConstructorConstructor {
       } else if (Set.class.isAssignableFrom(rawType)) {
         return new ObjectConstructor<T>() {
           public T construct() {
-            return (T) new LinkedHashSet<Object>();
+            return (T) new LinkedHashSet<>();
           }
         };
       } else if (Queue.class.isAssignableFrom(rawType)) {
         return new ObjectConstructor<T>() {
           public T construct() {
-            return (T) new LinkedList<Object>();
+            return (T) new LinkedList<>();
           }
         };
       } else {
         return new ObjectConstructor<T>() {
           public T construct() {
-            return (T) new ArrayList<Object>();
+            return (T) new ArrayList<>();
           }
         };
       }
@@ -175,14 +175,14 @@ public final class ConstructorConstructor {
       if (SortedMap.class.isAssignableFrom(rawType)) {
         return new ObjectConstructor<T>() {
           public T construct() {
-            return (T) new TreeMap<Object, Object>();
+            return (T) new TreeMap<>();
           }
         };
       } else if (type instanceof ParameterizedType && !(String.class.isAssignableFrom(
           TypeToken.get(((ParameterizedType) type).getActualTypeArguments()[0]).getRawType()))) {
         return new ObjectConstructor<T>() {
           public T construct() {
-            return (T) new LinkedHashMap<Object, Object>();
+            return (T) new LinkedHashMap<>();
           }
         };
       } else {
diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/Excluder.java b/src/com/massivecraft/massivecore/xlib/gson/internal/Excluder.java
index ee88c1ca..6fed8243 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/internal/Excluder.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/Excluder.java
@@ -98,12 +98,12 @@ public final class Excluder implements TypeAdapterFactory, Cloneable {
       boolean serialization, boolean deserialization) {
     Excluder result = clone();
     if (serialization) {
-      result.serializationStrategies = new ArrayList<ExclusionStrategy>(serializationStrategies);
+      result.serializationStrategies = new ArrayList<>(serializationStrategies);
       result.serializationStrategies.add(exclusionStrategy);
     }
     if (deserialization) {
       result.deserializationStrategies
-          = new ArrayList<ExclusionStrategy>(deserializationStrategies);
+          = new ArrayList<>(deserializationStrategies);
       result.deserializationStrategies.add(exclusionStrategy);
     }
     return result;
diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/LinkedHashTreeMap.java b/src/com/massivecraft/massivecore/xlib/gson/internal/LinkedHashTreeMap.java
index 9f701366..6f24e57e 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/internal/LinkedHashTreeMap.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/LinkedHashTreeMap.java
@@ -73,7 +73,7 @@ public final class LinkedHashTreeMap<K, V> extends AbstractMap<K, V> implements
     this.comparator = comparator != null
         ? comparator
         : (Comparator) NATURAL_ORDER;
-    this.header = new Node<K, V>();
+    this.header = new Node<>();
     this.table = new Node[16]; // TODO: sizing/resizing policies
     this.threshold = (table.length / 2) + (table.length / 4); // 3/4 capacity
   }
@@ -176,10 +176,10 @@ public final class LinkedHashTreeMap<K, V> extends AbstractMap<K, V> implements
       if (comparator == NATURAL_ORDER && !(key instanceof Comparable)) {
         throw new ClassCastException(key.getClass().getName() + " is not Comparable");
       }
-      created = new Node<K, V>(nearest, key, hash, header, header.prev);
+      created = new Node<>(nearest, key, hash, header, header.prev);
       table[index] = created;
     } else {
-      created = new Node<K, V>(nearest, key, hash, header, header.prev);
+      created = new Node<>(nearest, key, hash, header, header.prev);
       if (comparison < 0) { // nearest.key is higher
         nearest.left = created;
       } else { // comparison > 0, nearest.key is lower
@@ -568,9 +568,9 @@ public final class LinkedHashTreeMap<K, V> extends AbstractMap<K, V> implements
     int oldCapacity = oldTable.length;
     @SuppressWarnings("unchecked") // Arrays and generics don't get along.
     Node<K, V>[] newTable = new Node[oldCapacity * 2];
-    AvlIterator<K, V> iterator = new AvlIterator<K, V>();
-    AvlBuilder<K, V> leftBuilder = new AvlBuilder<K, V>();
-    AvlBuilder<K, V> rightBuilder = new AvlBuilder<K, V>();
+    AvlIterator<K, V> iterator = new AvlIterator<>();
+    AvlBuilder<K, V> leftBuilder = new AvlBuilder<>();
+    AvlBuilder<K, V> rightBuilder = new AvlBuilder<>();
 
     // Split each tree into two trees.
     for (int i = 0; i < oldCapacity; i++) {
@@ -856,6 +856,6 @@ public final class LinkedHashTreeMap<K, V> extends AbstractMap<K, V> implements
    * shouldn't use it.
    */
   private Object writeReplace() throws ObjectStreamException {
-    return new LinkedHashMap<K, V>(this);
+    return new LinkedHashMap<>(this);
   }
 }
diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/LinkedTreeMap.java b/src/com/massivecraft/massivecore/xlib/gson/internal/LinkedTreeMap.java
index 5274b949..d6895708 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/internal/LinkedTreeMap.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/LinkedTreeMap.java
@@ -49,7 +49,7 @@ public final class LinkedTreeMap<K, V> extends AbstractMap<K, V> implements Seri
   int modCount = 0;
 
   // Used to preserve iteration order
-  final Node<K, V> header = new Node<K, V>();
+  final Node<K, V> header = new Node<>();
 
   /**
    * Create a natural order, empty tree map whose keys must be mutually
@@ -163,10 +163,10 @@ public final class LinkedTreeMap<K, V> extends AbstractMap<K, V> implements Seri
       if (comparator == NATURAL_ORDER && !(key instanceof Comparable)) {
         throw new ClassCastException(key.getClass().getName() + " is not Comparable");
       }
-      created = new Node<K, V>(nearest, key, header, header.prev);
+      created = new Node<>(nearest, key, header, header.prev);
       root = created;
     } else {
-      created = new Node<K, V>(nearest, key, header, header.prev);
+      created = new Node<>(nearest, key, header, header.prev);
       if (comparison < 0) { // nearest.key is higher
         nearest.left = created;
       } else { // comparison > 0, nearest.key is lower
@@ -622,6 +622,6 @@ public final class LinkedTreeMap<K, V> extends AbstractMap<K, V> implements Seri
    * shouldn't use it.
    */
   private Object writeReplace() throws ObjectStreamException {
-    return new LinkedHashMap<K, V>(this);
+    return new LinkedHashMap<>(this);
   }
 }
\ No newline at end of file
diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/ObjectConstructor.java b/src/com/massivecraft/massivecore/xlib/gson/internal/ObjectConstructor.java
index a6978aab..64c64cd7 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/internal/ObjectConstructor.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/ObjectConstructor.java
@@ -29,5 +29,5 @@ public interface ObjectConstructor<T> {
   /**
    * Returns a new instance.
    */
-  public T construct();
+  T construct();
 }
\ No newline at end of file
diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/Primitives.java b/src/com/massivecraft/massivecore/xlib/gson/internal/Primitives.java
index 35b58130..6a13f443 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/internal/Primitives.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/Primitives.java
@@ -40,8 +40,8 @@ public final class Primitives {
   // Sad that we can't use a BiMap. :(
 
   static {
-    Map<Class<?>, Class<?>> primToWrap = new HashMap<Class<?>, Class<?>>(16);
-    Map<Class<?>, Class<?>> wrapToPrim = new HashMap<Class<?>, Class<?>>(16);
+    Map<Class<?>, Class<?>> primToWrap = new HashMap<>(16);
+    Map<Class<?>, Class<?>> wrapToPrim = new HashMap<>(16);
 
     add(primToWrap, wrapToPrim, boolean.class, Boolean.class);
     add(primToWrap, wrapToPrim, byte.class, Byte.class);
diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ArrayTypeAdapter.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ArrayTypeAdapter.java
index cf6284d2..d4b7bac0 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ArrayTypeAdapter.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ArrayTypeAdapter.java
@@ -56,7 +56,7 @@ public final class ArrayTypeAdapter<E> extends TypeAdapter<Object> {
 
   public ArrayTypeAdapter(Gson context, TypeAdapter<E> componentTypeAdapter, Class<E> componentType) {
     this.componentTypeAdapter =
-      new TypeAdapterRuntimeTypeWrapper<E>(context, componentTypeAdapter, componentType);
+		new TypeAdapterRuntimeTypeWrapper<>(context, componentTypeAdapter, componentType);
     this.componentType = componentType;
   }
 
@@ -66,7 +66,7 @@ public final class ArrayTypeAdapter<E> extends TypeAdapter<Object> {
       return null;
     }
 
-    List<E> list = new ArrayList<E>();
+    List<E> list = new ArrayList<>();
     in.beginArray();
     while (in.hasNext()) {
       E instance = componentTypeAdapter.read(in);
diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
index 7db62a38..0a063495 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/CollectionTypeAdapterFactory.java
@@ -66,7 +66,7 @@ public final class CollectionTypeAdapterFactory implements TypeAdapterFactory {
         TypeAdapter<E> elementTypeAdapter,
         ObjectConstructor<? extends Collection<E>> constructor) {
       this.elementTypeAdapter =
-          new TypeAdapterRuntimeTypeWrapper<E>(context, elementTypeAdapter, elementType);
+		  new TypeAdapterRuntimeTypeWrapper<>(context, elementTypeAdapter, elementType);
       this.constructor = constructor;
     }
 
diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/JsonTreeReader.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/JsonTreeReader.java
index 83f59361..38bcdb29 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/JsonTreeReader.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/JsonTreeReader.java
@@ -48,7 +48,7 @@ public final class JsonTreeReader extends JsonReader {
   };
   private static final Object SENTINEL_CLOSED = new Object();
 
-  private final List<Object> stack = new ArrayList<Object>();
+  private final List<Object> stack = new ArrayList<>();
 
   public JsonTreeReader(JsonElement element) {
     super(UNREADABLE_READER);
diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/JsonTreeWriter.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/JsonTreeWriter.java
index 741ce4d0..b38fd09d 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/JsonTreeWriter.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/JsonTreeWriter.java
@@ -47,7 +47,7 @@ public final class JsonTreeWriter extends JsonWriter {
   private static final JsonPrimitive SENTINEL_CLOSED = new JsonPrimitive("closed");
 
   /** The JsonElements and JsonArrays under modification, outermost to innermost. */
-  private final List<JsonElement> stack = new ArrayList<JsonElement>();
+  private final List<JsonElement> stack = new ArrayList<>();
 
   /** The name for the next JSON object value. If non-null, the top of the stack is a JsonObject. */
   private String pendingName;
diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/MapTypeAdapterFactory.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/MapTypeAdapterFactory.java
index 138df8f8..d56e41a2 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/MapTypeAdapterFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/MapTypeAdapterFactory.java
@@ -152,9 +152,9 @@ public final class MapTypeAdapterFactory implements TypeAdapterFactory {
         Type valueType, TypeAdapter<V> valueTypeAdapter,
         ObjectConstructor<? extends Map<K, V>> constructor) {
       this.keyTypeAdapter =
-        new TypeAdapterRuntimeTypeWrapper<K>(context, keyTypeAdapter, keyType);
+		  new TypeAdapterRuntimeTypeWrapper<>(context, keyTypeAdapter, keyType);
       this.valueTypeAdapter =
-        new TypeAdapterRuntimeTypeWrapper<V>(context, valueTypeAdapter, valueType);
+		  new TypeAdapterRuntimeTypeWrapper<>(context, valueTypeAdapter, valueType);
       this.constructor = constructor;
     }
 
@@ -213,9 +213,9 @@ public final class MapTypeAdapterFactory implements TypeAdapterFactory {
       }
 
       boolean hasComplexKeys = false;
-      List<JsonElement> keys = new ArrayList<JsonElement>(map.size());
+      List<JsonElement> keys = new ArrayList<>(map.size());
 
-      List<V> values = new ArrayList<V>(map.size());
+      List<V> values = new ArrayList<>(map.size());
       for (Map.Entry<K, V> entry : map.entrySet()) {
         JsonElement keyElement = keyTypeAdapter.toJsonTree(entry.getKey());
         keys.add(keyElement);
diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ObjectTypeAdapter.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ObjectTypeAdapter.java
index 59bb3509..c40b6b43 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ObjectTypeAdapter.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ObjectTypeAdapter.java
@@ -55,7 +55,7 @@ public final class ObjectTypeAdapter extends TypeAdapter<Object> {
     JsonToken token = in.peek();
     switch (token) {
     case BEGIN_ARRAY:
-      List<Object> list = new ArrayList<Object>();
+      List<Object> list = new ArrayList<>();
       in.beginArray();
       while (in.hasNext()) {
         list.add(read(in));
@@ -64,7 +64,7 @@ public final class ObjectTypeAdapter extends TypeAdapter<Object> {
       return list;
 
     case BEGIN_OBJECT:
-      Map<String, Object> map = new LinkedTreeMap<String, Object>();
+      Map<String, Object> map = new LinkedTreeMap<>();
       in.beginObject();
       while (in.hasNext()) {
         map.put(in.nextName(), read(in));
diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
index 30c87c0c..23583642 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/ReflectiveTypeAdapterFactory.java
@@ -81,7 +81,7 @@ public final class ReflectiveTypeAdapterFactory implements TypeAdapterFactory {
     }
 
     ObjectConstructor<T> constructor = constructorConstructor.get(type);
-    return new Adapter<T>(constructor, getBoundFields(gson, type, raw));
+    return new Adapter<>(constructor, getBoundFields(gson, type, raw));
   }
 
   private ReflectiveTypeAdapterFactory.BoundField createBoundField(
@@ -124,7 +124,7 @@ public final class ReflectiveTypeAdapterFactory implements TypeAdapterFactory {
   }
 
   private Map<String, BoundField> getBoundFields(Gson context, TypeToken<?> type, Class<?> raw) {
-    Map<String, BoundField> result = new LinkedHashMap<String, BoundField>();
+    Map<String, BoundField> result = new LinkedHashMap<>();
     if (raw.isInterface()) {
       return result;
     }
diff --git a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/TypeAdapters.java b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/TypeAdapters.java
index 2d3b92a1..a33e0030 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/internal/bind/TypeAdapters.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/internal/bind/TypeAdapters.java
@@ -715,8 +715,8 @@ public final class TypeAdapters {
       = newTypeHierarchyFactory(JsonElement.class, JSON_ELEMENT);
 
   private static final class EnumTypeAdapter<T extends Enum<T>> extends TypeAdapter<T> {
-    private final Map<String, T> nameToConstant = new HashMap<String, T>();
-    private final Map<T, String> constantToName = new HashMap<T, String>();
+    private final Map<String, T> nameToConstant = new HashMap<>();
+    private final Map<T, String> constantToName = new HashMap<>();
 
     public EnumTypeAdapter(Class<T> classOfT) {
       try {
diff --git a/src/com/massivecraft/massivecore/xlib/gson/reflect/TypeToken.java b/src/com/massivecraft/massivecore/xlib/gson/reflect/TypeToken.java
index e6ffd77d..7df31316 100644
--- a/src/com/massivecraft/massivecore/xlib/gson/reflect/TypeToken.java
+++ b/src/com/massivecraft/massivecore/xlib/gson/reflect/TypeToken.java
@@ -222,14 +222,14 @@ public class TypeToken<T> {
     }
 
     for (Type itype : clazz.getGenericInterfaces()) {
-      if (isAssignableFrom(itype, to, new HashMap<String, Type>(typeVarMap))) {
+      if (isAssignableFrom(itype, to, new HashMap<>(typeVarMap))) {
         return true;
       }
     }
 
     // Interfaces didn't work, try the superclass.
     Type sType = clazz.getGenericSuperclass();
-    return isAssignableFrom(sType, to, new HashMap<String, Type>(typeVarMap));
+    return isAssignableFrom(sType, to, new HashMap<>(typeVarMap));
   }
 
   /**
@@ -301,6 +301,6 @@ public class TypeToken<T> {
    * Gets type literal for the given {@code Class} instance.
    */
   public static <T> TypeToken<T> get(Class<T> type) {
-    return new TypeToken<T>(type);
+    return new TypeToken<>(type);
   }
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/BSONBinaryWriter.java b/src/com/massivecraft/massivecore/xlib/mongodb/BSONBinaryWriter.java
index 4c4e32ff..3396534d 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/BSONBinaryWriter.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/BSONBinaryWriter.java
@@ -30,7 +30,7 @@ class BSONBinaryWriter extends BSONWriter {
     private final BSONBinaryWriterSettings binaryWriterSettings;
 
     private final OutputBuffer buffer;
-    private final Stack<Integer> maxDocumentSizeStack = new Stack<Integer>();
+    private final Stack<Integer> maxDocumentSizeStack = new Stack<>();
     private Mark mark;
 
     public BSONBinaryWriter(final OutputBuffer buffer) {
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/BaseCluster.java b/src/com/massivecraft/massivecore/xlib/mongodb/BaseCluster.java
index 2e4e7441..5ad68165 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/BaseCluster.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/BaseCluster.java
@@ -35,7 +35,7 @@ abstract class BaseCluster implements Cluster {
 
     private static final Logger LOGGER = Loggers.getLogger("cluster");
 
-    private final AtomicReference<CountDownLatch> phase = new AtomicReference<CountDownLatch>(new CountDownLatch(1));
+    private final AtomicReference<CountDownLatch> phase = new AtomicReference<>(new CountDownLatch(1));
     private final ClusterableServerFactory serverFactory;
     private final ThreadLocal<Random> random = new ThreadLocal<Random>() {
         @Override
@@ -78,7 +78,7 @@ abstract class BaseCluster implements Cluster {
                 throwIfIncompatible(curDescription);
 
                 if (!serverDescriptions.isEmpty()) {
-                    ClusterableServer server = getRandomServer(new ArrayList<ServerDescription>(serverDescriptions));
+                    ClusterableServer server = getRandomServer(new ArrayList<>(serverDescriptions));
                     if (server != null) {
                         return new WrappedServer(server);
                     }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/BasicDBObjectBuilder.java b/src/com/massivecraft/massivecore/xlib/mongodb/BasicDBObjectBuilder.java
index 015f36d6..8f800c36 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/BasicDBObjectBuilder.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/BasicDBObjectBuilder.java
@@ -34,7 +34,7 @@ public class BasicDBObjectBuilder {
      * creates an empty object
      */
     public BasicDBObjectBuilder(){
-        _stack = new LinkedList<DBObject>();
+        _stack = new LinkedList<>();
         _stack.add( new BasicDBObject() );
     }
 
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/BulkWriteBatchCombiner.java b/src/com/massivecraft/massivecore/xlib/mongodb/BulkWriteBatchCombiner.java
index 70910e1d..d4400ad6 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/BulkWriteBatchCombiner.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/BulkWriteBatchCombiner.java
@@ -17,6 +17,7 @@
 package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
@@ -35,19 +36,23 @@ class BulkWriteBatchCombiner {
     private int matchedCount;
     private int removedCount;
     private Integer modifiedCount = 0;
-    private final Set<BulkWriteUpsert> writeUpserts = new TreeSet<BulkWriteUpsert>(new Comparator<BulkWriteUpsert>() {
-        @Override
-        public int compare(final BulkWriteUpsert o1, final BulkWriteUpsert o2) {
-            return (o1.getIndex() < o2.getIndex()) ? -1 : ((o1.getIndex() == o2.getIndex()) ? 0 : 1);
-        }
-    });
-    private final Set<BulkWriteError> writeErrors = new TreeSet<BulkWriteError>(new Comparator<BulkWriteError>() {
-        @Override
-        public int compare(final BulkWriteError o1, final BulkWriteError o2) {
-            return (o1.getIndex() < o2.getIndex()) ? -1 : ((o1.getIndex() == o2.getIndex()) ? 0 : 1);
-        }
-    });
-    private final List<WriteConcernError> writeConcernErrors = new ArrayList<WriteConcernError>();
+    private final Set<BulkWriteUpsert> writeUpserts = new TreeSet<>(new Comparator<BulkWriteUpsert>()
+	{
+		@Override
+		public int compare(final BulkWriteUpsert o1, final BulkWriteUpsert o2)
+		{
+			return (o1.getIndex() < o2.getIndex()) ? -1 : ((o1.getIndex() == o2.getIndex()) ? 0 : 1);
+		}
+	});
+    private final Set<BulkWriteError> writeErrors = new TreeSet<>(new Comparator<BulkWriteError>()
+	{
+		@Override
+		public int compare(final BulkWriteError o1, final BulkWriteError o2)
+		{
+			return (o1.getIndex() < o2.getIndex()) ? -1 : ((o1.getIndex() == o2.getIndex()) ? 0 : 1);
+		}
+	});
+    private final List<WriteConcernError> writeConcernErrors = new ArrayList<>();
 
     public BulkWriteBatchCombiner(final ServerAddress serverAddress, final WriteConcern writeConcern) {
         this.writeConcern = notNull("writeConcern", writeConcern);
@@ -75,7 +80,7 @@ class BulkWriteBatchCombiner {
 
     public void addWriteErrorResult(final BulkWriteError writeError, final IndexMap indexMap) {
         notNull("writeError", writeError);
-        mergeWriteErrors(asList(writeError), indexMap);
+        mergeWriteErrors(Collections.singletonList(writeError), indexMap);
     }
 
     public void addWriteConcernErrorResult(final WriteConcernError writeConcernError) {
@@ -124,7 +129,7 @@ class BulkWriteBatchCombiner {
     private void throwOnError() {
         if (!writeErrors.isEmpty() || !writeConcernErrors.isEmpty()) {
             throw new BulkWriteException(createResult(),
-                                         new ArrayList<BulkWriteError>(writeErrors),
+											new ArrayList<>(writeErrors),
                                          writeConcernErrors.isEmpty() ? null : writeConcernErrors.get(writeConcernErrors.size() - 1),
                                          serverAddress);
         }
@@ -133,7 +138,7 @@ class BulkWriteBatchCombiner {
     private BulkWriteResult createResult() {
         return writeConcern.callGetLastError()
                ? new AcknowledgedBulkWriteResult(insertedCount, matchedCount, removedCount, modifiedCount,
-                                                 new ArrayList<BulkWriteUpsert>(writeUpserts))
+													new ArrayList<>(writeUpserts))
                : new UnacknowledgedBulkWriteResult();
     }
 
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/BulkWriteOperation.java b/src/com/massivecraft/massivecore/xlib/mongodb/BulkWriteOperation.java
index 6cea81eb..dc7cdae6 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/BulkWriteOperation.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/BulkWriteOperation.java
@@ -34,7 +34,7 @@ import static com.massivecraft.massivecore.xlib.bson.util.Assertions.isTrue;
 public class BulkWriteOperation {
     private final boolean ordered;
     private final DBCollection collection;
-    private final List<WriteRequest> requests = new ArrayList<WriteRequest>();
+    private final List<WriteRequest> requests = new ArrayList<>();
     private boolean closed;
 
     BulkWriteOperation(final boolean ordered, final DBCollection collection) {
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/ClusterDescription.java b/src/com/massivecraft/massivecore/xlib/mongodb/ClusterDescription.java
index 265c5666..d5cd45f5 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/ClusterDescription.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ClusterDescription.java
@@ -44,11 +44,13 @@ class ClusterDescription {
         notNull("all", serverDescriptions);
         this.connectionMode = notNull("connectionMode", connectionMode);
         this.type = notNull("type", type);
-        Set<ServerDescription> serverDescriptionSet = new TreeSet<ServerDescription>(new Comparator<ServerDescription>() {
-            public int compare(final ServerDescription o1, final ServerDescription o2) {
-                return o1.getAddress().toString().compareTo(o2.getAddress().toString());
-            }
-        });
+        Set<ServerDescription> serverDescriptionSet = new TreeSet<>(new Comparator<ServerDescription>()
+		{
+			public int compare(final ServerDescription o1, final ServerDescription o2)
+			{
+				return o1.getAddress().toString().compareTo(o2.getAddress().toString());
+			}
+		});
         serverDescriptionSet.addAll(serverDescriptions);
         this.all = Collections.unmodifiableSet(serverDescriptionSet);
     }
@@ -201,7 +203,7 @@ class ClusterDescription {
 
     private List<ServerDescription> getServersByPredicate(final Predicate predicate) {
 
-        final List<ServerDescription> membersByTag = new ArrayList<ServerDescription>();
+        final List<ServerDescription> membersByTag = new ArrayList<>();
 
         for (final ServerDescription cur : all) {
             if (predicate.apply(cur)) {
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/ClusterSettings.java b/src/com/massivecraft/massivecore/xlib/mongodb/ClusterSettings.java
index 65b47eb7..0d69cb1d 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/ClusterSettings.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ClusterSettings.java
@@ -66,7 +66,7 @@ final class ClusterSettings {
             if (hosts.isEmpty()) {
                 throw new IllegalArgumentException("hosts list may not be empty");
             }
-            this.hosts = Collections.unmodifiableList(new ArrayList<ServerAddress>(new LinkedHashSet<ServerAddress>(hosts)));
+            this.hosts = Collections.unmodifiableList(new ArrayList<>(new LinkedHashSet<>(hosts)));
             return this;
         }
 
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/CompositeServerSelector.java b/src/com/massivecraft/massivecore/xlib/mongodb/CompositeServerSelector.java
index 3a1de76b..2d160bb4 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/CompositeServerSelector.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/CompositeServerSelector.java
@@ -26,7 +26,7 @@ class CompositeServerSelector implements ServerSelector {
         if (serverSelectors.isEmpty()) {
             throw new IllegalArgumentException("Server selectors can not be an empty list");
         }
-        this.serverSelectors = new ArrayList<ServerSelector>(serverSelectors);
+        this.serverSelectors = new ArrayList<>(serverSelectors);
     }
 
     @Override
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/ConcurrentLinkedDeque.java b/src/com/massivecraft/massivecore/xlib/mongodb/ConcurrentLinkedDeque.java
index 6de2bddd..d0f94d22 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/ConcurrentLinkedDeque.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ConcurrentLinkedDeque.java
@@ -345,7 +345,7 @@ implements Deque<E>, java.io.Serializable {
                 Node<E> f = getNext();
                 if (f == null || f.isMarker())
                     return null;
-                Node<E> x = new Node<E>(element, f, this);
+                Node<E> x = new Node<>(element, f, this);
                 if (casNext(f, x)) {
                     f.setPrev(x); // optimistically link
                     return x;
@@ -365,7 +365,7 @@ implements Deque<E>, java.io.Serializable {
                 Node<E> b = predecessor();
                 if (b == null)
                     return null;
-                Node<E> x = new Node<E>(element, this, b);
+                Node<E> x = new Node<>(element, this, b);
                 if (b.casNext(this, x)) {
                     setPrev(x); // optimistically link
                     return x;
@@ -383,7 +383,7 @@ implements Deque<E>, java.io.Serializable {
             Node<E> b = getPrev();
             Node<E> f = getNext();
             if (b != null && f != null && !f.isMarker() &&
-                casNext(f, new Node<E>(f))) {
+                casNext(f, new Node<>(f))) {
                 if (b.casNext(this, f))
                     f.setPrev(b);
                 return true;
@@ -410,8 +410,8 @@ implements Deque<E>, java.io.Serializable {
                 Node<E> f = getNext();
                 if (b == null || f == null || f.isMarker())
                     return null;
-                Node<E> x = new Node<E>(newElement, f, b);
-                if (casNext(f, new Node<E>(x))) {
+                Node<E> x = new Node<>(newElement, f, b);
+                if (casNext(f, new Node<>(x))) {
                     b.successor(); // to relink b
                     x.successor(); // to relink f
                     return x;
@@ -463,7 +463,7 @@ implements Deque<E>, java.io.Serializable {
      * @return the array list
      */
     private ArrayList<E> toArrayList() {
-        ArrayList<E> c = new ArrayList<E>();
+        ArrayList<E> c = new ArrayList<>();
         for (Node<E> n = header.forward(); n != null; n = n.forward())
             c.add(n.element);
         return c;
@@ -487,8 +487,8 @@ implements Deque<E>, java.io.Serializable {
      * Constructs an empty deque.
      */
     public ConcurrentLinkedDeque() {
-        Node<E> h = new Node<E>(null, null, null);
-        Node<E> t = new Node<E>(null, null, h);
+        Node<E> h = new Node<>(null, null, null);
+        Node<E> t = new Node<>(null, null, h);
         h.setNext(t);
         header = h;
         trailer = t;
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/ConcurrentPool.java b/src/com/massivecraft/massivecore/xlib/mongodb/ConcurrentPool.java
index 86ea4e91..28fffa95 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/ConcurrentPool.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ConcurrentPool.java
@@ -25,7 +25,7 @@ class ConcurrentPool<T> {
     private final int maxSize;
     private final ItemFactory<T> itemFactory;
 
-    private final Deque<T> available = new ConcurrentLinkedDeque<T>();
+    private final Deque<T> available = new ConcurrentLinkedDeque<>();
     private final Semaphore permits;
     private volatile boolean closed;
 
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DB.java b/src/com/massivecraft/massivecore/xlib/mongodb/DB.java
index d3b1ca34..c77b57f0 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DB.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DB.java
@@ -44,7 +44,7 @@ import java.util.Set;
  * @see MongoClient
  */
 public abstract class DB {
-    private static final Set<String> _obedientCommands = new HashSet<String>();
+    private static final Set<String> _obedientCommands = new HashSet<>();
 
     static {
         _obedientCommands.add("group");
@@ -511,9 +511,9 @@ public abstract class DB {
 
         Iterator<DBObject> i = namespaces.find(new BasicDBObject(), null, 0, 0, 0, getOptions(), getReadPreference(), null);
         if (i == null)
-            return new HashSet<String>();
+            return new HashSet<>();
 
-        List<String> tables = new ArrayList<String>();
+        List<String> tables = new ArrayList<>();
 
         for (; i.hasNext();) {
             DBObject o = i.next();
@@ -537,7 +537,7 @@ public abstract class DB {
 
         Collections.sort(tables);
 
-        return new LinkedHashSet<String>(tables);
+        return new LinkedHashSet<>(tables);
     }
 
     /**
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DBApiLayer.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBApiLayer.java
index 48011cc7..95370c42 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DBApiLayer.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBApiLayer.java
@@ -17,6 +17,7 @@
 package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -111,7 +112,7 @@ public class DBApiLayer extends DB {
         return new BasicDBObject(commandName, username)
                .append("pwd", _hash(username, passwd))
                .append("digestPassword", false)
-               .append("roles", Arrays.asList(getUserRoleName(readOnly)));
+               .append("roles", Collections.singletonList(getUserRoleName(readOnly)));
     }
 
 
@@ -143,12 +144,12 @@ public class DBApiLayer extends DB {
 
         Bytes.LOGGER.info( "going to kill cursors : " + sz );
 
-        Map<ServerAddress,List<Long>> m = new HashMap<ServerAddress,List<Long>>();
+        Map<ServerAddress,List<Long>> m = new HashMap<>();
         DeadCursor c;
         while (( c = _deadCursorIds.poll()) != null ){
             List<Long> x = m.get( c.host );
             if ( x == null ){
-                x = new LinkedList<Long>();
+                x = new LinkedList<>();
                 m.put( c.host , x );
             }
             x.add( c.id );
@@ -217,8 +218,8 @@ public class DBApiLayer extends DB {
     final String _root;
     final String _rootPlusDot;
     final DBTCPConnector _connector;
-    final ConcurrentHashMap<String,DBCollectionImpl> _collections = new ConcurrentHashMap<String,DBCollectionImpl>();
+    final ConcurrentHashMap<String,DBCollectionImpl> _collections = new ConcurrentHashMap<>();
 
-    ConcurrentLinkedQueue<DeadCursor> _deadCursorIds = new ConcurrentLinkedQueue<DeadCursor>();
+    ConcurrentLinkedQueue<DeadCursor> _deadCursorIds = new ConcurrentLinkedQueue<>();
 
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DBCallbackFactory.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBCallbackFactory.java
index 3702d7b0..46d56e4e 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DBCallbackFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBCallbackFactory.java
@@ -21,7 +21,7 @@ package com.massivecraft.massivecore.xlib.mongodb;
  */
 public interface DBCallbackFactory {
 
-    public DBCallback create( DBCollection collection );
+    DBCallback create(DBCollection collection);
 
 }
 
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DBCollection.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBCollection.java
index fe310754..12c3e2b7 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DBCollection.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBCollection.java
@@ -104,7 +104,7 @@ public abstract class DBCollection {
      * @dochub insert Insert
      */
     public WriteResult insert(DBObject o , WriteConcern concern ){
-        return insert( Arrays.asList(o) , concern );
+        return insert(Collections.singletonList(o), concern );
     }
 
     /**
@@ -1514,7 +1514,7 @@ public abstract class DBCollection {
      */
     @Deprecated
     public AggregationOutput aggregate(final DBObject firstOp, final DBObject... additionalOps) {
-        List<DBObject> pipeline = new ArrayList<DBObject>();
+        List<DBObject> pipeline = new ArrayList<>();
         pipeline.add(firstOp);
         Collections.addAll(pipeline, additionalOps);
         return aggregate(pipeline);
@@ -1704,7 +1704,7 @@ public abstract class DBCollection {
 
         DBCursor cur = _db.getCollection("system.indexes").find(cmd);
 
-        List<DBObject> list = new ArrayList<DBObject>();
+        List<DBObject> list = new ArrayList<>();
 
         while(cur.hasNext()) {
             list.add(cur.next());
@@ -2136,6 +2136,6 @@ public abstract class DBCollection {
      * @deprecated This will be removed in 3.0
      */
     @Deprecated
-    final private Set<String> _createdIndexes = new HashSet<String>();
+    final private Set<String> _createdIndexes = new HashSet<>();
 
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DBCollectionImpl.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBCollectionImpl.java
index 65895177..19ba57e6 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DBCollectionImpl.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBCollectionImpl.java
@@ -117,7 +117,7 @@ class DBCollectionImpl extends DBCollection {
                                         options.getReadPreference());
         res.throwOnError();
 
-        List<Cursor> cursors = new ArrayList<Cursor>();
+        List<Cursor> cursors = new ArrayList<>();
         for (DBObject cursorDocument : (List<DBObject>) res.get("cursors")) {
             cursors.add(new QueryResultIterator(cursorDocument, db, this, options.getBatchSize(), getDecoder(), res.getServerUsed()));
         }
@@ -218,7 +218,8 @@ class DBCollectionImpl extends DBCollection {
         try {
             if (useWriteCommands(concern, port)) {
                 try {
-                    return translateBulkWriteResult(removeWithCommandProtocol(Arrays.asList(new RemoveRequest(query, multi)),
+                    return translateBulkWriteResult(removeWithCommandProtocol(
+						Collections.singletonList(new RemoveRequest(query, multi)),
                                                                               concern,
                                                                               encoder,
                                                                               port), REMOVE, concern, port.getAddress());
@@ -265,7 +266,8 @@ class DBCollectionImpl extends DBCollection {
             if (useWriteCommands(concern, port)) {
                 try {
                     BulkWriteResult bulkWriteResult =
-                    updateWithCommandProtocol(Arrays.<ModifyRequest>asList(new UpdateRequest(query, upsert, o, multi)),
+                    updateWithCommandProtocol(
+						Collections.<ModifyRequest>singletonList(new UpdateRequest(query, upsert, o, multi)),
                                               concern, encoder, port);
                     return translateBulkWriteResult(bulkWriteResult, UPDATE, concern, port.getAddress());
                 } catch (BulkWriteException e) {
@@ -366,7 +368,8 @@ class DBCollectionImpl extends DBCollection {
                     }
                 }
             } else {
-                db.doGetCollection("system.indexes").insertWithWriteProtocol(asList(index), WriteConcern.SAFE,
+                db.doGetCollection("system.indexes").insertWithWriteProtocol(
+					Collections.singletonList(index), WriteConcern.SAFE,
                                                                              DefaultDBEncoder.FACTORY.create(), port, false);
             }
         } finally {
@@ -628,12 +631,14 @@ class DBCollectionImpl extends DBCollection {
         public Iterator<Run> iterator() {
             return new Iterator<Run>() {
                 private final Map<WriteRequest.Type, Run> runs =
-                new TreeMap<WriteRequest.Type, Run>(new Comparator<WriteRequest.Type>() {
-                    @Override
-                    public int compare(final WriteRequest.Type first, final WriteRequest.Type second) {
-                        return first.compareTo(second);
-                    }
-                });
+					new TreeMap<>(new Comparator<WriteRequest.Type>()
+					{
+						@Override
+						public int compare(final WriteRequest.Type first, final WriteRequest.Type second)
+						{
+							return first.compareTo(second);
+						}
+					});
                 private int curIndex;
 
                 @Override
@@ -669,7 +674,7 @@ class DBCollectionImpl extends DBCollection {
     }
 
     private class Run {
-        private final List<WriteRequest> writeRequests = new ArrayList<WriteRequest>();
+        private final List<WriteRequest> writeRequests = new ArrayList<>();
         private final WriteRequest.Type type;
         private final WriteConcern writeConcern;
         private final DBEncoder encoder;
@@ -805,7 +810,7 @@ class DBCollectionImpl extends DBCollection {
             return new RunExecutor(port) {
                 @Override
                 BulkWriteResult executeWriteCommandProtocol() {
-                    List<DBObject> documents = new ArrayList<DBObject>(insertRequests.size());
+                    List<DBObject> documents = new ArrayList<>(insertRequests.size());
                     for (InsertRequest cur : insertRequests) {
                         documents.add(cur.getDocument());
                     }
@@ -814,7 +819,7 @@ class DBCollectionImpl extends DBCollection {
 
                 @Override
                 WriteResult executeWriteProtocol(final int i) {
-                    return insert(asList(insertRequests.get(i).getDocument()), writeConcern, encoder);
+                    return insert(Collections.singletonList(insertRequests.get(i).getDocument()), writeConcern, encoder);
                 }
 
                 @Override
@@ -887,7 +892,7 @@ class DBCollectionImpl extends DBCollection {
             List<BulkWriteUpsert> getUpsertedItems(final WriteResult writeResult) {
                 return writeResult.getUpsertedId() == null
                        ? Collections.<BulkWriteUpsert>emptyList()
-                       : asList(new BulkWriteUpsert(0, writeResult.getUpsertedId()));
+                       : Collections.singletonList(new BulkWriteUpsert(0, writeResult.getUpsertedId()));
             }
 
             private BulkWriteError getBulkWriteError(final WriteConcernException writeException) {
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DBConnector.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBConnector.java
index af8d109f..7eb670e0 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DBConnector.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBConnector.java
@@ -32,15 +32,15 @@ public interface DBConnector {
      * Once this has been called, the connector will ensure that the same underlying connection is always used for a given thread.
      * This happens until requestStop() is called.
      */
-    public void requestStart();
+	void requestStart();
     /**
      * terminates the "consistent request".
      */
-    public void requestDone();
+	void requestDone();
     /**
      * Ensures that a connection exists for the "consistent request"
      */
-    public void requestEnsureConnection();
+	void requestEnsureConnection();
     
     /**
      * does a write operation
@@ -50,7 +50,7 @@ public interface DBConnector {
      * @return the write result
      * @throws MongoException
      */
-    public WriteResult say( DB db , OutMessage m , WriteConcern concern );
+	WriteResult say(DB db, OutMessage m, WriteConcern concern);
     /**
      * does a write operation
      * @param db the database
@@ -60,7 +60,7 @@ public interface DBConnector {
      * @return the write result
      * @throws MongoException
      */
-    public WriteResult say( DB db , OutMessage m , WriteConcern concern , ServerAddress hostNeeded );
+	WriteResult say(DB db, OutMessage m, WriteConcern concern, ServerAddress hostNeeded);
     
     /**
      * does a read operation on the database
@@ -72,8 +72,8 @@ public interface DBConnector {
      * @return the read result
      * @throws MongoException
      */
-    public Response call( DB db , DBCollection coll , OutMessage m , 
-                          ServerAddress hostNeeded , DBDecoder decoder );
+	Response call(DB db, DBCollection coll, OutMessage m,
+				  ServerAddress hostNeeded, DBDecoder decoder);
     /**
      *
      * does a read operation on the database
@@ -85,7 +85,7 @@ public interface DBConnector {
      * @return the read result
      * @throws MongoException
      */
-    public Response call( DB db , DBCollection coll , OutMessage m , ServerAddress hostNeeded , int retries );
+	Response call(DB db, DBCollection coll, OutMessage m, ServerAddress hostNeeded, int retries);
 
     /**
      * does a read operation on the database
@@ -99,13 +99,13 @@ public interface DBConnector {
      * @return the read result
      * @throws MongoException
      */
-    public Response call( DB db , DBCollection coll , OutMessage m , ServerAddress hostNeeded , int retries , ReadPreference readPref , DBDecoder decoder );
+	Response call(DB db, DBCollection coll, OutMessage m, ServerAddress hostNeeded, int retries, ReadPreference readPref, DBDecoder decoder);
 
     /**
      * returns true if the connector is in a usable state
      * @return
      */
-    public boolean isOpen();
+	boolean isOpen();
 
     /**
      * Authenticate using the given credentials.
@@ -115,5 +115,5 @@ public interface DBConnector {
      * @throws CommandFailureException if the authentication failed
      * @since 2.11.0
      */
-    public CommandResult authenticate(MongoCredential credentials);
+	CommandResult authenticate(MongoCredential credentials);
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DBCursor.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBCursor.java
index c4d20f38..ddd4bf5a 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DBCursor.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBCursor.java
@@ -146,7 +146,7 @@ public class DBCursor implements Cursor, Iterable<DBObject> {
     /**
      * Types of cursors: iterator or array.
      */
-    static enum CursorType { ITERATOR , ARRAY }
+	enum CursorType { ITERATOR , ARRAY }
 
     /**
      * Creates a copy of an existing database cursor.
@@ -813,5 +813,5 @@ public class DBCursor implements Cursor, Iterable<DBObject> {
     private DBObject _cur = null;
     private int _num = 0;
 
-    private final ArrayList<DBObject> _all = new ArrayList<DBObject>();
+    private final ArrayList<DBObject> _all = new ArrayList<>();
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DBDecoder.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBDecoder.java
index 5ddca4e0..06c5ed67 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DBDecoder.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBDecoder.java
@@ -25,9 +25,9 @@ import java.io.InputStream;
  *
  */
 public interface DBDecoder extends BSONDecoder {
-    public DBCallback getDBCallback(DBCollection collection);
+    DBCallback getDBCallback(DBCollection collection);
     
-    public DBObject decode( byte[] b, DBCollection collection );
+    DBObject decode(byte[] b, DBCollection collection);
 
-    public DBObject decode( InputStream in, DBCollection collection ) throws IOException;
+    DBObject decode(InputStream in, DBCollection collection) throws IOException;
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DBDecoderFactory.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBDecoderFactory.java
index 8128b559..b5139e76 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DBDecoderFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBDecoderFactory.java
@@ -21,6 +21,6 @@ package com.massivecraft.massivecore.xlib.mongodb;
  */
 public interface DBDecoderFactory {
 
-    public DBDecoder create( );
+    DBDecoder create();
     
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DBEncoder.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBEncoder.java
index eb84358d..92bdd048 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DBEncoder.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBEncoder.java
@@ -20,5 +20,5 @@ import com.massivecraft.massivecore.xlib.bson.BSONObject;
 import com.massivecraft.massivecore.xlib.bson.io.OutputBuffer;
 
 public interface DBEncoder {
-    public int writeObject( OutputBuffer buf, BSONObject o );
+    int writeObject(OutputBuffer buf, BSONObject o);
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DBEncoderFactory.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBEncoderFactory.java
index 7375a496..8e0e5ab8 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DBEncoderFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBEncoderFactory.java
@@ -21,6 +21,6 @@ package com.massivecraft.massivecore.xlib.mongodb;
  */
 public interface DBEncoderFactory {
 
-    public DBEncoder create();
+    DBEncoder create();
     
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DBObject.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBObject.java
index 04cbef72..658c5a9c 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DBObject.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBObject.java
@@ -29,12 +29,12 @@ public interface DBObject extends BSONObject {
      * if this object was retrieved with only some fields (using a field filter)
      * this method will be called to mark it as such.
      */
-    public void markAsPartialObject();
+	void markAsPartialObject();
 
     /**
      * whether markAsPartialObject was ever called
      * only matters if you are going to upsert and do not want to risk losing fields
      */
-    public boolean isPartialObject();
+	boolean isPartialObject();
 
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DBPort.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBPort.java
index f1a2ef27..65ec64ab 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DBPort.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBPort.java
@@ -367,7 +367,7 @@ public class DBPort implements Connection {
 
     void checkAuth(Mongo mongo) throws IOException {
         // get the difference between the set of credentialed databases and the set of authenticated databases on this connection
-        Set<String> unauthenticatedDatabases = new HashSet<String>(mongo.getAuthority().getCredentialsStore().getDatabases());
+        Set<String> unauthenticatedDatabases = new HashSet<>(mongo.getAuthority().getCredentialsStore().getDatabases());
         unauthenticatedDatabases.removeAll(authenticatedDatabases);
 
         for (String databaseName : unauthenticatedDatabases) {
@@ -515,7 +515,7 @@ public class DBPort implements Connection {
         @Override
         protected SaslClient createSaslClient() {
             try {
-                Map<String, Object> props = new HashMap<String, Object>();
+                Map<String, Object> props = new HashMap<>();
                 props.put(Sasl.CREDENTIALS, getGSSCredential(credential.getUserName()));
 
                 return Sasl.createSaslClient(new String[]{GSSAPI_MECHANISM}, credential.getUserName(),
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DBTCPConnector.java b/src/com/massivecraft/massivecore/xlib/mongodb/DBTCPConnector.java
index 90a16236..d1c2e7d0 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DBTCPConnector.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DBTCPConnector.java
@@ -351,7 +351,7 @@ public class DBTCPConnector implements DBConnector {
      */
     public List<ServerAddress> getServerAddressList() {
         isTrue("open", !_closed);
-        List<ServerAddress> serverAddressList = new ArrayList<ServerAddress>();
+        List<ServerAddress> serverAddressList = new ArrayList<>();
         ClusterDescription clusterDescription = getClusterDescription();
         for (ServerDescription serverDescription : clusterDescription.getAll()) {
             serverAddressList.add(serverDescription.getAddress());
@@ -543,12 +543,12 @@ public class DBTCPConnector implements DBConnector {
             pinnedRequestStatusThreadLocal.get().requestPort = port;
         }
 
-        private final ThreadLocal<PinnedRequestStatus> pinnedRequestStatusThreadLocal = new ThreadLocal<PinnedRequestStatus>();
+        private final ThreadLocal<PinnedRequestStatus> pinnedRequestStatusThreadLocal = new ThreadLocal<>();
     }
 
     private ServerSelector createServerSelector(final ReadPreference readPreference) {
         if (connectionMode == Multiple) {
-            List<ServerSelector> serverSelectorList = new ArrayList<ServerSelector>();
+            List<ServerSelector> serverSelectorList = new ArrayList<>();
             if (getType() == Sharded) {
                 serverSelectorList.add(getMongosHAServerSelector());
             } else if (getType() == ReplicaSet) {
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DefaultDBCallback.java b/src/com/massivecraft/massivecore/xlib/mongodb/DefaultDBCallback.java
index 272a0638..2ba48949 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DefaultDBCallback.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DefaultDBCallback.java
@@ -145,7 +145,7 @@ public class DefaultDBCallback extends BasicBSONCallback implements DBCallback {
 
     @Override
     public void reset(){
-        _nameStack = new LinkedList<String>();
+        _nameStack = new LinkedList<>();
         super.reset();
     }
 
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/DefaultServer.java b/src/com/massivecraft/massivecore/xlib/mongodb/DefaultServer.java
index 14c6d340..95652b93 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/DefaultServer.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/DefaultServer.java
@@ -30,7 +30,7 @@ class DefaultServer implements ClusterableServer {
     private final ServerMonitor serverMonitor;
     private final PooledConnectionProvider connectionProvider;
     private final Map<ChangeListener<ServerDescription>, Boolean> changeListeners =
-    new ConcurrentHashMap<ChangeListener<ServerDescription>, Boolean>();
+		new ConcurrentHashMap<>();
     private final ChangeListener<ServerDescription> serverStateListener;
     private volatile ServerDescription description;
     private volatile boolean isClosed;
@@ -73,9 +73,7 @@ class DefaultServer implements ClusterableServer {
     public void invalidate() {
         isTrue("open", !isClosed());
 
-        serverStateListener.stateChanged(new ChangeEvent<ServerDescription>(description, ServerDescription.builder()
-                                                                                                          .state(Connecting)
-                                                                                                          .address(serverAddress).build()));
+        serverStateListener.stateChanged(new ChangeEvent<>(description, ServerDescription.builder().state(Connecting).address(serverAddress).build()));
         connectionProvider.invalidate();
     }
 
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/IndexMap.java b/src/com/massivecraft/massivecore/xlib/mongodb/IndexMap.java
index 4650eb64..6fc0cd7b 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/IndexMap.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/IndexMap.java
@@ -45,7 +45,7 @@ abstract class IndexMap {
     abstract int map(int index);
 
     private static class HashBased extends IndexMap {
-        private final Map<Integer, Integer> indexMap = new HashMap<Integer, Integer>();
+        private final Map<Integer, Integer> indexMap = new HashMap<>();
 
         public HashBased(int startIndex, int count) {
             for (int i = startIndex; i <= count; i++) {
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/JMXConnectionPoolListener.java b/src/com/massivecraft/massivecore/xlib/mongodb/JMXConnectionPoolListener.java
index 43119fe1..52077e16 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/JMXConnectionPoolListener.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/JMXConnectionPoolListener.java
@@ -29,7 +29,7 @@ import static java.lang.String.format;
 @SuppressWarnings({"deprecation"})
 class JMXConnectionPoolListener implements ConnectionPoolListener {
     private final ConcurrentMap<ClusterIdServerAddressPair, ConnectionPoolStatistics> map =
-    new ConcurrentHashMap<ClusterIdServerAddressPair, ConnectionPoolStatistics>();
+		new ConcurrentHashMap<>();
     private final String clusterDescription;
 
     public JMXConnectionPoolListener(final String clusterDescription) {
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/LatencyMinimizingServerSelector.java b/src/com/massivecraft/massivecore/xlib/mongodb/LatencyMinimizingServerSelector.java
index b3ee0c04..73ce566a 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/LatencyMinimizingServerSelector.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/LatencyMinimizingServerSelector.java
@@ -59,7 +59,7 @@ class LatencyMinimizingServerSelector implements ServerSelector {
 
     private List<ServerDescription> getServersWithAcceptableLatencyDifference(final Set<ServerDescription> servers,
                                                                               final long bestPingTime) {
-        final List<ServerDescription> goodSecondaries = new ArrayList<ServerDescription>(servers.size());
+        final List<ServerDescription> goodSecondaries = new ArrayList<>(servers.size());
         for (final ServerDescription cur : servers) {
             if (!cur.isOk()) {
                 continue;
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/LazyWriteableDBObject.java b/src/com/massivecraft/massivecore/xlib/mongodb/LazyWriteableDBObject.java
index 65e30367..670e5c74 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/LazyWriteableDBObject.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/LazyWriteableDBObject.java
@@ -104,7 +104,7 @@ public class LazyWriteableDBObject extends LazyDBObject {
 	 */
 	@Override
 	public Set<String> keySet() {
-		Set<String> combined = new HashSet<String>();
+		Set<String> combined = new HashSet<>();
 		combined.addAll(writeable.keySet());
 		combined.addAll(super.keySet());
 		return combined;
@@ -118,5 +118,5 @@ public class LazyWriteableDBObject extends LazyDBObject {
 		return writeable.isEmpty() || super.isEmpty();
 	}
 
-	final private HashMap<String, Object> writeable = new HashMap<String, Object>();
+	final private HashMap<String, Object> writeable = new HashMap<>();
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/MapReduceCommand.java b/src/com/massivecraft/massivecore/xlib/mongodb/MapReduceCommand.java
index 4cf8b0cb..316aa571 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/MapReduceCommand.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MapReduceCommand.java
@@ -34,7 +34,7 @@ public class MapReduceCommand {
      *
      * @mongodb.driver.manual reference/command/mapReduce/#mapreduce-out-cmd Output options
      */
-    public static enum OutputType {
+    public enum OutputType {
         /**
          * Save the job output to a collection, replacing its previous content
          */
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/Mongo.java b/src/com/massivecraft/massivecore/xlib/mongodb/Mongo.java
index da8bb8e9..133b9fb8 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/Mongo.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/Mongo.java
@@ -24,6 +24,7 @@ import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -399,7 +400,7 @@ public class Mongo {
 
         List l = (List)res.get("databases");
 
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
 
         for (Object o : l) {
             list.add(((BasicDBObject)o).getString("name"));
@@ -483,7 +484,7 @@ public class Mongo {
     public List<ServerAddress> getAllAddress() {
         List<ServerAddress> result = _connector.getAllAddress();
         if (result == null) {
-            return Arrays.asList(getAddress());
+            return Collections.singletonList(getAddress());
         }
         return result;
     }
@@ -650,7 +651,7 @@ public class Mongo {
             return MongoAuthority.direct(new ServerAddress(uri.getHosts().get(0)), uri.getCredentials());
         }
         else {
-            List<ServerAddress> replicaSetSeeds = new ArrayList<ServerAddress>(uri.getHosts().size());
+            List<ServerAddress> replicaSetSeeds = new ArrayList<>(uri.getHosts().size());
             for ( String host : uri.getHosts() )
                 replicaSetSeeds.add( new ServerAddress( host ) );
             return MongoAuthority.dynamicSet(replicaSetSeeds, uri.getCredentials());
@@ -659,7 +660,7 @@ public class Mongo {
 
     final MongoOptions _options;
     final DBTCPConnector _connector;
-    final ConcurrentMap<String,DB> _dbs = new ConcurrentHashMap<String,DB>();
+    final ConcurrentMap<String,DB> _dbs = new ConcurrentHashMap<>();
     private WriteConcern _concern = WriteConcern.NORMAL;
     private ReadPreference _readPref = ReadPreference.primary();
     final Bytes.OptionHolder _netOptions = new Bytes.OptionHolder( null );
@@ -802,7 +803,7 @@ public class Mongo {
         public static Holder singleton() { return _default; }
 
         private static Holder _default = new Holder();
-        private final ConcurrentMap<String,Mongo> _mongos = new ConcurrentHashMap<String,Mongo>();
+        private final ConcurrentMap<String,Mongo> _mongos = new ConcurrentHashMap<>();
 
     }
 
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/MongoAuthority.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoAuthority.java
index fa389b7b..e0467b61 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/MongoAuthority.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoAuthority.java
@@ -119,7 +119,7 @@ class MongoAuthority {
             throw new IllegalArgumentException("credentialsStore can not be null");
         }
 
-        this.serverAddresses = Arrays.asList(serverAddress);
+        this.serverAddresses = Collections.singletonList(serverAddress);
         this.credentialsStore = credentialsStore;
         this.type = Type.Direct;
     }
@@ -149,7 +149,7 @@ class MongoAuthority {
         }
 
         this.type = type;
-        this.serverAddresses = new ArrayList<ServerAddress>(serverAddresses);
+        this.serverAddresses = new ArrayList<>(serverAddresses);
         this.credentialsStore = credentialsStore;
     }
 
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/MongoClientURI.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoClientURI.java
index cc58f834..f571660f 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/MongoClientURI.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoClientURI.java
@@ -214,7 +214,7 @@ public class MongoClientURI {
             }
 
             { // userName,password,hosts
-                List<String> all = new LinkedList<String>();
+                List<String> all = new LinkedList<>();
 
                 int idx = serverPart.indexOf("@");
 
@@ -259,11 +259,11 @@ public class MongoClientURI {
         }
     }
 
-    static Set<String> generalOptionsKeys = new HashSet<String>();
-    static Set<String> authKeys = new HashSet<String>();
-    static Set<String> readPreferenceKeys = new HashSet<String>();
-    static Set<String> writeConcernKeys = new HashSet<String>();
-    static Set<String> allKeys = new HashSet<String>();
+    static Set<String> generalOptionsKeys = new HashSet<>();
+    static Set<String> authKeys = new HashSet<>();
+    static Set<String> readPreferenceKeys = new HashSet<>();
+    static Set<String> writeConcernKeys = new HashSet<>();
+    static Set<String> allKeys = new HashSet<>();
 
     static {
         generalOptionsKeys.add("minpoolsize");
@@ -386,7 +386,7 @@ public class MongoClientURI {
         Boolean slaveOk = null;
         String readPreferenceType = null;
         DBObject firstTagSet = null;
-        List<DBObject> remainingTagSets = new ArrayList<DBObject>();
+        List<DBObject> remainingTagSets = new ArrayList<>();
 
         for (String key : readPreferenceKeys) {
             String value = getLastValue(optionsMap, key);
@@ -472,7 +472,7 @@ public class MongoClientURI {
     }
 
     private Map<String, List<String>> parseOptions(String optionsPart) {
-        Map<String, List<String>> optionsMap = new HashMap<String, List<String>>();
+        Map<String, List<String>> optionsMap = new HashMap<>();
 
         for (String _part : optionsPart.split("&|;")) {
             int idx = _part.indexOf("=");
@@ -481,7 +481,7 @@ public class MongoClientURI {
                 String value = _part.substring(idx + 1);
                 List<String> valueList = optionsMap.get(key);
                 if (valueList == null) {
-                    valueList = new ArrayList<String>(1);
+                    valueList = new ArrayList<>(1);
                 }
                 valueList.add(value);
                 optionsMap.put(key, valueList);
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/MongoCredential.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoCredential.java
index b4fdf878..34f916d3 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/MongoCredential.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoCredential.java
@@ -178,7 +178,7 @@ public final class MongoCredential {
         this.userName = from.userName;
         this.source = from.source;
         this.password = from.password;
-        this.mechanismProperties = new HashMap<String, Object>(from.mechanismProperties);
+        this.mechanismProperties = new HashMap<>(from.mechanismProperties);
         this.mechanismProperties.put(mechanismPropertyKey, mechanismPropertyValue);
     }
 
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/MongoCredentialsStore.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongoCredentialsStore.java
index 0350d6a7..38a87a80 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/MongoCredentialsStore.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongoCredentialsStore.java
@@ -38,8 +38,8 @@ import java.util.Set;
 @ThreadSafe
 @SuppressWarnings({"deprecation"})
 class MongoCredentialsStore {
-    private final Map<String, MongoCredential> credentialsMap = new HashMap<String, MongoCredential>();
-    private volatile Set<String> allDatabasesWithCredentials = new HashSet<String>();
+    private final Map<String, MongoCredential> credentialsMap = new HashMap<>();
+    private volatile Set<String> allDatabasesWithCredentials = new HashSet<>();
 
     /**
      * Creates an empty store
@@ -90,7 +90,7 @@ class MongoCredentialsStore {
         }
 
         credentialsMap.put(credentials.getSource(), credentials);
-        allDatabasesWithCredentials = new HashSet<String>(allDatabasesWithCredentials);
+        allDatabasesWithCredentials = new HashSet<>(allDatabasesWithCredentials);
         allDatabasesWithCredentials.add(credentials.getSource());
     }
 
@@ -118,7 +118,7 @@ class MongoCredentialsStore {
      * @return the list of credentials
      */
     public synchronized List<MongoCredential> asList() {
-       return new ArrayList<MongoCredential>(credentialsMap.values());
+       return new ArrayList<>(credentialsMap.values());
     }
 
     @Override
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/MongosHAServerSelector.java b/src/com/massivecraft/massivecore/xlib/mongodb/MongosHAServerSelector.java
index 40680816..f9cd2777 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/MongosHAServerSelector.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MongosHAServerSelector.java
@@ -24,7 +24,7 @@ import java.util.Set;
 
 class MongosHAServerSelector implements ServerSelector {
     private ServerAddress stickTo;
-    private Set<ServerAddress> consideredServers = new HashSet<ServerAddress>();
+    private Set<ServerAddress> consideredServers = new HashSet<>();
 
     @Override
     public List<ServerDescription> choose(final ClusterDescription clusterDescription) {
@@ -55,7 +55,7 @@ class MongosHAServerSelector implements ServerSelector {
             if (stickTo == null) {
                 return Collections.emptyList();
             } else {
-                return Arrays.asList(clusterDescription.getByServerAddress(stickTo));
+                return Collections.singletonList(clusterDescription.getByServerAddress(stickTo));
             }
         }
     }
@@ -68,7 +68,7 @@ class MongosHAServerSelector implements ServerSelector {
     }
 
     private Set<ServerAddress> getOkServers(final ClusterDescription clusterDescription) {
-        Set<ServerAddress> okServers = new HashSet<ServerAddress>();
+        Set<ServerAddress> okServers = new HashSet<>();
         for (ServerDescription cur : clusterDescription.getAny()) {
             okServers.add(cur.getAddress());
         }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/MultiServerCluster.java b/src/com/massivecraft/massivecore/xlib/mongodb/MultiServerCluster.java
index 90352dca..8c7d2d8a 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/MultiServerCluster.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/MultiServerCluster.java
@@ -44,7 +44,7 @@ final class MultiServerCluster extends BaseCluster {
     private ClusterType clusterType;
     private String replicaSetName;
     private final ConcurrentMap<ServerAddress, ServerTuple> addressToServerTupleMap =
-    new ConcurrentHashMap<ServerAddress, ServerTuple>();
+		new ConcurrentHashMap<>();
 
     private static final class ServerTuple {
         private final ClusterableServer server;
@@ -242,7 +242,7 @@ final class MultiServerCluster extends BaseCluster {
     }
 
     private List<ServerDescription> getNewServerDescriptionList() {
-        List<ServerDescription> serverDescriptions = new ArrayList<ServerDescription>();
+        List<ServerDescription> serverDescriptions = new ArrayList<>();
         for (ServerTuple cur : addressToServerTupleMap.values()) {
             serverDescriptions.add(cur.description);
         }
@@ -292,7 +292,7 @@ final class MultiServerCluster extends BaseCluster {
     }
 
     private Set<ServerAddress> getAllServerAddresses(final ServerDescription serverDescription) {
-        Set<ServerAddress> retVal = new HashSet<ServerAddress>();
+        Set<ServerAddress> retVal = new HashSet<>();
         addHostsToSet(serverDescription.getHosts(), retVal);
         addHostsToSet(serverDescription.getPassives(), retVal);
         addHostsToSet(serverDescription.getArbiters(), retVal);
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/PooledConnectionProvider.java b/src/com/massivecraft/massivecore/xlib/mongodb/PooledConnectionProvider.java
index 042c86ce..2b40e32b 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/PooledConnectionProvider.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/PooledConnectionProvider.java
@@ -54,7 +54,7 @@ class PooledConnectionProvider  {
         this.serverAddress = notNull("serverAddress", serverAddress);
         this.settings = notNull("settings", settings);
         ConnectionItemFactory connectionItemFactory = new ConnectionItemFactory();
-        pool = new ConcurrentPool<Connection>(settings.getMaxSize(), connectionItemFactory);
+        pool = new ConcurrentPool<>(settings.getMaxSize(), connectionItemFactory);
         maintenanceTask = createMaintenanceTask();
         sizeMaintenanceTimer = createTimer();
         this.connectionPoolListener = notNull("connectionPoolListener", connectionPoolListener);
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/QueryResultIterator.java b/src/com/massivecraft/massivecore/xlib/mongodb/QueryResultIterator.java
index e1d3661b..b405d26c 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/QueryResultIterator.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/QueryResultIterator.java
@@ -45,7 +45,7 @@ class QueryResultIterator implements Cursor {
 
     private boolean closed;
 
-    private final List<Integer> _sizes = new ArrayList<Integer>();
+    private final List<Integer> _sizes = new ArrayList<>();
     private int _numGetMores = 0;
     private int _numFetched = 0;
 
@@ -226,7 +226,7 @@ class QueryResultIterator implements Cursor {
             return;
 
         try {
-            _db.killCursors(_host, asList(_cursorId));
+            _db.killCursors(_host, Collections.singletonList(_cursorId));
             _cursorId = 0;
         } catch (MongoException e) {
             _db.addDeadCursor(new DeadCursor(_cursorId, _host));
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/RawDBObject.java b/src/com/massivecraft/massivecore/xlib/mongodb/RawDBObject.java
index aa72a2b7..3f924563 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/RawDBObject.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/RawDBObject.java
@@ -117,7 +117,7 @@ public class RawDBObject implements DBObject {
     }
 
     public Set<String> keySet(){    
-        Set<String> keys = new HashSet<String>();
+        Set<String> keys = new HashSet<>();
         
         ElementIter i = new ElementIter();
         while ( i.hasNext() ){
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/ReadPreference.java b/src/com/massivecraft/massivecore/xlib/mongodb/ReadPreference.java
index 33cd9dea..96023f96 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/ReadPreference.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ReadPreference.java
@@ -153,7 +153,7 @@ public abstract class ReadPreference {
         }
 
         private static List<DBObject> splitMapIntoMultipleMaps(DBObject tags) {
-            List<DBObject> tagList = new ArrayList<DBObject>(tags.keySet().size());
+            List<DBObject> tagList = new ArrayList<>(tags.keySet().size());
 
             for (String key : tags.keySet()) {
                 tagList.add(new BasicDBObject(key, tags.get(key).toString()));
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/ReflectionDBObject.java b/src/com/massivecraft/massivecore/xlib/mongodb/ReflectionDBObject.java
index fbbde609..6961513f 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/ReflectionDBObject.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ReflectionDBObject.java
@@ -138,7 +138,7 @@ public abstract class ReflectionDBObject implements DBObject {
             _class = c;
             _name = c.getName();
 
-            _fields = new TreeMap<String,FieldInfo>();
+            _fields = new TreeMap<>();
             for ( Method m : c.getMethods() ){
                 if ( ! ( m.getName().startsWith( "get" ) || m.getName().startsWith( "set" ) ) )
                     continue;
@@ -161,7 +161,7 @@ public abstract class ReflectionDBObject implements DBObject {
                     fi._setter = m;
             }
 
-            Set<String> names = new HashSet<String>( _fields.keySet() );
+            Set<String> names = new HashSet<>(_fields.keySet());
             for ( String name : names )
                 if ( ! _fields.get( name ).ok() )
                     _fields.remove( name );
@@ -277,7 +277,7 @@ public abstract class ReflectionDBObject implements DBObject {
     }
     
     private static final Map<Class,JavaWrapper> _wrappers = Collections.synchronizedMap( new HashMap<Class,JavaWrapper>() );
-    private static final Set<String> IGNORE_FIELDS = new HashSet<String>();
+    private static final Set<String> IGNORE_FIELDS = new HashSet<>();
     static {
         IGNORE_FIELDS.add( "Int" );
     }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/Response.java b/src/com/massivecraft/massivecore/xlib/mongodb/Response.java
index cf516b8d..24142f31 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/Response.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/Response.java
@@ -73,9 +73,9 @@ class Response {
         final MyInputStream user = new MyInputStream( in , _len - b.length );
 
         if ( _num < 2 )
-            _objects = new LinkedList<DBObject>();
+            _objects = new LinkedList<>();
         else
-            _objects = new ArrayList<DBObject>( _num );
+            _objects = new ArrayList<>(_num);
 
         for ( int i=0; i < _num; i++ ){
             if ( user._toGo < 5 )
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/ServerAddressSelector.java b/src/com/massivecraft/massivecore/xlib/mongodb/ServerAddressSelector.java
index f38822e4..cb19d55e 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/ServerAddressSelector.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ServerAddressSelector.java
@@ -17,6 +17,7 @@
 package com.massivecraft.massivecore.xlib.mongodb;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 class ServerAddressSelector implements ServerSelector {
@@ -28,6 +29,6 @@ class ServerAddressSelector implements ServerSelector {
 
     @Override
     public List<ServerDescription> choose(final ClusterDescription clusterDescription) {
-        return Arrays.asList(clusterDescription.getByServerAddress(address));
+        return Collections.singletonList(clusterDescription.getByServerAddress(address));
     }
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/ServerDescription.java b/src/com/massivecraft/massivecore/xlib/mongodb/ServerDescription.java
index e97848e6..e2afada1 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/ServerDescription.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ServerDescription.java
@@ -104,17 +104,17 @@ class ServerDescription {
         }
 
         public Builder hosts(final Set<String> hosts) {
-            this.hosts = hosts == null ? Collections.<String>emptySet() : Collections.unmodifiableSet(new HashSet<String>(hosts));
+            this.hosts = hosts == null ? Collections.<String>emptySet() : Collections.unmodifiableSet(new HashSet<>(hosts));
             return this;
         }
 
         public Builder passives(final Set<String> passives) {
-            this.passives = passives == null ? Collections.<String>emptySet() : Collections.unmodifiableSet(new HashSet<String>(passives));
+            this.passives = passives == null ? Collections.<String>emptySet() : Collections.unmodifiableSet(new HashSet<>(passives));
             return this;
         }
 
         public Builder arbiters(final Set<String> arbiters) {
-            this.arbiters = arbiters == null ? Collections.<String>emptySet() : Collections.unmodifiableSet(new HashSet<String>(arbiters));
+            this.arbiters = arbiters == null ? Collections.<String>emptySet() : Collections.unmodifiableSet(new HashSet<>(arbiters));
             return this;
         }
 
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/ServerMonitor.java b/src/com/massivecraft/massivecore/xlib/mongodb/ServerMonitor.java
index e22f4cca..51814478 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/ServerMonitor.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ServerMonitor.java
@@ -131,8 +131,7 @@ class ServerMonitor {
         private void sendStateChangedEvent(final ServerDescription previousServerDescription,
                                            final ServerDescription currentServerDescription) {
             if (stateHasChanged(previousServerDescription, currentServerDescription)) {
-                serverStateListener.stateChanged(new ChangeEvent<ServerDescription>(previousServerDescription,
-                                                                                    currentServerDescription));
+                serverStateListener.stateChanged(new ChangeEvent<>(previousServerDescription, currentServerDescription));
             }
         }
 
@@ -269,7 +268,7 @@ class ServerMonitor {
         if (list == null || list.isEmpty()) {
             return Collections.emptySet();
         } else {
-            return new HashSet<String>(list);
+            return new HashSet<>(list);
         }
     }
 
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/ServerVersion.java b/src/com/massivecraft/massivecore/xlib/mongodb/ServerVersion.java
index 9dc9cf10..220b3692 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/ServerVersion.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/ServerVersion.java
@@ -46,7 +46,7 @@ class ServerVersion implements Comparable<ServerVersion> {
     public ServerVersion(final List<Integer> versionList) {
         notNull("versionList", versionList);
         isTrue("version array has three elements", versionList.size() == 3);
-        this.versionList = Collections.unmodifiableList(new ArrayList<Integer>(versionList));
+        this.versionList = Collections.unmodifiableList(new ArrayList<>(versionList));
     }
 
     /**
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/SingleServerCluster.java b/src/com/massivecraft/massivecore/xlib/mongodb/SingleServerCluster.java
index 8defde6d..1022d871 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/SingleServerCluster.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/SingleServerCluster.java
@@ -77,7 +77,8 @@ final class SingleServerCluster extends BaseCluster {
             clusterType = serverDescription.getClusterType();
         }
         ClusterDescription description = new ClusterDescription(ClusterConnectionMode.Single, clusterType,
-                                                                serverDescription == null ? Collections.<ServerDescription>emptyList() : Arrays.asList(serverDescription));
+                                                                serverDescription == null ? Collections.<ServerDescription>emptyList() : Collections.singletonList(serverDescription)
+		);
 
         updateDescription(description);
         fireChangeEvent();
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/TaggableReadPreference.java b/src/com/massivecraft/massivecore/xlib/mongodb/TaggableReadPreference.java
index 217d9753..cce63785 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/TaggableReadPreference.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/TaggableReadPreference.java
@@ -26,7 +26,7 @@ import java.util.List;
  * @author breinero
  */
 public abstract class TaggableReadPreference extends ReadPreference {
-    private final static List<DBObject> EMPTY = new ArrayList<DBObject>();
+    private final static List<DBObject> EMPTY = new ArrayList<>();
 
     TaggableReadPreference() {
         _tags = EMPTY;
@@ -36,7 +36,7 @@ public abstract class TaggableReadPreference extends ReadPreference {
         if (firstTagSet == null) {
             throw new IllegalArgumentException("Must have at least one tag set");
         }
-        _tags = new ArrayList<DBObject>();
+        _tags = new ArrayList<>();
         _tags.add(firstTagSet);
         Collections.addAll(_tags, remainingTagSets);
     }
@@ -58,7 +58,7 @@ public abstract class TaggableReadPreference extends ReadPreference {
 
 
     public List<DBObject> getTagSets() {
-        List<DBObject> tags = new ArrayList<DBObject>();
+        List<DBObject> tags = new ArrayList<>();
         for (DBObject tagSet : _tags) {
             tags.add(tagSet);
         }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/Tags.java b/src/com/massivecraft/massivecore/xlib/mongodb/Tags.java
index 83f01abd..e0f52d6f 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/Tags.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/Tags.java
@@ -44,18 +44,18 @@ class Tags implements Map<String, String> {
     }
 
     public Tags() {
-        wrapped = new HashMap<String, String>();
+        wrapped = new HashMap<>();
         frozen = false;
     }
 
     public Tags(final String key, final String value) {
-        wrapped = new HashMap<String, String>();
+        wrapped = new HashMap<>();
         wrapped.put(key, value);
         frozen = false;
     }
 
     Tags(final Map<String, String> wrapped) {
-        this.wrapped = new HashMap<String, String>(wrapped);
+        this.wrapped = new HashMap<>(wrapped);
         frozen = true;
     }
 
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/WriteCommandResultHelper.java b/src/com/massivecraft/massivecore/xlib/mongodb/WriteCommandResultHelper.java
index 7c13d6b2..8be8f96b 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/WriteCommandResultHelper.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/WriteCommandResultHelper.java
@@ -46,7 +46,7 @@ final class WriteCommandResultHelper {
 
     @SuppressWarnings("unchecked")
     private static List<BulkWriteError> getWriteErrors(final CommandResult commandResult) {
-        List<BulkWriteError> writeErrors = new ArrayList<BulkWriteError>();
+        List<BulkWriteError> writeErrors = new ArrayList<>();
         List<DBObject> writeErrorsDocuments = (List<DBObject>) commandResult.get("writeErrors");
         if (writeErrorsDocuments != null) {
             for (DBObject cur : writeErrorsDocuments) {
@@ -75,7 +75,7 @@ final class WriteCommandResultHelper {
         if (upsertedValue == null) {
             return Collections.emptyList();
         } else {
-            List<BulkWriteUpsert> bulkWriteUpsertList = new ArrayList<BulkWriteUpsert>();
+            List<BulkWriteUpsert> bulkWriteUpsertList = new ArrayList<>();
             for (DBObject upsertedItem : upsertedValue) {
                 bulkWriteUpsertList.add(new BulkWriteUpsert(((Number) upsertedItem.get("index")).intValue(),
                                                             upsertedItem.get("_id")));
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/WriteConcern.java b/src/com/massivecraft/massivecore/xlib/mongodb/WriteConcern.java
index 54b2307c..648c7885 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/WriteConcern.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/WriteConcern.java
@@ -465,7 +465,7 @@ public class WriteConcern implements Serializable {
      */
     public static WriteConcern valueOf(String name) {
         if (_namedConcerns == null) {
-            HashMap<String, WriteConcern> newMap = new HashMap<String, WriteConcern>( 8 , 1 );
+            HashMap<String, WriteConcern> newMap = new HashMap<>(8, 1);
             for (Field f : WriteConcern.class.getFields())
                 if (Modifier.isStatic( f.getModifiers() ) && f.getType().equals( WriteConcern.class )) {
                     try {
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFS.java b/src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFS.java
index 7d4f12f0..6e1fca13 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFS.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/gridfs/GridFS.java
@@ -230,7 +230,7 @@ public class GridFS {
      * @throws MongoException 
      */
     public List<GridFSDBFile> find( DBObject query , DBObject sort){
-        List<GridFSDBFile> files = new ArrayList<GridFSDBFile>();
+        List<GridFSDBFile> files = new ArrayList<>();
 
         DBCursor c = null;
         try {
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferFactory.java b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferFactory.java
index 937ff9dc..914e86ca 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferFactory.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferFactory.java
@@ -25,13 +25,13 @@ import java.nio.ByteBuffer;
  */
 @Deprecated
 public interface ByteBufferFactory {
-    public ByteBuffer get();
+    ByteBuffer get();
 
     /**
      * @deprecated This class is NOT a part of public API and will be dropped in 3.x versions.
      */
     @Deprecated
-    public static class SimpleHeapByteBufferFactory implements ByteBufferFactory {
+	class SimpleHeapByteBufferFactory implements ByteBufferFactory {
 	public SimpleHeapByteBufferFactory( int size ){
 	    _size = size;
 	}
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferHolder.java b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferHolder.java
index 50c0cd6d..ccf87978 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferHolder.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferHolder.java
@@ -123,7 +123,7 @@ public class ByteBufferHolder {
         return buf.append( "}" ).toString();
     }
 
-    List<ByteBuffer> _buffers = new ArrayList<ByteBuffer>();
+    List<ByteBuffer> _buffers = new ArrayList<>();
     int _pos = 0;
     final int _max;
 
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferOutputStream.java b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferOutputStream.java
index daa074e1..6e44c739 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferOutputStream.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteBufferOutputStream.java
@@ -92,7 +92,7 @@ public class ByteBufferOutputStream extends OutputStream  {
 	return _lst.get( _lst.size() - 1 );
     }
 
-    final List<ByteBuffer> _lst = new ArrayList<ByteBuffer>();
+    final List<ByteBuffer> _lst = new ArrayList<>();
     final ByteBufferFactory _factory;
     
     static final ByteBufferFactory _defaultFactory = new ByteBufferFactory.SimpleHeapByteBufferFactory( 1024 * 4 );
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteStream.java b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteStream.java
index 77accba7..253f3c18 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteStream.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/io/ByteStream.java
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
 @Deprecated
 public interface ByteStream {
     
-    public boolean hasMore();
-    public int write( ByteBuffer bb );
+    boolean hasMore();
+    int write(ByteBuffer bb);
 
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/util/Args.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/Args.java
index 5e82df7b..39b80f19 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/util/Args.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/Args.java
@@ -81,6 +81,6 @@ public class Args {
         return s.toString();
     }
 
-    final Map<String,String> _options = new HashMap<String,String>();
-    final List<String> _params = new ArrayList<String>();
+    final Map<String,String> _options = new HashMap<>();
+    final List<String> _params = new ArrayList<>();
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/util/ClassMapBasedObjectSerializer.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
index daf73e40..fc8ebe0a 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/ClassMapBasedObjectSerializer.java
@@ -80,5 +80,5 @@ class ClassMapBasedObjectSerializer extends AbstractObjectSerializer {
         serializer.serialize(obj, buf);
     }
     
-    private ClassMap<ObjectSerializer> _serializers = new ClassMap<ObjectSerializer>();
+    private ClassMap<ObjectSerializer> _serializers = new ClassMap<>();
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/util/FastStack.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/FastStack.java
index 691bf603..24c55a82 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/util/FastStack.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/FastStack.java
@@ -55,5 +55,5 @@ public class FastStack<T>{
         return _data.toString();
     }
 
-    private final List<T> _data = new ArrayList<T>();
+    private final List<T> _data = new ArrayList<>();
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/util/IdentitySet.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/IdentitySet.java
index a69f94e7..23cba272 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/util/IdentitySet.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/IdentitySet.java
@@ -81,5 +81,5 @@ public class IdentitySet<T> implements Iterable<T> {
             remove( t );
     }
 
-    final IdentityHashMap<T,String> _map = new IdentityHashMap<T,String>();
+    final IdentityHashMap<T,String> _map = new IdentityHashMap<>();
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/util/SimplePool.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/SimplePool.java
index b0467b14..68c985c8 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/util/SimplePool.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/SimplePool.java
@@ -197,8 +197,8 @@ public abstract class SimplePool<T> {
     protected final String _name;
     protected final int _size;
 
-    protected final List<T> _avail = new ArrayList<T>();
-    protected final Set<T> _out = new HashSet<T>();
+    protected final List<T> _avail = new ArrayList<>();
+    protected final Set<T> _out = new HashSet<>();
     private final Semaphore _sem;
     private boolean _closed;
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/util/ThreadPool.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/ThreadPool.java
index e39b4f9e..26f647e3 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/util/ThreadPool.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/ThreadPool.java
@@ -48,7 +48,7 @@ public abstract class ThreadPool<T> {
     public ThreadPool( String name , int numThreads , int maxQueueSize ){
         _name = name;
         _maxThreads = numThreads;
-        _queue = new LinkedBlockingQueue<T>( maxQueueSize );
+        _queue = new LinkedBlockingQueue<>(maxQueueSize);
         _myThreadGroup = new MyThreadGroup();
         _threads.add( new MyThread() );
     }
@@ -145,7 +145,7 @@ public abstract class ThreadPool<T> {
     final int _maxThreads;
 
     private final AtomicInteger _inProgress = new AtomicInteger(0);
-    private final List<MyThread> _threads = new Vector<MyThread>();
+    private final List<MyThread> _threads = new Vector<>();
     private final BlockingQueue<T> _queue;
     private final MyThreadGroup _myThreadGroup;
 }
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/util/ThreadUtil.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/ThreadUtil.java
index 9efcbf0e..98d763df 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/util/ThreadUtil.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/ThreadUtil.java
@@ -69,7 +69,7 @@ public class ThreadUtil {
     public static FastStack<String> getStatus( Thread t ){
         FastStack<String> s = _threads.get( t.getId() );
         if ( s == null ){
-            s = new FastStack<String>();
+            s = new FastStack<>();
             _threads.put( t.getId() , s );
         }
         return s;
diff --git a/src/com/massivecraft/massivecore/xlib/mongodb/util/WeakBag.java b/src/com/massivecraft/massivecore/xlib/mongodb/util/WeakBag.java
index 8f7db4a3..5459019a 100644
--- a/src/com/massivecraft/massivecore/xlib/mongodb/util/WeakBag.java
+++ b/src/com/massivecraft/massivecore/xlib/mongodb/util/WeakBag.java
@@ -104,7 +104,7 @@ public class WeakBag<T> implements Iterable<T> {
     
     public List<T> getAll(){
     
-        List<T> l = new ArrayList<T>();
+        List<T> l = new ArrayList<>();
         
         for ( Iterator<MyRef> i = _refs.iterator(); i.hasNext(); ){
             MyRef ref = i.next();
@@ -124,5 +124,5 @@ public class WeakBag<T> implements Iterable<T> {
         }
     }
 
-    private final List<MyRef> _refs = new LinkedList<MyRef>();
+    private final List<MyRef> _refs = new LinkedList<>();
 }