diff --git a/forge-ai/src/main/java/forge/ai/AiAttackController.java b/forge-ai/src/main/java/forge/ai/AiAttackController.java
index c309b41ac01..12b309f09aa 100644
--- a/forge-ai/src/main/java/forge/ai/AiAttackController.java
+++ b/forge-ai/src/main/java/forge/ai/AiAttackController.java
@@ -81,7 +81,7 @@ public class AiAttackController {
         this.defendingOpponent = choosePreferredDefenderPlayer();       
         this.oppList = getOpponentCreatures(this.defendingOpponent);
         this.myList = ai.getCreaturesInPlay();
-        this.attackers = new ArrayList<Card>();
+        this.attackers = new ArrayList<>();
         for (Card c : myList) {
             if (CombatUtil.canAttack(c, this.defendingOpponent)) {
                 attackers.add(c);
@@ -95,7 +95,7 @@ public class AiAttackController {
         this.defendingOpponent = choosePreferredDefenderPlayer();       
         this.oppList = getOpponentCreatures(this.defendingOpponent);
         this.myList = ai.getCreaturesInPlay();
-        this.attackers = new ArrayList<Card>();
+        this.attackers = new ArrayList<>();
         if (CombatUtil.canAttack(attacker, this.defendingOpponent)) {
             attackers.add(attacker);
         }
@@ -103,7 +103,7 @@ public class AiAttackController {
     } // overloaded constructor to evaluate single specified attacker
     
     public static List<Card> getOpponentCreatures(final Player defender) {
-        List<Card> defenders = new ArrayList<Card>();
+        List<Card> defenders = new ArrayList<>();
         defenders.addAll(defender.getCreaturesInPlay());
         Predicate<Card> canAnimate = new Predicate<Card>() {
             @Override
@@ -151,7 +151,7 @@ public class AiAttackController {
      *
      */
     public final static List<Card> sortAttackers(final List<Card> in) {
-        final List<Card> list = new ArrayList<Card>();
+        final List<Card> list = new ArrayList<>();
 
         // Cards with triggers should come first (for Battle Cry)
         for (final Card attacker : in) {
@@ -256,7 +256,7 @@ public class AiAttackController {
     }
 
     public final static List<Card> getPossibleBlockers(final List<Card> blockers, final List<Card> attackers) {
-        List<Card> possibleBlockers = new ArrayList<Card>(blockers);
+        List<Card> possibleBlockers = new ArrayList<>(blockers);
         possibleBlockers = CardLists.filter(possibleBlockers, new Predicate<Card>() {
             @Override
             public boolean apply(final Card c) {
@@ -267,7 +267,7 @@ public class AiAttackController {
     }
 
     public final static boolean canBlockAnAttacker(final Card c, final List<Card> attackers, final boolean nextTurn) {
-        final List<Card> attackerList = new ArrayList<Card>(attackers);
+        final List<Card> attackerList = new ArrayList<>(attackers);
         if (!c.isCreature()) {
             return false;
         }
@@ -280,7 +280,7 @@ public class AiAttackController {
     }
 
     public final static Card getCardCanBlockAnAttacker(final Card c, final List<Card> attackers, final boolean nextTurn) {
-        final List<Card> attackerList = new ArrayList<Card>(attackers);
+        final List<Card> attackerList = new ArrayList<>(attackers);
         if (!c.isCreature()) {
             return null;
         }
@@ -295,9 +295,9 @@ public class AiAttackController {
     // this checks to make sure that the computer player doesn't lose when the human player attacks
     // this method is used by getAttackers()
     public final List<Card> notNeededAsBlockers(final Player ai, final List<Card> attackers) {
-        final List<Card> notNeededAsBlockers = new ArrayList<Card>(attackers);
+        final List<Card> notNeededAsBlockers = new ArrayList<>(attackers);
         int fixedBlockers = 0;
-        final List<Card> vigilantes = new ArrayList<Card>();
+        final List<Card> vigilantes = new ArrayList<>();
         //check for time walks
         if (ai.getGame().getPhaseHandler().getNextTurn().equals(ai)) {
             return attackers;
@@ -336,7 +336,7 @@ public class AiAttackController {
             }
         }
 
-        List<Card> opponentsAttackers = new ArrayList<Card>(oppList);
+        List<Card> opponentsAttackers = new ArrayList<>(oppList);
         opponentsAttackers = CardLists.filter(opponentsAttackers, new Predicate<Card>() {
             @Override
             public boolean apply(final Card c) {
@@ -681,7 +681,7 @@ public class AiAttackController {
 
         // Determine who will be attacked
         GameEntity defender = this.chooseDefender(combat, bAssault);
-        List<Card> attackersLeft = new ArrayList<Card>(this.attackers);
+        List<Card> attackersLeft = new ArrayList<>(this.attackers);
 
         // TODO probably use AttackConstraints instead of only GlobalAttackRestrictions?
         GlobalAttackRestrictions restrict = GlobalAttackRestrictions.getGlobalRestrictions(ai, combat.getDefenders());
@@ -821,12 +821,12 @@ public class AiAttackController {
         int humanForcesForAttritionalAttack = 0;
 
         // examine the potential forces
-        final List<Card> nextTurnAttackers = new ArrayList<Card>();
+        final List<Card> nextTurnAttackers = new ArrayList<>();
         int candidateCounterAttackDamage = 0;
         
         final Player opp = this.defendingOpponent;
         // get the potential damage and strength of the AI forces
-        final List<Card> candidateAttackers = new ArrayList<Card>();
+        final List<Card> candidateAttackers = new ArrayList<>();
         int candidateUnblockedDamage = 0;
         for (final Card pCard : this.myList) {
             // if the creature can attack then it's a potential attacker this
@@ -908,7 +908,7 @@ public class AiAttackController {
         // get player life total
         int humanLife = opp.getLife();
         // get the list of attackers up to the first blocked one
-        final List<Card> attritionalAttackers = new ArrayList<Card>();
+        final List<Card> attritionalAttackers = new ArrayList<>();
         for (int x = 0; x < (this.attackers.size() - humanForces); x++) {
             attritionalAttackers.add(this.attackers.get(x));
         }
diff --git a/forge-ai/src/main/java/forge/ai/AiProfileUtil.java b/forge-ai/src/main/java/forge/ai/AiProfileUtil.java
index cfe4bcd61dc..06f60545f52 100644
--- a/forge-ai/src/main/java/forge/ai/AiProfileUtil.java
+++ b/forge-ai/src/main/java/forge/ai/AiProfileUtil.java
@@ -39,7 +39,7 @@ import java.util.Map;
  * @version $Id: AIProfile.java 20169 2013-03-08 08:24:17Z Agetian $
  */
 public class AiProfileUtil {
-    private static Map<String, Map<AiProps, String>> loadedProfiles = new HashMap<String, Map<AiProps, String>>();
+    private static Map<String, Map<AiProps, String>> loadedProfiles = new HashMap<>();
 
     private static String AI_PROFILE_DIR;
     private static final String AI_PROFILE_EXT = ".ai";
@@ -74,7 +74,7 @@ public class AiProfileUtil {
      * @param profileName a profile to load.
      */
     private static final Map<AiProps, String> loadProfile(final String profileName) {
-        Map<AiProps, String> profileMap = new HashMap<AiProps, String>();
+        Map<AiProps, String> profileMap = new HashMap<>();
 
         List<String> lines = FileUtil.readFile(buildFileName(profileName));
         for (String line : lines) {
@@ -122,7 +122,7 @@ public class AiProfileUtil {
      */
     public static List<String> getAvailableProfiles()
     {
-        final List<String> availableProfiles = new ArrayList<String>();
+        final List<String> availableProfiles = new ArrayList<>();
 
         final File dir = new File(AI_PROFILE_DIR);
         final String[] children = dir.list();
@@ -146,7 +146,7 @@ public class AiProfileUtil {
      * available profiles including special random profile tags.
      */
     public static List<String> getProfilesDisplayList() {
-        final List<String> availableProfiles = new ArrayList<String>();
+        final List<String> availableProfiles = new ArrayList<>();
         availableProfiles.add(AI_PROFILE_RANDOM_MATCH);
         availableProfiles.add(AI_PROFILE_RANDOM_DUEL);
         availableProfiles.addAll(getAvailableProfiles());
diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
index ef3512b752f..9cf6b37e417 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
@@ -1514,7 +1514,7 @@ public class ComputerUtil {
      */
     public static List<GameObject> predictThreatenedObjects(final Player ai, final SpellAbility sa, boolean top) {
         final Game game = ai.getGame();
-        final List<GameObject> objects = new ArrayList<GameObject>();
+        final List<GameObject> objects = new ArrayList<>();
         if (game.getStack().isEmpty()) {
             return objects;
         }
@@ -1543,8 +1543,8 @@ public class ComputerUtil {
 
     private static Iterable<? extends GameObject> predictThreatenedObjects(final Player aiPlayer, final SpellAbility saviour,
             final SpellAbility topStack) {
-        Iterable<? extends GameObject> objects = new ArrayList<GameObject>();
-        final List<GameObject> threatened = new ArrayList<GameObject>();
+        Iterable<? extends GameObject> objects = new ArrayList<>();
+        final List<GameObject> threatened = new ArrayList<>();
         ApiType saviourApi = saviour == null ? null : saviour.getApi();
         int toughness = 0;
         boolean grantIndestructible = false;
@@ -1574,7 +1574,7 @@ public class ComputerUtil {
             }
         } else {
             objects = topStack.getTargets().getTargets();
-            final List<GameObject> canBeTargeted = new ArrayList<GameObject>();
+            final List<GameObject> canBeTargeted = new ArrayList<>();
             for (Object o : objects) {
                 if (o instanceof Card) {
                     final Card c = (Card) o;
@@ -1597,7 +1597,7 @@ public class ComputerUtil {
                 toughness = saviorWithSubs.hasParam("NumDef") ?
                         AbilityUtils.calculateAmount(saviorWithSubs.getHostCard(), saviorWithSubs.getParam("NumDef"), saviour) : 0;
                 final List<String> keywords = saviorWithSubs.hasParam("KW") ?
-                        Arrays.asList(saviorWithSubs.getParam("KW").split(" & ")) : new ArrayList<String>();
+                        Arrays.asList(saviorWithSubs.getParam("KW").split(" & ")) : new ArrayList<>();
                 if (keywords.contains("Indestructible")) {
                     grantIndestructible = true;
                 }
@@ -1630,7 +1630,7 @@ public class ComputerUtil {
             final SpellAbility sub = topStack.getSubAbility();
             boolean noRegen = false;
             if (sub != null && sub.getApi() == ApiType.Pump) {
-                final List<String> keywords = sub.hasParam("KW") ? Arrays.asList(sub.getParam("KW").split(" & ")) : new ArrayList<String>();
+                final List<String> keywords = sub.hasParam("KW") ? Arrays.asList(sub.getParam("KW").split(" & ")) : new ArrayList<>();
                 for (String kw : keywords) {
                     if (kw.contains("can't be regenerated")) {
                         noRegen = true;
@@ -2053,7 +2053,7 @@ public class ComputerUtil {
             //Too many lands!
             //Init
             int cntColors = MagicColor.WUBRG.length;
-            List<CardCollection> numProducers = new ArrayList<CardCollection>(cntColors);
+            List<CardCollection> numProducers = new ArrayList<>(cntColors);
             for (byte col : MagicColor.WUBRG) {
                 numProducers.add(col, new CardCollection());
             }
@@ -2283,7 +2283,7 @@ public class ComputerUtil {
                     chosen = ComputerUtilCard.getMostProminentType(list, valid);
                 } else  if (logic.equals("MostNeededType")) {
                     // Choose a type that is in the deck, but not in hand or on the battlefield 
-                    final List<String> basics = new ArrayList<String>();
+                    final List<String> basics = new ArrayList<>();
                     basics.addAll(CardType.Constant.BASIC_TYPES);
                     CardCollectionView presentCards = CardCollection.combine(ai.getCardsIn(ZoneType.Battlefield), ai.getCardsIn(ZoneType.Hand));
                     CardCollectionView possibleCards = ai.getAllCards();
@@ -2588,7 +2588,7 @@ public class ComputerUtil {
         int damage = 0;
         final Game game = player.getGame();
         final Card card = sa.getHostCard();
-        final FCollection<Trigger> theTriggers = new FCollection<Trigger>();
+        final FCollection<Trigger> theTriggers = new FCollection<>();
 
         for (Card c : game.getCardsIn(ZoneType.Battlefield)) {
             theTriggers.addAll(c.getTriggers());
@@ -2680,7 +2680,7 @@ public class ComputerUtil {
     public static int getDamageFromETB(final Player player, final Card permanent) {
         int damage = 0;
         final Game game = player.getGame();
-        final FCollection<Trigger> theTriggers = new FCollection<Trigger>();
+        final FCollection<Trigger> theTriggers = new FCollection<>();
 
         for (Card card : game.getCardsIn(ZoneType.Battlefield)) {
             theTriggers.addAll(card.getTriggers());
diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
index 1587fcdb91b..db112c4f973 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
@@ -564,7 +564,7 @@ public class ComputerUtilCard {
         AiBlockController aiBlk = new AiBlockController(ai);
         Combat combat = new Combat(ai);
         combat.addAttacker(attacker, ai);
-        final List<Card> attackers = new ArrayList<Card>();
+        final List<Card> attackers = new ArrayList<>();
         attackers.add(attacker);
         aiBlk.assignBlockersGivenAttackers(combat, attackers);
         return ComputerUtilCombat.attackerWouldBeDestroyed(ai, attacker, combat);
@@ -788,7 +788,7 @@ public class ComputerUtilCard {
 
     public static List<String> getColorByProminence(final List<Card> list) {
         int cntColors = MagicColor.WUBRG.length;
-        final List<Pair<Byte,Integer>> map = new ArrayList<Pair<Byte,Integer>>();
+        final List<Pair<Byte,Integer>> map = new ArrayList<>();
         for(int i = 0; i < cntColors; i++) {
             map.add(MutablePair.of(MagicColor.WUBRG[i], 0));
         }
@@ -810,7 +810,7 @@ public class ComputerUtilCard {
         });
     
         // will this part be once dropped?
-        List<String> result = new ArrayList<String>(cntColors);
+        List<String> result = new ArrayList<>(cntColors);
         for(Pair<Byte, Integer> idx : map) { // fetch color names in the same order
             result.add(MagicColor.toLongString(idx.getKey()));
         }
@@ -882,7 +882,7 @@ public class ComputerUtilCard {
         }
     };
     public static List<String> chooseColor(SpellAbility sa, int min, int max, List<String> colorChoices) {
-        List<String> chosen = new ArrayList<String>();
+        List<String> chosen = new ArrayList<>();
         Player ai = sa.getActivatingPlayer();
         final Game game = ai.getGame();
         Player opp = ai.getWeakestOpponent();
@@ -1572,7 +1572,7 @@ public class ComputerUtilCard {
         Card pumped = CardFactory.copyCard(c, true);
         pumped.setSickness(c.hasSickness());
         final long timestamp = c.getGame().getNextTimestamp();
-        final List<String> kws = new ArrayList<String>();
+        final List<String> kws = new ArrayList<>();
         for (String kw : keywords) {
             if (kw.startsWith("HIDDEN")) {
                 pumped.addHiddenExtrinsicKeyword(kw);
diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
index 9c030f3a2d4..262d63705e9 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
@@ -965,7 +965,7 @@ public class ComputerUtilCombat {
             }
         }
 
-        final FCollection<Trigger> theTriggers = new FCollection<Trigger>();
+        final FCollection<Trigger> theTriggers = new FCollection<>();
         for (Card card : game.getCardsIn(ZoneType.Battlefield)) {
             theTriggers.addAll(card.getTriggers());
         }
@@ -1100,7 +1100,7 @@ public class ComputerUtilCombat {
         } 
 
         final Game game = attacker.getGame();
-        final FCollection<Trigger> theTriggers = new FCollection<Trigger>();
+        final FCollection<Trigger> theTriggers = new FCollection<>();
         for (Card card : game.getCardsIn(ZoneType.Battlefield)) {
             theTriggers.addAll(card.getTriggers());
         }
@@ -1284,7 +1284,7 @@ public class ComputerUtilCombat {
         }
 
         final Game game = attacker.getGame();
-        final FCollection<Trigger> theTriggers = new FCollection<Trigger>();
+        final FCollection<Trigger> theTriggers = new FCollection<>();
         for (Card card : game.getCardsIn(ZoneType.Battlefield)) {
             theTriggers.addAll(card.getTriggers());
         }
@@ -1505,7 +1505,7 @@ public class ComputerUtilCombat {
         }
 
         final Game game = attacker.getGame();
-        final FCollection<Trigger> theTriggers = new FCollection<Trigger>();
+        final FCollection<Trigger> theTriggers = new FCollection<>();
         for (Card card : game.getCardsIn(ZoneType.Battlefield)) {
             theTriggers.addAll(card.getTriggers());
         }
@@ -1726,7 +1726,7 @@ public class ComputerUtilCombat {
         }
 
         // check Destroy triggers (Cockatrice and friends)
-        final FCollection<Trigger> theTriggers = new FCollection<Trigger>();
+        final FCollection<Trigger> theTriggers = new FCollection<>();
         for (Card card : attacker.getGame().getCardsIn(ZoneType.Battlefield)) {
             theTriggers.addAll(card.getTriggers());
         }
@@ -2006,7 +2006,7 @@ public class ComputerUtilCombat {
         }
 
         final Game game = blocker.getGame();
-        final FCollection<Trigger> theTriggers = new FCollection<Trigger>();
+        final FCollection<Trigger> theTriggers = new FCollection<>();
         for (Card card : game.getCardsIn(ZoneType.Battlefield)) {
             theTriggers.addAll(card.getTriggers());
         }
diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java b/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
index 9c9ba23e640..1972cac990e 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
@@ -365,7 +365,7 @@ public class ComputerUtilMana {
 
     private static boolean payManaCost(final ManaCostBeingPaid cost, final SpellAbility sa, final Player ai, final boolean test, boolean checkPlayable) {
         adjustManaCostToAvoidNegEffects(cost, sa.getHostCard(), ai);
-        List<Mana> manaSpentToPay = test ? new ArrayList<Mana>() : sa.getPayingMana();
+        List<Mana> manaSpentToPay = test ? new ArrayList<>() : sa.getPayingMana();
         boolean purePhyrexian = cost.containsOnlyPhyrexianMana();
         int testEnergyPool = ai.getCounters(CounterType.ENERGY);
 
@@ -1359,7 +1359,7 @@ public class ComputerUtilMana {
         final ListMultimap<Integer, SpellAbility> manaMap = ArrayListMultimap.create();
         final Game game = ai.getGame();
 
-        List<ReplacementEffect> replacementEffects = new ArrayList<ReplacementEffect>();
+        List<ReplacementEffect> replacementEffects = new ArrayList<>();
         for (final Player p : game.getPlayers()) {
             for (final Card crd : p.getAllCards()) {
                 for (final ReplacementEffect replacementEffect : crd.getReplacementEffects()) {
@@ -1565,7 +1565,7 @@ public class ComputerUtilMana {
      * @return map between creatures and shards to convoke
      */
     public static Map<Card, ManaCostShard> getConvokeOrImproviseFromList(final ManaCost cost, List<Card> list, boolean improvise) {
-        final Map<Card, ManaCostShard> convoke = new HashMap<Card, ManaCostShard>();
+        final Map<Card, ManaCostShard> convoke = new HashMap<>();
         Card convoked = null;
         if (!improvise) {
             for (ManaCostShard toPay : cost) {
diff --git a/forge-ai/src/main/java/forge/ai/GameState.java b/forge-ai/src/main/java/forge/ai/GameState.java
index deb1a7d021b..1703b9b0869 100644
--- a/forge-ai/src/main/java/forge/ai/GameState.java
+++ b/forge-ai/src/main/java/forge/ai/GameState.java
@@ -41,7 +41,7 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public abstract class GameState {
-    private static final Map<ZoneType, String> ZONES = new HashMap<ZoneType, String>();
+    private static final Map<ZoneType, String> ZONES = new HashMap<>();
     static {
         ZONES.put(ZoneType.Battlefield, "battlefield");
         ZONES.put(ZoneType.Hand, "hand");
@@ -66,8 +66,8 @@ public abstract class GameState {
 
     private boolean puzzleCreatorState = false;
 
-    private final Map<ZoneType, String> humanCardTexts = new EnumMap<ZoneType, String>(ZoneType.class);
-    private final Map<ZoneType, String> aiCardTexts = new EnumMap<ZoneType, String>(ZoneType.class);
+    private final Map<ZoneType, String> humanCardTexts = new EnumMap<>(ZoneType.class);
+    private final Map<ZoneType, String> aiCardTexts = new EnumMap<>(ZoneType.class);
 
     private final Map<Integer, Card> idToCard = new HashMap<>();
     private final Map<Card, Integer> cardToAttachId = new HashMap<>();
@@ -1078,7 +1078,7 @@ public abstract class GameState {
             p.getZone(zt).removeAllCards(true);
         }
 
-        Map<ZoneType, CardCollectionView> playerCards = new EnumMap<ZoneType, CardCollectionView>(ZoneType.class);
+        Map<ZoneType, CardCollectionView> playerCards = new EnumMap<>(ZoneType.class);
         for (Entry<ZoneType, String> kv : cardTexts.entrySet()) {
             String value = kv.getValue();
             playerCards.put(kv.getKey(), processCardsForZone(value.isEmpty() ? new String[0] : value.split(";"), p));
@@ -1091,7 +1091,7 @@ public abstract class GameState {
         for (Entry<ZoneType, CardCollectionView> kv : playerCards.entrySet()) {
             PlayerZone zone = p.getZone(kv.getKey());
             if (kv.getKey() == ZoneType.Battlefield) {
-                List<Card> cards = new ArrayList<Card>();
+                List<Card> cards = new ArrayList<>();
                 for (final Card c : kv.getValue()) {
                     if (c.isToken()) {
                         cards.add(c);
diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
index 7e4923d8c9d..3f461395650 100644
--- a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
+++ b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
@@ -168,8 +168,8 @@ public class PlayerControllerAi extends PlayerController {
         if (delayedReveal != null) {
             reveal(delayedReveal.getCards(), delayedReveal.getZone(), delayedReveal.getOwner(), delayedReveal.getMessagePrefix());
         }
-	FCollection<T> remaining = new FCollection<T>(optionList);
-	List<T> selecteds = new ArrayList<T>();
+	FCollection<T> remaining = new FCollection<>(optionList);
+	List<T> selecteds = new ArrayList<>();
 	T selected;
 	do {
 	    selected = chooseSingleEntityForEffect(remaining, null, sa, title, selecteds.size()>=min, targetedPlayer);
@@ -1072,7 +1072,7 @@ public class PlayerControllerAi extends PlayerController {
                     }
                 });
             } else {
-                return new HashMap<Card, ManaCostShard>();
+                return new HashMap<>();
             }
         }
         
diff --git a/forge-ai/src/main/java/forge/ai/ability/AttachAi.java b/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
index cb723ad515c..43cfb9dd765 100644
--- a/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
@@ -451,7 +451,7 @@ public class AttachAi extends SpellAbilityAi {
      */
     private static Player attachToPlayerAIPreferences(final Player aiPlayer, final SpellAbility sa,
             final boolean mandatory) {
-        List<Player> targetable = new ArrayList<Player>();
+        List<Player> targetable = new ArrayList<>();
         for (final Player player : aiPlayer.getGame().getPlayers()) {
             if (sa.canTarget(player)) {
                 targetable.add(player);
@@ -855,7 +855,7 @@ public class AttachAi extends SpellAbilityAi {
 
         int totToughness = 0;
         int totPower = 0;
-        final List<String> keywords = new ArrayList<String>();
+        final List<String> keywords = new ArrayList<>();
 
         for (final StaticAbility stAbility : attachSource.getStaticAbilities()) {
             final Map<String, String> stabMap = stAbility.getMapParams();
@@ -906,7 +906,7 @@ public class AttachAi extends SpellAbilityAi {
 
         Card c = null;
         if (prefList == null || prefList.isEmpty()) {
-            prefList = new ArrayList<Card>(list);
+            prefList = new ArrayList<>(list);
         } else {
             c = ComputerUtilCard.getBestAI(prefList);
             if (c != null) {
@@ -960,7 +960,7 @@ public class AttachAi extends SpellAbilityAi {
     protected boolean doTriggerAINoCost(final Player ai, final SpellAbility sa, final boolean mandatory) {
         final Card card = sa.getHostCard();
         // Check if there are any valid targets
-        List<GameObject> targets = new ArrayList<GameObject>();
+        List<GameObject> targets = new ArrayList<>();
         final TargetRestrictions tgt = sa.getTargetRestrictions();
         if (tgt == null) {
             targets = AbilityUtils.getDefinedObjects(sa.getHostCard(), sa.getParam("Defined"), sa);
@@ -1150,7 +1150,7 @@ public class AttachAi extends SpellAbilityAi {
 
         int totToughness = 0;
         int totPower = 0;
-        final List<String> keywords = new ArrayList<String>();
+        final List<String> keywords = new ArrayList<>();
         boolean grantingAbilities = false;
 
         for (final StaticAbility stAbility : attachSource.getStaticAbilities()) {
diff --git a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
index 98d5a90e960..f677dcf779f 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
@@ -482,7 +482,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
             }
         }
 
-        List<ZoneType> origin = new ArrayList<ZoneType>();
+        List<ZoneType> origin = new ArrayList<>();
         if (sa.hasParam("Origin")) {
             origin = ZoneType.listValueOf(sa.getParam("Origin"));
         }
@@ -557,7 +557,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
      */
     private static Card basicManaFixing(final Player ai, final List<Card> list) { // Search for a Basic Land
         final CardCollectionView combined = CardCollection.combine(ai.getCardsIn(ZoneType.Battlefield), ai.getCardsIn(ZoneType.Hand));
-        final List<String> basics = new ArrayList<String>();
+        final List<String> basics = new ArrayList<>();
 
         // what types can I go get?
         for (final String name : MagicColor.Constant.BASIC_LANDS) {
@@ -1281,7 +1281,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
             final List<GameObject> objects = ComputerUtil
                     .predictThreatenedObjects(ai, sa);
 
-            final List<Card> threatenedTargets = new ArrayList<Card>();
+            final List<Card> threatenedTargets = new ArrayList<>();
 
             for (final Card c : aiPermanents) {
                 if (objects.contains(c)) {
diff --git a/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java b/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
index 4ecfec696df..1f4e627bda8 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
@@ -103,7 +103,7 @@ public class ChooseGenericEffectAi extends SpellAbilityAi {
                 Cost unless = new Cost(unlessCost, false);
                 SpellAbility paycost = new SpellAbility.EmptySa(sa.getHostCard(), player);
                 paycost.setPayCosts(unless);
-                if (ComputerUtilCost.willPayUnlessCost(sp, player, unless, false, new FCollection<Player>(player))
+                if (ComputerUtilCost.willPayUnlessCost(sp, player, unless, false, new FCollection<>(player))
                         && ComputerUtilCost.canPayCost(paycost, player)) {
                     return sp;
                 }
diff --git a/forge-ai/src/main/java/forge/ai/ability/DamagePreventAi.java b/forge-ai/src/main/java/forge/ai/ability/DamagePreventAi.java
index 84bb04ebaf9..c80e1db1a93 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DamagePreventAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DamagePreventAi.java
@@ -100,7 +100,7 @@ public class DamagePreventAi extends SpellAbilityAi {
             	tcs.add(ai);
                 chance = true;
             }
-            final List<Card> threatenedTargets = new ArrayList<Card>();
+            final List<Card> threatenedTargets = new ArrayList<>();
             // filter AIs battlefield by what I can target
             List<Card> targetables = CardLists.getValidCards(ai.getCardsIn(ZoneType.Battlefield), tgt.getValidTgts(), ai, hostCard, sa);
             targetables = CardLists.getTargetableCards(targetables, sa);
diff --git a/forge-ai/src/main/java/forge/ai/ability/DebuffAi.java b/forge-ai/src/main/java/forge/ai/ability/DebuffAi.java
index 6f5047d533a..37bcd7c2d33 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DebuffAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DebuffAi.java
@@ -266,7 +266,7 @@ public class DebuffAi extends SpellAbilityAi {
 
     @Override
     protected boolean doTriggerAINoCost(Player ai, SpellAbility sa, boolean mandatory) {
-        final List<String> kws = sa.hasParam("Keywords") ? Arrays.asList(sa.getParam("Keywords").split(" & ")) : new ArrayList<String>();
+        final List<String> kws = sa.hasParam("Keywords") ? Arrays.asList(sa.getParam("Keywords").split(" & ")) : new ArrayList<>();
 
         if (sa.getTargetRestrictions() == null) {
             if (mandatory) {
diff --git a/forge-ai/src/main/java/forge/ai/ability/LifeLoseAi.java b/forge-ai/src/main/java/forge/ai/ability/LifeLoseAi.java
index 087261271c2..23ee0a4712e 100644
--- a/forge-ai/src/main/java/forge/ai/ability/LifeLoseAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/LifeLoseAi.java
@@ -182,7 +182,7 @@ public class LifeLoseAi extends SpellAbilityAi {
         }
 
         final List<Player> tgtPlayers = sa.usesTargeting() && !sa.hasParam("Defined")
-                ? new FCollection<Player>(sa.getTargets().getTargetPlayers()) 
+                ? new FCollection<>(sa.getTargets().getTargetPlayers())
                 : AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("Defined"), sa);
 
         // For cards like Foul Imp, ETB you lose life
diff --git a/forge-ai/src/main/java/forge/ai/ability/ProtectAi.java b/forge-ai/src/main/java/forge/ai/ability/ProtectAi.java
index 13ed8ff2e51..51db49de678 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ProtectAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ProtectAi.java
@@ -30,7 +30,7 @@ import forge.util.MyRandom;
 
 public class ProtectAi extends SpellAbilityAi {
     private static boolean hasProtectionFrom(final Card card, final String color) {
-        final List<String> onlyColors = new ArrayList<String>(MagicColor.Constant.ONLY_COLORS);
+        final List<String> onlyColors = new ArrayList<>(MagicColor.Constant.ONLY_COLORS);
 
         // make sure we have a valid color
         if (!onlyColors.contains(color)) {
diff --git a/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java b/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java
index 9f1a6c7b159..0189574dc65 100644
--- a/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java
@@ -50,7 +50,7 @@ public class PumpAllAi extends PumpAiBase {
 
         final int power = AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("NumAtt"), sa);
         final int defense = AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("NumDef"), sa);
-        final List<String> keywords = sa.hasParam("KW") ? Arrays.asList(sa.getParam("KW").split(" & ")) : new ArrayList<String>();
+        final List<String> keywords = sa.hasParam("KW") ? Arrays.asList(sa.getParam("KW").split(" & ")) : new ArrayList<>();
 
         final PhaseType phase = game.getPhaseHandler().getPhase();
 
diff --git a/forge-ai/src/main/java/forge/ai/ability/RegenerateAi.java b/forge-ai/src/main/java/forge/ai/ability/RegenerateAi.java
index 1e5ed6f1d01..64603e40410 100644
--- a/forge-ai/src/main/java/forge/ai/ability/RegenerateAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/RegenerateAi.java
@@ -106,7 +106,7 @@ public class RegenerateAi extends SpellAbilityAi {
                 // control
                 final List<GameObject> objects = ComputerUtil.predictThreatenedObjects(sa.getActivatingPlayer(), sa, true);
 
-                final List<Card> threatenedTargets = new ArrayList<Card>();
+                final List<Card> threatenedTargets = new ArrayList<>();
 
                 for (final Card c : targetables) {
                     if (objects.contains(c) && c.getShieldCount() == 0 && !ComputerUtil.canRegenerate(ai, c)) {
diff --git a/forge-ai/src/main/java/forge/ai/ability/StoreSVarAi.java b/forge-ai/src/main/java/forge/ai/ability/StoreSVarAi.java
index 88d585a3a25..2abada6610d 100644
--- a/forge-ai/src/main/java/forge/ai/ability/StoreSVarAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/StoreSVarAi.java
@@ -47,7 +47,7 @@ public class StoreSVarAi extends SpellAbilityAi {
                 possibleBlockers = CardLists.filter(possibleBlockers, Presets.UNTAPPED);
                 int oppLife = opp.getLife();
                 int potentialDmg = 0;
-                List<Card> currentAttackers = new ArrayList<Card>();
+                List<Card> currentAttackers = new ArrayList<>();
 
                 if (possibleBlockers.size() == 0) { return false; }
 
diff --git a/forge-ai/src/main/java/forge/ai/ability/TokenAi.java b/forge-ai/src/main/java/forge/ai/ability/TokenAi.java
index 6704b41e46b..ecc32895e01 100644
--- a/forge-ai/src/main/java/forge/ai/ability/TokenAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/TokenAi.java
@@ -435,7 +435,7 @@ public class TokenAi extends SpellAbilityAi {
             }
         }
         
-        final List<String> imageNames = new ArrayList<String>(1);
+        final List<String> imageNames = new ArrayList<>(1);
         if (tokenImage.equals("")) {
             imageNames.add(PaperToken.makeTokenFileName(TextUtil.fastReplace(colorDesc, " ", ""), tokenPower, tokenToughness, tokenName));
         } else {
diff --git a/forge-ai/src/main/java/forge/ai/ability/TwoPilesAi.java b/forge-ai/src/main/java/forge/ai/ability/TwoPilesAi.java
index 1589ec3f41d..0b1ac1ad906 100644
--- a/forge-ai/src/main/java/forge/ai/ability/TwoPilesAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/TwoPilesAi.java
@@ -39,7 +39,7 @@ public class TwoPilesAi extends SpellAbilityAi {
         }
 
         final List<Player> tgtPlayers = sa.usesTargeting() && !sa.hasParam("Defined")
-                ? new FCollection<Player>(sa.getTargets().getTargetPlayers()) 
+                ? new FCollection<>(sa.getTargets().getTargetPlayers())
                 : AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("Defined"), sa);
 
         final Player p = tgtPlayers.get(0);
diff --git a/forge-ai/src/main/java/forge/ai/ability/UnattachAllAi.java b/forge-ai/src/main/java/forge/ai/ability/UnattachAllAi.java
index 4f3292f58d4..4c877974ff2 100644
--- a/forge-ai/src/main/java/forge/ai/ability/UnattachAllAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/UnattachAllAi.java
@@ -66,7 +66,7 @@ public class UnattachAllAi extends SpellAbilityAi {
         final Card card = sa.getHostCard();
         final Player opp = ai.getWeakestOpponent();
         // Check if there are any valid targets
-        List<GameObject> targets = new ArrayList<GameObject>();
+        List<GameObject> targets = new ArrayList<>();
         final TargetRestrictions tgt = sa.getTargetRestrictions();
         if (tgt == null) {
             targets = AbilityUtils.getDefinedObjects(sa.getHostCard(), sa.getParam("Defined"), sa);
diff --git a/forge-ai/src/main/java/forge/ai/simulation/GameSimulator.java b/forge-ai/src/main/java/forge/ai/simulation/GameSimulator.java
index 6fe8a5074be..c1d0fac1e32 100644
--- a/forge-ai/src/main/java/forge/ai/simulation/GameSimulator.java
+++ b/forge-ai/src/main/java/forge/ai/simulation/GameSimulator.java
@@ -38,7 +38,7 @@ public class GameSimulator {
         aiPlayer = (Player) copier.find(origAiPlayer);
         eval = new GameStateEvaluator();
         
-        origLines = new ArrayList<String>();
+        origLines = new ArrayList<>();
         debugLines = origLines;
 
         debugPrint = false;
@@ -52,7 +52,7 @@ public class GameSimulator {
         // first and get the updated eval score, since this is what we'll
         // want to compare to the eval score after simulating.
         if (COPY_STACK && !origGame.getStackZone().isEmpty()) {
-            origLines = new ArrayList<String>();
+            origLines = new ArrayList<>();
             debugLines = origLines;
             Game copyOrigGame = copier.makeCopy();
             Player copyOrigAiPlayer = copyOrigGame.getPlayers().get(1);
@@ -66,12 +66,12 @@ public class GameSimulator {
 
     private void ensureGameCopyScoreMatches(Game origGame, Player origAiPlayer) {
         eval.setDebugging(true);
-        List<String> simLines = new ArrayList<String>();
+        List<String> simLines = new ArrayList<>();
         debugLines = simLines;
         Score simScore = eval.getScoreForGameState(simGame, aiPlayer);
         if (!simScore.equals(origScore)) {
             // Re-eval orig with debug printing.
-            origLines = new ArrayList<String>();
+            origLines = new ArrayList<>();
             debugLines = origLines;
             eval.getScoreForGameState(origGame, origAiPlayer);
             // Print debug info.
@@ -216,7 +216,7 @@ public class GameSimulator {
         List<String> simLines = null;
         if (debugPrint) {
             debugPrint("SimGame:");
-            simLines = new ArrayList<String>();
+            simLines = new ArrayList<>();
             debugLines = simLines;
             debugPrint = false;
         }
@@ -245,7 +245,7 @@ public class GameSimulator {
         opponent.runWithController(new Runnable() {
             @Override
             public void run() {
-                final Set<Card> allAffectedCards = new HashSet<Card>();
+                final Set<Card> allAffectedCards = new HashSet<>();
                 game.getAction().checkStateEffects(false, allAffectedCards);
                 game.getStack().addAllTriggeredAbilitiesToStack();
                 while (!game.getStack().isEmpty() && !game.isGameOver()) {
diff --git a/forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java b/forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java
index 3aa48b72945..8d3e3f06321 100644
--- a/forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java
+++ b/forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java
@@ -51,7 +51,7 @@ public class PossibleTargetSelector {
         this.sa = sa;
         this.targetingSa = targetingSa;
         this.targetingSaIndex = targetingSaIndex;
-        this.validTargets = new ArrayList<GameObject>();
+        this.validTargets = new ArrayList<>();
         generateValidTargets(sa.getHostCard().getController());
     }
 
@@ -81,7 +81,7 @@ public class PossibleTargetSelector {
 
     private static class SimilarTargetSkipper {
         private ArrayListMultimap<String, Card> validTargetsMap = ArrayListMultimap.create();
-        private HashMap<Card, String> cardTypeStrings = new HashMap<Card, String>();
+        private HashMap<Card, String> cardTypeStrings = new HashMap<>();
         private HashMap<Card, Integer> creatureScores;
 
         private int getCreatureScore(Card c) {
@@ -91,7 +91,7 @@ public class PossibleTargetSelector {
                     return score;
                 }
             } else  {
-                creatureScores = new HashMap<Card, Integer>();
+                creatureScores = new HashMap<>();
             }
 
             int score = ComputerUtilCard.evaluateCreature(c);
diff --git a/forge-ai/src/main/java/forge/ai/simulation/SimulationController.java b/forge-ai/src/main/java/forge/ai/simulation/SimulationController.java
index 2593973d08c..f6588af7fe0 100644
--- a/forge-ai/src/main/java/forge/ai/simulation/SimulationController.java
+++ b/forge-ai/src/main/java/forge/ai/simulation/SimulationController.java
@@ -18,7 +18,7 @@ public class SimulationController {
     private List<GameSimulator> simulatorStack;
     private Plan.Decision bestSequence; // last action of sequence
     private Score bestScore;
-    private List<CachedEffect> effectCache = new ArrayList<CachedEffect>();
+    private List<CachedEffect> effectCache = new ArrayList<>();
     private GameObject[] currentHostAndTarget;
 
     private static class CachedEffect {
@@ -39,10 +39,10 @@ public class SimulationController {
 
     public SimulationController(Score score) {
         bestScore = score;
-        scoreStack = new ArrayList<Score>();
+        scoreStack = new ArrayList<>();
         scoreStack.add(score);
-        simulatorStack = new ArrayList<GameSimulator>();
-        currentStack = new ArrayList<Plan.Decision>();
+        simulatorStack = new ArrayList<>();
+        currentStack = new ArrayList<>();
     }
     
     private int getRecursionDepth() {
@@ -97,7 +97,7 @@ public class SimulationController {
             throw new RuntimeException("getBestPlan() expects currentStack to be empty!");
         }
 
-        ArrayList<Plan.Decision> sequence = new ArrayList<Plan.Decision>();
+        ArrayList<Plan.Decision> sequence = new ArrayList<>();
         Plan.Decision current = bestSequence;
         while (current != null) {
             sequence.add(current);
diff --git a/forge-ai/src/main/java/forge/ai/simulation/SpellAbilityChoicesIterator.java b/forge-ai/src/main/java/forge/ai/simulation/SpellAbilityChoicesIterator.java
index 36fbde8d365..b940278d477 100644
--- a/forge-ai/src/main/java/forge/ai/simulation/SpellAbilityChoicesIterator.java
+++ b/forge-ai/src/main/java/forge/ai/simulation/SpellAbilityChoicesIterator.java
@@ -84,7 +84,7 @@ public class SpellAbilityChoicesIterator {
         }
         ChoicePoint cp = choicePoints.get(cpIndex);
         // Prune duplicates.
-        HashSet<String> uniqueCards = new HashSet<String>();
+        HashSet<String> uniqueCards = new HashSet<>();
         for (int i = 0; i < fetchList.size(); i++) {
             Card card = fetchList.get(i);
             if (uniqueCards.add(card.getName()) && uniqueCards.size() == cp.nextChoice + 1) {
@@ -213,7 +213,7 @@ public class SpellAbilityChoicesIterator {
     }
 
     public static List<AbilitySub> getModeCombination(List<AbilitySub> choices, int[] modeIndexes) {
-        ArrayList<AbilitySub> modes = new ArrayList<AbilitySub>();
+        ArrayList<AbilitySub> modes = new ArrayList<>();
         for (int modeIndex : modeIndexes) {
             modes.add(choices.get(modeIndex));
         }
diff --git a/forge-ai/src/main/java/forge/ai/simulation/SpellAbilityPicker.java b/forge-ai/src/main/java/forge/ai/simulation/SpellAbilityPicker.java
index f6c9eec8dfa..43f0c6f5e89 100644
--- a/forge-ai/src/main/java/forge/ai/simulation/SpellAbilityPicker.java
+++ b/forge-ai/src/main/java/forge/ai/simulation/SpellAbilityPicker.java
@@ -61,7 +61,7 @@ public class SpellAbilityPicker {
         List<SpellAbility> all = ComputerUtilAbility.getSpellAbilities(cards, player);
         CardCollection landsToPlay = ComputerUtilAbility.getAvailableLandsToPlay(game, player);
         if (landsToPlay != null) {
-            HashMap<String, Card> landsDeDupe = new HashMap<String, Card>();
+            HashMap<String, Card> landsDeDupe = new HashMap<>();
             for (Card land : landsToPlay) {
                 Card previousLand = landsDeDupe.get(land.getName());
                 // Skip identical lands.
@@ -165,7 +165,7 @@ public class SpellAbilityPicker {
 
         PhaseType currentPhase = game.getPhaseHandler().getPhase();
         if (currentPhase.isBefore(PhaseType.COMBAT_DECLARE_BLOCKERS)) {
-            List<SpellAbility> candidateSAs2 = new ArrayList<SpellAbility>();
+            List<SpellAbility> candidateSAs2 = new ArrayList<>();
             for (SpellAbility sa : candidateSAs) {
                 if (!isSorcerySpeed(sa, player)) {
                     System.err.println("Not sorcery: " + sa);
diff --git a/forge-core/src/main/java/forge/CardStorageReader.java b/forge-core/src/main/java/forge/CardStorageReader.java
index 02e4d414277..257305926d6 100644
--- a/forge-core/src/main/java/forge/CardStorageReader.java
+++ b/forge-core/src/main/java/forge/CardStorageReader.java
@@ -175,7 +175,7 @@ public class CardStorageReader {
         }
 
         if (zipEntriesMap == null) {
-            zipEntriesMap = new HashMap<String, ZipEntry>();
+            zipEntriesMap = new HashMap<>();
             for (ZipEntry entry : getZipEntries()) {
                 zipEntriesMap.put(entry.getName(), entry);
             }
@@ -256,7 +256,7 @@ public class CardStorageReader {
             return result;
         }
  
-        final List<File> allFiles = collectCardFiles(new ArrayList<File>(), this.cardsfolder);
+        final List<File> allFiles = collectCardFiles(new ArrayList<>(), this.cardsfolder);
         if (!allFiles.isEmpty()) {
             int fileParts = zip == null ? NUMBER_OF_PARTS : 1 + NUMBER_OF_PARTS / 3;
             if (allFiles.size() < fileParts * 100) {
diff --git a/forge-core/src/main/java/forge/FTrace.java b/forge-core/src/main/java/forge/FTrace.java
index 06533b8365d..66da87c881a 100644
--- a/forge-core/src/main/java/forge/FTrace.java
+++ b/forge-core/src/main/java/forge/FTrace.java
@@ -8,7 +8,7 @@ import java.util.Map;
 
 public class FTrace {
     private static long appStartTime;
-    private static Map<String, FTrace> traces = new HashMap<String, FTrace>();
+    private static Map<String, FTrace> traces = new HashMap<>();
 
     public static void initialize() {
         appStartTime = new Date().getTime();
diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java
index 7ff30567465..d9d02dcc78b 100644
--- a/forge-core/src/main/java/forge/StaticData.java
+++ b/forge-core/src/main/java/forge/StaticData.java
@@ -110,7 +110,7 @@ public class StaticData {
     private List<CardEdition> sortedEditions;
     public final List<CardEdition> getSortedEditions() {
         if (sortedEditions == null) {
-            sortedEditions = new ArrayList<CardEdition>();
+            sortedEditions = new ArrayList<>();
             for (CardEdition set : editions) {
                 sortedEditions.add(set);
             }
diff --git a/forge-core/src/main/java/forge/card/CardDb.java b/forge-core/src/main/java/forge/card/CardDb.java
index 0b157f26ac2..79776618bed 100644
--- a/forge-core/src/main/java/forge/card/CardDb.java
+++ b/forge-core/src/main/java/forge/card/CardDb.java
@@ -41,16 +41,16 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
     public final static char NameSetSeparator = '|';
 
     // need this to obtain cardReference by name+set+artindex
-    private final ListMultimap<String, PaperCard> allCardsByName = Multimaps.newListMultimap(new TreeMap<String,Collection<PaperCard>>(String.CASE_INSENSITIVE_ORDER),  CollectionSuppliers.arrayLists());
+    private final ListMultimap<String, PaperCard> allCardsByName = Multimaps.newListMultimap(new TreeMap<>(String.CASE_INSENSITIVE_ORDER),  CollectionSuppliers.arrayLists());
     private final Map<String, PaperCard> uniqueCardsByName = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER);
     private final Map<String, CardRules> rulesByName;
     private final Map<String, ICardFace> facesByName = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER);
-    private static Map<String, String> artPrefs = new HashMap<String, String>();
+    private static Map<String, String> artPrefs = new HashMap<>();
 
     private final Map<String, String> alternateName = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER);
-    private final Map<String, Integer> artIds = new HashMap<String, Integer>();
+    private final Map<String, Integer> artIds = new HashMap<>();
 
-    private final List<PaperCard> allCards = new ArrayList<PaperCard>();
+    private final List<PaperCard> allCards = new ArrayList<>();
     private final List<PaperCard> roAllCards = Collections.unmodifiableList(allCards);
     private final CardEdition.Collection editions;
 
@@ -166,8 +166,8 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
     }
 
     public void initialize(boolean logMissingPerEdition, boolean logMissingSummary) {
-        Set<String> allMissingCards = new LinkedHashSet<String>();
-        List<String> missingCards = new ArrayList<String>();
+        Set<String> allMissingCards = new LinkedHashSet<>();
+        List<String> missingCards = new ArrayList<>();
         CardEdition upcomingSet = null;
         Date today = new Date();
 
@@ -342,10 +342,10 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
         if (request.artIndex <= 0) { // this stands for 'random art'
             Collection<PaperCard> candidates;
             if (reqEdition == null) {
-                candidates = new ArrayList<PaperCard>(cards);
+                candidates = new ArrayList<>(cards);
             }
             else {
-                candidates = new ArrayList<PaperCard>();
+                candidates = new ArrayList<>();
                 for (PaperCard pc : cards) {
                     if (pc.getEdition().equalsIgnoreCase(reqEdition)) {
                         candidates.add(pc);
@@ -452,7 +452,7 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
                                     firstWithoutImage = pc; //ensure first without image returns if none have image
                                 }
                                 if (cardsListReadOnly) { //ensure we don't modify a cached collection
-                                    cards = new ArrayList<PaperCard>(cards);
+                                    cards = new ArrayList<>(cards);
                                     cardsListReadOnly = false;
                                 }
                                 cards.remove(randomIndex); //remove card from collection and try another random card
@@ -686,7 +686,7 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
             result = rulesByName.put(cardName, rules);
 
             // 1. generate all paper cards from edition data we have (either explicit, or found in res/editions, or add to unknown edition)
-            List<PaperCard> paperCards = new ArrayList<PaperCard>();
+            List<PaperCard> paperCards = new ArrayList<>();
             if (null == whenItWasPrinted || whenItWasPrinted.isEmpty()) {
                 for (CardEdition e : editions.getOrderedEditions()) {
                     int artIdx = 1;
diff --git a/forge-core/src/main/java/forge/card/CardFace.java b/forge-core/src/main/java/forge/card/CardFace.java
index 3e7afb2858b..26afc2c06c7 100644
--- a/forge-core/src/main/java/forge/card/CardFace.java
+++ b/forge-core/src/main/java/forge/card/CardFace.java
@@ -24,8 +24,8 @@ final class CardFace implements ICardFace {
     }
 
     
-    private final static List<String> emptyList = Collections.unmodifiableList(new ArrayList<String>());
-    private final static Map<String, String> emptyMap = Collections.unmodifiableMap(new TreeMap<String, String>());
+    private final static List<String> emptyList = Collections.unmodifiableList(new ArrayList<>());
+    private final static Map<String, String> emptyMap = Collections.unmodifiableMap(new TreeMap<>());
 
     private final String name;
     private String altName = null;
@@ -112,12 +112,12 @@ final class CardFace implements ICardFace {
 
     // Raw fields used for Card creation
     void setNonAbilityText(String value)     { this.nonAbilityText = value; }
-    void addKeyword(String value)            { if (null == this.keywords) { this.keywords = new ArrayList<String>(); } this.keywords.add(value); }
-    void addAbility(String value)            { if (null == this.abilities) { this.abilities = new ArrayList<String>(); } this.abilities.add(value);}
-    void addTrigger(String value)            { if (null == this.triggers) { this.triggers = new ArrayList<String>(); } this.triggers.add(value);}
-    void addStaticAbility(String value)      { if (null == this.staticAbilities) { this.staticAbilities = new ArrayList<String>(); } this.staticAbilities.add(value);}
-    void addReplacementEffect(String value)  { if (null == this.replacements) { this.replacements = new ArrayList<String>(); } this.replacements.add(value);}
-    void addSVar(String key, String value)   { if (null == this.variables) { this.variables = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER); } this.variables.put(key, value); }
+    void addKeyword(String value)            { if (null == this.keywords) { this.keywords = new ArrayList<>(); } this.keywords.add(value); }
+    void addAbility(String value)            { if (null == this.abilities) { this.abilities = new ArrayList<>(); } this.abilities.add(value);}
+    void addTrigger(String value)            { if (null == this.triggers) { this.triggers = new ArrayList<>(); } this.triggers.add(value);}
+    void addStaticAbility(String value)      { if (null == this.staticAbilities) { this.staticAbilities = new ArrayList<>(); } this.staticAbilities.add(value);}
+    void addReplacementEffect(String value)  { if (null == this.replacements) { this.replacements = new ArrayList<>(); } this.replacements.add(value);}
+    void addSVar(String key, String value)   { if (null == this.variables) { this.variables = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); } this.variables.put(key, value); }
 
     
     void assignMissingFields() { // Most scripts do not specify color explicitly
diff --git a/forge-core/src/main/java/forge/card/CardRulesPredicates.java b/forge-core/src/main/java/forge/card/CardRulesPredicates.java
index 4748c821013..6679b3ad673 100644
--- a/forge-core/src/main/java/forge/card/CardRulesPredicates.java
+++ b/forge-core/src/main/java/forge/card/CardRulesPredicates.java
@@ -627,7 +627,7 @@ public final class CardRulesPredicates {
         public static final Predicate<CardRules> IS_MONOCOLOR = CardRulesPredicates.hasCntColors((byte) 1);
 
         /** The Constant colors. */
-        public static final List<Predicate<CardRules>> COLORS = new ArrayList<Predicate<CardRules>>();
+        public static final List<Predicate<CardRules>> COLORS = new ArrayList<>();
         static {
             Presets.COLORS.add(Presets.IS_WHITE);
             Presets.COLORS.add(Presets.IS_BLUE);
diff --git a/forge-core/src/main/java/forge/card/ColorSet.java b/forge-core/src/main/java/forge/card/ColorSet.java
index c3b34c5cdd8..0384ff5a481 100644
--- a/forge-core/src/main/java/forge/card/ColorSet.java
+++ b/forge-core/src/main/java/forge/card/ColorSet.java
@@ -320,7 +320,7 @@ public final class ColorSet implements Comparable<ColorSet>, Iterable<Byte>, Ser
         if (isColorless()) {
             return EnumSet.of(Color.COLORLESS);
         }
-        List<Color> list = new ArrayList<Color>();
+        List<Color> list = new ArrayList<>();
         for (Color c : Color.values()) {
             if (hasAnyColor(c.getColormask())) {
                 list.add(c);
diff --git a/forge-core/src/main/java/forge/card/PrintSheet.java b/forge-core/src/main/java/forge/card/PrintSheet.java
index 3aa29ad2527..7c5c22461fa 100644
--- a/forge-core/src/main/java/forge/card/PrintSheet.java
+++ b/forge-core/src/main/java/forge/card/PrintSheet.java
@@ -96,7 +96,7 @@ public class PrintSheet {
             number -= uniqueCards;
         }
 
-        List<PaperCard> uniques = wantUnique ? new ArrayList<PaperCard>() : null;
+        List<PaperCard> uniques = wantUnique ? new ArrayList<>() : null;
         for(int iC = 0; iC < number; iC++) {
             int index = MyRandom.getRandom().nextInt(totalWeight);
             PaperCard toAdd = fetchRoulette(0, index, wantUnique ? uniques : null);
diff --git a/forge-core/src/main/java/forge/deck/Deck.java b/forge-core/src/main/java/forge/deck/Deck.java
index 34f461432d8..9e8921d78b6 100644
--- a/forge-core/src/main/java/forge/deck/Deck.java
+++ b/forge-core/src/main/java/forge/deck/Deck.java
@@ -39,8 +39,8 @@ import java.util.Map.Entry;
  */
 @SuppressWarnings("serial")
 public class Deck extends DeckBase implements Iterable<Entry<DeckSection, CardPool>> {
-    private final Map<DeckSection, CardPool> parts = new EnumMap<DeckSection, CardPool>(DeckSection.class);
-    private final Set<String> tags = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
+    private final Map<DeckSection, CardPool> parts = new EnumMap<>(DeckSection.class);
+    private final Set<String> tags = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
     // Supports deferring loading a deck until we actually need its contents. This works in conjunction with
     // the lazy card load feature to ensure we don't need to load all cards on start up.
     private Map<String, List<String>> deferredSections;
diff --git a/forge-core/src/main/java/forge/deck/DeckFormat.java b/forge-core/src/main/java/forge/deck/DeckFormat.java
index f0515c6494b..99bc2613fad 100644
--- a/forge-core/src/main/java/forge/deck/DeckFormat.java
+++ b/forge-core/src/main/java/forge/deck/DeckFormat.java
@@ -263,7 +263,7 @@ public enum DeckFormat {
                 }
             }
 
-            final List<PaperCard> erroneousCI = new ArrayList<PaperCard>();
+            final List<PaperCard> erroneousCI = new ArrayList<>();
 
             Set<String> basicLandNames = new HashSet<>();
             for (final Entry<PaperCard, Integer> cp : deck.get(DeckSection.Main)) {
@@ -306,7 +306,7 @@ public enum DeckFormat {
         }
 
         if (cardPoolFilter != null) {
-            final List<PaperCard> erroneousCI = new ArrayList<PaperCard>();
+            final List<PaperCard> erroneousCI = new ArrayList<>();
             for (final Entry<PaperCard, Integer> cp : deck.getAllCardsInASinglePool()) {
                 if (!cardPoolFilter.apply(cp.getKey().getRules())) {
                     erroneousCI.add(cp.getKey());
diff --git a/forge-core/src/main/java/forge/deck/DeckGroup.java b/forge-core/src/main/java/forge/deck/DeckGroup.java
index 02b0368fa97..29a4961b5ce 100644
--- a/forge-core/src/main/java/forge/deck/DeckGroup.java
+++ b/forge-core/src/main/java/forge/deck/DeckGroup.java
@@ -37,7 +37,7 @@ public class DeckGroup extends DeckBase {
 
     private static final long serialVersionUID = -1628725522049635829L;
     private Deck humanDeck;
-    private List<Deck> aiDecks = new ArrayList<Deck>();
+    private List<Deck> aiDecks = new ArrayList<>();
 
     /**
      * Gets the human deck.
diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGenPool.java b/forge-core/src/main/java/forge/deck/generation/DeckGenPool.java
index b319452123b..870c6472107 100644
--- a/forge-core/src/main/java/forge/deck/generation/DeckGenPool.java
+++ b/forge-core/src/main/java/forge/deck/generation/DeckGenPool.java
@@ -11,7 +11,7 @@ import forge.item.IPaperCard;
 import forge.item.PaperCard;
 
 public class DeckGenPool implements IDeckGenPool {
-    private final Map<String, PaperCard> cards = new HashMap<String, PaperCard>();
+    private final Map<String, PaperCard> cards = new HashMap<>();
 
     public DeckGenPool() {
     }
diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java
index 050f1827e61..ec0b0c270ba 100644
--- a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java
+++ b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java
@@ -51,7 +51,7 @@ import java.util.regex.Pattern;
  */
 public abstract class DeckGeneratorBase {
     protected final DebugTrace trace = new DebugTrace();
-    protected final Map<String, Integer> cardCounts = new HashMap<String, Integer>();
+    protected final Map<String, Integer> cardCounts = new HashMap<>();
     protected int maxDuplicates = 4;
     protected boolean useArtifacts = true;
     protected String basicLandEdition = null;
@@ -299,7 +299,7 @@ public abstract class DeckGeneratorBase {
     protected static Map<String, Integer> countLands(ItemPool<PaperCard> outList) {
         // attempt to optimize basic land counts according
         // to color representation
-        Map<String, Integer> res = new TreeMap<String, Integer>();
+        Map<String, Integer> res = new TreeMap<>();
         // count each card color using mana costs
         // TODO: count hybrid mana differently?
         for (Entry<PaperCard, Integer> cpe : outList) {
@@ -418,7 +418,7 @@ public abstract class DeckGeneratorBase {
     }
 
     public List<String> regexLandSearch(String pattern, Iterable<PaperCard> landCards){
-        final List<String> dLands = new ArrayList<String>();
+        final List<String> dLands = new ArrayList<>();
         Pattern p = Pattern.compile(pattern);
         for (PaperCard card:landCards){
             if (card.getRules().getAiHints().getRemAIDecks()) {
diff --git a/forge-core/src/main/java/forge/deck/io/DeckFileHeader.java b/forge-core/src/main/java/forge/deck/io/DeckFileHeader.java
index 65a074e1cb7..43a7ffbd4a6 100644
--- a/forge-core/src/main/java/forge/deck/io/DeckFileHeader.java
+++ b/forge-core/src/main/java/forge/deck/io/DeckFileHeader.java
@@ -74,7 +74,7 @@ public class DeckFileHeader {
         this.deckType = DeckFormat.smartValueOf(kvPairs.get(DeckFileHeader.DECK_TYPE), DeckFormat.Constructed);
         this.customPool = kvPairs.getBoolean(DeckFileHeader.CSTM_POOL);
         this.intendedForAi = "computer".equalsIgnoreCase(kvPairs.get(DeckFileHeader.PLAYER)) || "ai".equalsIgnoreCase(kvPairs.get(DeckFileHeader.PLAYER_TYPE));
-        this.tags = new TreeSet<String>();
+        this.tags = new TreeSet<>();
         
         String rawTags = kvPairs.get(DeckFileHeader.TAGS);
         if( StringUtils.isNotBlank(rawTags) ) {
diff --git a/forge-core/src/main/java/forge/deck/io/DeckSerializer.java b/forge-core/src/main/java/forge/deck/io/DeckSerializer.java
index 1b50211c8cf..8b59c4e8dd2 100644
--- a/forge-core/src/main/java/forge/deck/io/DeckSerializer.java
+++ b/forge-core/src/main/java/forge/deck/io/DeckSerializer.java
@@ -41,7 +41,7 @@ public class DeckSerializer {
     }
 
     private static List<String> serializeDeck(Deck d) {
-        final List<String> out = new ArrayList<String>();
+        final List<String> out = new ArrayList<>();
         out.add(TextUtil.enclosedBracket("metadata"));
     
         out.add(TextUtil.concatNoSpace(DeckFileHeader.NAME,"=", d.getName().replaceAll("\n", "")));
diff --git a/forge-core/src/main/java/forge/item/BoosterBox.java b/forge-core/src/main/java/forge/item/BoosterBox.java
index b26824e498e..8b3c5e93f51 100644
--- a/forge-core/src/main/java/forge/item/BoosterBox.java
+++ b/forge-core/src/main/java/forge/item/BoosterBox.java
@@ -93,7 +93,7 @@ public class BoosterBox extends BoxedProduct {
                 final String[] data = TextUtil.splitWithParenthesis(headAndData[1], ',');
                 int nBoosters = 6;
 
-                List<Pair<String, Integer>> slots = new ArrayList<Pair<String,Integer>>();
+                List<Pair<String, Integer>> slots = new ArrayList<>();
                 for(String slotDesc : data) {
                     String[] kv = TextUtil.split(slotDesc, ' ', 2);
                     if (kv[1].startsWith("Booster"))
diff --git a/forge-core/src/main/java/forge/item/BoxedProduct.java b/forge-core/src/main/java/forge/item/BoxedProduct.java
index a73ee07f1e1..6bfdc48b438 100644
--- a/forge-core/src/main/java/forge/item/BoxedProduct.java
+++ b/forge-core/src/main/java/forge/item/BoxedProduct.java
@@ -44,7 +44,7 @@ public abstract class BoxedProduct extends SealedProduct {
     }
     
     public List<PaperCard> getExtraCards() {
-    	return new ArrayList<PaperCard>();
+    	return new ArrayList<>();
     }
     
     @Override
diff --git a/forge-core/src/main/java/forge/item/FatPack.java b/forge-core/src/main/java/forge/item/FatPack.java
index c45414c17bd..b57870b93a3 100644
--- a/forge-core/src/main/java/forge/item/FatPack.java
+++ b/forge-core/src/main/java/forge/item/FatPack.java
@@ -111,7 +111,7 @@ public class FatPack extends BoxedProduct {
                 final String[] data = TextUtil.splitWithParenthesis(headAndData[1], ',');
                 int nBoosters = 6;
 
-                List<Pair<String, Integer>> slots = new ArrayList<Pair<String,Integer>>();
+                List<Pair<String, Integer>> slots = new ArrayList<>();
                 for(String slotDesc : data) {
                     String[] kv = TextUtil.split(slotDesc, ' ', 2);
                     if (kv[1].startsWith("Booster"))
diff --git a/forge-core/src/main/java/forge/util/Aggregates.java b/forge-core/src/main/java/forge/util/Aggregates.java
index fb13b81400c..82fa8206d59 100644
--- a/forge-core/src/main/java/forge/util/Aggregates.java
+++ b/forge-core/src/main/java/forge/util/Aggregates.java
@@ -124,7 +124,7 @@ public class Aggregates {
     }
 
     public static final <T> List<T> random(final Iterable<T> source, final int count) {
-        return random(source, count, new ArrayList<T>());
+        return random(source, count, new ArrayList<>());
     }
     public static final <T, L extends List<T>> L random(final Iterable<T> source, final int count, final L list) {
         // Using Reservoir Sampling to grab X random values from source
@@ -163,7 +163,7 @@ public class Aggregates {
     }
 
     public static final <K, U> Iterable<U> uniqueByLast(final Iterable<U> source, final Function<U, K> fnUniqueKey) { // this might be exotic
-        final Map<K, U> uniques = new Hashtable<K, U>();
+        final Map<K, U> uniques = new Hashtable<>();
         for (final U c : source) {
              uniques.put(fnUniqueKey.apply(c), c);
         }
@@ -206,7 +206,7 @@ public class Aggregates {
     }
 
     public static <T, U> Iterable<Entry<U, Integer>> groupSumBy(Iterable<Entry<T, Integer>> source, Function<T, U> fnGetField) {
-        Map<U, Integer> result = new HashMap<U, Integer>();
+        Map<U, Integer> result = new HashMap<>();
         for (Entry<T, Integer> kv : source) {
             U k = fnGetField.apply(kv.getKey());
             Integer v = kv.getValue();
diff --git a/forge-core/src/main/java/forge/util/FileSection.java b/forge-core/src/main/java/forge/util/FileSection.java
index 1d67b4daeda..53a5f140d06 100644
--- a/forge-core/src/main/java/forge/util/FileSection.java
+++ b/forge-core/src/main/java/forge/util/FileSection.java
@@ -50,7 +50,7 @@ public class FileSection {
      * Instantiates a new file section.
      */
     protected FileSection() {
-        this(new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER));
+        this(new TreeMap<>(String.CASE_INSENSITIVE_ORDER));
     }
 
     protected FileSection(Map<String, String> lines0) {
@@ -71,7 +71,7 @@ public class FileSection {
     }
     
     public static Map<String, String> parseToMap(final String line, final String kvSeparator, final String pairSeparator) {
-        Map<String, String> result = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
+        Map<String, String> result = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
         if (!StringUtils.isEmpty(line)) {
             final String[] pairs = line.split(Pattern.quote(pairSeparator));
             final Pattern splitter = Pattern.compile(Pattern.quote(kvSeparator));
@@ -211,7 +211,7 @@ public class FileSection {
      */
     @SuppressWarnings("unchecked")
     public static Map<String, List<String>> parseSections(final List<String> source) {
-        final Map<String, List<String>> result = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+        final Map<String, List<String>> result = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
         String currentSection = "";
         List<String> currentList = null;
 
@@ -234,7 +234,7 @@ public class FileSection {
                 currentList = null;
             } else {
                 if (currentList == null) {
-                    currentList = new ArrayList<String>();
+                    currentList = new ArrayList<>();
                 }
                 currentList.add(st);
             }
diff --git a/forge-core/src/main/java/forge/util/FileUtil.java b/forge-core/src/main/java/forge/util/FileUtil.java
index 32eda08b4a2..212748744b1 100644
--- a/forge-core/src/main/java/forge/util/FileUtil.java
+++ b/forge-core/src/main/java/forge/util/FileUtil.java
@@ -196,7 +196,7 @@ public final class FileUtil {
     public static List<String> readFile(final File file) {
         try {
             if ((file == null) || !file.exists()) {
-                return new ArrayList<String>();
+                return new ArrayList<>();
             }
             return FileUtil.readAllLines(new FileReader(file), false);
         } catch (final Exception ex) {
@@ -222,7 +222,7 @@ public final class FileUtil {
      * @return list of strings
      */
     public static List<String> readAllLines(final Reader reader, final boolean mayTrim) {
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
         try {
             final BufferedReader in = new BufferedReader(reader);
             String line;
@@ -244,7 +244,7 @@ public final class FileUtil {
         Pattern lineSplitter = Pattern.compile(Pattern.quote(" "));
         Pattern replacer = Pattern.compile(Pattern.quote("%20"));
 
-        List<Pair<String, String>> list = new ArrayList<Pair<String, String>>();
+        List<Pair<String, String>> list = new ArrayList<>();
 
         for (String line : readFile(nameUrlFile)) {
             if (StringUtils.isBlank(line) || line.startsWith("#")) {
@@ -271,7 +271,7 @@ public final class FileUtil {
     }
 
     public static List<String> readFile(final URL url) {
-        final List<String> lines = new ArrayList<String>();
+        final List<String> lines = new ArrayList<>();
         ThreadUtil.executeWithTimeout(new Callable<Void>() {
             @Override
             public Void call() throws Exception {
diff --git a/forge-core/src/main/java/forge/util/ItemPool.java b/forge-core/src/main/java/forge/util/ItemPool.java
index 64ea51fbf2d..ed778df28f9 100644
--- a/forge-core/src/main/java/forge/util/ItemPool.java
+++ b/forge-core/src/main/java/forge/util/ItemPool.java
@@ -60,12 +60,12 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
     };
 
     public ItemPool(final Class<T> cls) {
-        this(new LinkedHashMap<T, Integer>(), cls);
+        this(new LinkedHashMap<>(), cls);
     }
 
     @SuppressWarnings("unchecked")
     public static <Tin extends InventoryItem, Tout extends InventoryItem> ItemPool<Tout> createFrom(final ItemPool<Tin> from, final Class<Tout> clsHint) {
-        final ItemPool<Tout> result = new ItemPool<Tout>(clsHint);
+        final ItemPool<Tout> result = new ItemPool<>(clsHint);
         if (from != null) {
             for (final Entry<Tin, Integer> e : from) {
                 final Tin srcKey = e.getKey();
@@ -79,7 +79,7 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
 
     @SuppressWarnings("unchecked")
     public static <Tin extends InventoryItem, Tout extends InventoryItem> ItemPool<Tout> createFrom(final Iterable<Tin> from, final Class<Tout> clsHint) {
-        final ItemPool<Tout> result = new ItemPool<Tout>(clsHint);
+        final ItemPool<Tout> result = new ItemPool<>(clsHint);
         if (from != null) {
             for (final Tin srcKey : from) {
                 if (clsHint.isInstance(srcKey)) {
@@ -95,7 +95,7 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
             items = items0;
         }
         else {
-            items = new HashMap<T, Integer>(); //prevent items being null
+            items = new HashMap<>(); //prevent items being null
         }
         myClass = cls;
     }
@@ -161,7 +161,7 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
     }
 
     public final List<T> toFlatList() {
-        final List<T> result = new ArrayList<T>();
+        final List<T> result = new ArrayList<>();
         for (final Entry<T, Integer> e : this) {
             for (int i = 0; i < e.getValue(); i++) {
                 result.add(e.getKey());
@@ -171,7 +171,7 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
     }
 
     public Map<String, Integer> toNameLookup() {
-        final Map<String, Integer> result = new HashMap<String, Integer>();
+        final Map<String, Integer> result = new HashMap<>();
         for (final Entry<T, Integer> e : this) {
             result.put(e.getKey().getName(), e.getValue());
         }
@@ -183,7 +183,7 @@ public class ItemPool<T extends InventoryItem> implements Iterable<Entry<T, Inte
     }
 
     public ItemPool<T> getView() {
-        return new ItemPool<T>(Collections.unmodifiableMap(items), getMyClass());
+        return new ItemPool<>(Collections.unmodifiableMap(items), getMyClass());
     }
 
     public void add(final T item) {
diff --git a/forge-core/src/main/java/forge/util/ItemPoolSorter.java b/forge-core/src/main/java/forge/util/ItemPoolSorter.java
index 1010abdb655..0b44e775a38 100644
--- a/forge-core/src/main/java/forge/util/ItemPoolSorter.java
+++ b/forge-core/src/main/java/forge/util/ItemPoolSorter.java
@@ -56,7 +56,7 @@ public class ItemPoolSorter<T> implements Comparator<Entry<T, Integer>> {
     }
 
     /** The Constant byNameThenSet. */
-    public static final ItemPoolSorter<PaperCard> BY_NAME_THEN_SET = new ItemPoolSorter<PaperCard>(
+    public static final ItemPoolSorter<PaperCard> BY_NAME_THEN_SET = new ItemPoolSorter<>(
             new Function<Entry<PaperCard, Integer>, Comparable<?>>() {
                 @Override
                 public Comparable<?> apply(final Entry<PaperCard, Integer> from) {
diff --git a/forge-core/src/main/java/forge/util/NameGenerator.java b/forge-core/src/main/java/forge/util/NameGenerator.java
index 6e7512ed844..625bbbc669d 100644
--- a/forge-core/src/main/java/forge/util/NameGenerator.java
+++ b/forge-core/src/main/java/forge/util/NameGenerator.java
@@ -195,7 +195,7 @@ public final class NameGenerator {
 			"Coreshaker", "Forgewulf", "Sheepspear", "Elvenworm", "Lipswalker", "Sealight", "the Rotten"
 	};
 
-	private static List<String> usedMonikers = new ArrayList<String>();
+	private static List<String> usedMonikers = new ArrayList<>();
 	private static List<String> usedNames;
     private static String[] sourceList;
 
@@ -239,8 +239,8 @@ public final class NameGenerator {
         	break;
 
         default:
-        	List<String> all = new ArrayList<String>(
-        			genericMales.length + fantasyMales.length + genericFemales.length + fantasyFemales.length);
+        	List<String> all = new ArrayList<>(
+					genericMales.length + fantasyMales.length + genericFemales.length + fantasyFemales.length);
         	Collections.addAll(all, genericMales);
         	Collections.addAll(all, fantasyMales);
         	Collections.addAll(all, genericFemales);
@@ -272,7 +272,7 @@ public final class NameGenerator {
 	/** Generates a specified number of random names. */
 	public static List<String> getRandomNames(final int generateAmount, final List<String> excludeNames) {
 		usedNames = excludeNames;
-		final List<String> names = new ArrayList<String>(generateAmount);
+		final List<String> names = new ArrayList<>(generateAmount);
         for (int i = 0; i < generateAmount; i++) {
         	getRandomName("Any", "Any", usedNames);
         }
@@ -281,7 +281,7 @@ public final class NameGenerator {
 
 	/** Generates a single name that doesn't match any names in the supplied list. */
 	public static String getRandomName(final String gender, final String type, final String notNamed) {
-		List<String> exclude = new ArrayList<String>(1);
+		List<String> exclude = new ArrayList<>(1);
 		exclude.add(notNamed);
 		return getRandomName(gender, type, exclude);
 	}
diff --git a/forge-core/src/main/java/forge/util/TextUtil.java b/forge-core/src/main/java/forge/util/TextUtil.java
index badf6d2533a..afb2683158c 100644
--- a/forge-core/src/main/java/forge/util/TextUtil.java
+++ b/forge-core/src/main/java/forge/util/TextUtil.java
@@ -71,7 +71,7 @@ public class TextUtil {
      * It's faster than String.split, and allows parenthesis
      */
     public static String[] splitWithParenthesis(CharSequence input, char delimiter, int maxEntries, char openPar, char closePar, boolean skipEmpty) {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         // Assume that when equal non-zero parenthesis are passed, they need to be discarded
         boolean trimParenthesis = openPar == closePar && openPar > 0;
         int nPar = 0;
diff --git a/forge-core/src/main/java/forge/util/collect/FCollection.java b/forge-core/src/main/java/forge/util/collect/FCollection.java
index 7e8fef286fd..1438b4f802c 100644
--- a/forge-core/src/main/java/forge/util/collect/FCollection.java
+++ b/forge-core/src/main/java/forge/util/collect/FCollection.java
@@ -31,7 +31,7 @@ import java.util.Set;
 public class FCollection<T> implements List<T>, /*Set<T>,*/ FCollectionView<T>, Cloneable, Serializable {
     private static final long serialVersionUID = -1664555336364294106L;
 
-    private static final FCollection<?> EMPTY = new EmptyFCollection<Object>();
+    private static final FCollection<?> EMPTY = new EmptyFCollection<>();
 
     @SuppressWarnings("unchecked")
     public static <T> FCollection<T> getEmpty() {
@@ -527,7 +527,7 @@ public class FCollection<T> implements List<T>, /*Set<T>,*/ FCollectionView<T>,
     @Override
     public Iterable<T> threadSafeIterable() {
         //create a new linked list for iterating to make it thread safe and avoid concurrent modification exceptions
-        return Iterables.unmodifiableIterable(new LinkedList<T>(list));
+        return Iterables.unmodifiableIterable(new LinkedList<>(list));
     }
 
     @Override
diff --git a/forge-core/src/main/java/forge/util/maps/LinkedHashMapToAmount.java b/forge-core/src/main/java/forge/util/maps/LinkedHashMapToAmount.java
index 360707b5236..d26165ecda1 100644
--- a/forge-core/src/main/java/forge/util/maps/LinkedHashMapToAmount.java
+++ b/forge-core/src/main/java/forge/util/maps/LinkedHashMapToAmount.java
@@ -6,7 +6,7 @@ public class LinkedHashMapToAmount<T> extends LinkedHashMap<T, Integer> implemen
     private static final long serialVersionUID = 1438913784333297606L;
 
     public static <T> LinkedHashMapToAmount<T> emptyMap() {
-        return new LinkedHashMapToAmount<T>(0);
+        return new LinkedHashMapToAmount<>(0);
     }
 
     /**
diff --git a/forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java b/forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java
index d793eded1a3..a0434aeab79 100644
--- a/forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java
+++ b/forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java
@@ -59,11 +59,11 @@ public final class MapToAmountUtil {
             throw new NullPointerException();
         }
         if (map.isEmpty()) {
-            return new FCollection<T>();
+            return new FCollection<>();
         }
 
         final int max = Collections.max(map.values());
-        final FCollection<T> set = new FCollection<T>();
+        final FCollection<T> set = new FCollection<>();
         for (final Entry<T, Integer> entry : map.entrySet()) {
             if (entry.getValue().intValue() == max) {
                 set.add(entry.getKey());
@@ -114,11 +114,11 @@ public final class MapToAmountUtil {
             throw new NullPointerException();
         }
         if (map.isEmpty()) {
-            return new FCollection<T>();
+            return new FCollection<>();
         }
 
         final int min = Collections.min(map.values());
-        final FCollection<T> set = new FCollection<T>();
+        final FCollection<T> set = new FCollection<>();
         for (final Entry<T, Integer> entry : map.entrySet()) {
             if (entry.getValue().intValue() == min) {
                 set.add(entry.getKey());
diff --git a/forge-core/src/main/java/forge/util/storage/StorageBase.java b/forge-core/src/main/java/forge/util/storage/StorageBase.java
index 2c0c959fe20..b3ce9fad954 100644
--- a/forge-core/src/main/java/forge/util/storage/StorageBase.java
+++ b/forge-core/src/main/java/forge/util/storage/StorageBase.java
@@ -35,7 +35,7 @@ import java.util.*;
 public class StorageBase<T> implements IStorage<T> {
     protected final Map<String, T> map;
 
-    public final static StorageBase<?> emptyMap = new StorageBase<Object>("Empty", null, new HashMap<String, Object>());
+    public final static StorageBase<?> emptyMap = new StorageBase<>("Empty", null, new HashMap<>());
     public final String name, fullPath;
 
     public StorageBase(final String name0, final IItemReader<T> io) {
@@ -55,7 +55,7 @@ public class StorageBase<T> implements IStorage<T> {
 
     @Override
     public final Collection<String> getItemNames() {
-        return new ArrayList<String>(map.keySet());
+        return new ArrayList<>(map.keySet());
     }
 
     @Override
diff --git a/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java b/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java
index 52a54c56d5d..e68658cbece 100644
--- a/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java
+++ b/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java
@@ -39,7 +39,7 @@ public class StorageImmediatelySerialized<T> extends StorageBase<T> {
     private final Function<File, IStorage<T>> nestedFactory = new Function<File, IStorage<T>>() {
         @Override
         public IStorage<T> apply(File file) {
-            return new StorageImmediatelySerialized<T>(file.getName(), (IItemSerializer<T>) serializer.getReaderForFolder(file), true);
+            return new StorageImmediatelySerialized<>(file.getName(), (IItemSerializer<T>) serializer.getReaderForFolder(file), true);
         }
     };
 
@@ -57,7 +57,7 @@ public class StorageImmediatelySerialized<T> extends StorageBase<T> {
     public StorageImmediatelySerialized(String name, final IItemSerializer<T> io, boolean withSubFolders) {
         super(name, io);
         this.serializer = io;
-        subfolders = withSubFolders ? new StorageNestedFolders<T>(io.getDirectory(), io.getSubFolders(), nestedFactory) : null;
+        subfolders = withSubFolders ? new StorageNestedFolders<>(io.getDirectory(), io.getSubFolders(), nestedFactory) : null;
     }
 
     /*
diff --git a/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java b/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java
index 269338e77f9..ddd83d49c1d 100644
--- a/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java
+++ b/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java
@@ -9,7 +9,7 @@ public class StorageNestedFolders<T> extends StorageBase<IStorage<T>> {
     private final File thisFolder;
 
     public StorageNestedFolders(File thisFolder, Iterable<File> subfolders, Function<File, IStorage<T>> factory) {
-        super("<Subfolders>", thisFolder.getPath(), new HashMap<String, IStorage<T>>());
+        super("<Subfolders>", thisFolder.getPath(), new HashMap<>());
         this.thisFolder = thisFolder;
         for (File sf : subfolders) {
             IStorage<T> newUnit = factory.apply(sf);
diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderFile.java b/forge-core/src/main/java/forge/util/storage/StorageReaderFile.java
index 01b5f3f735f..61cb21c73a9 100644
--- a/forge-core/src/main/java/forge/util/storage/StorageReaderFile.java
+++ b/forge-core/src/main/java/forge/util/storage/StorageReaderFile.java
@@ -52,7 +52,7 @@ public abstract class StorageReaderFile<T> extends StorageReaderBase<T> {
 
     @Override
     public Map<String, T> readAll() {
-        final Map<String, T> result = new TreeMap<String, T>();
+        final Map<String, T> result = new TreeMap<>();
 
         int idx = 0;
         for (String line : FileUtil.readFile(file)) {
diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java b/forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java
index eb599f579d5..c3c2773ad9f 100644
--- a/forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java
+++ b/forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java
@@ -53,7 +53,7 @@ public abstract class StorageReaderFileSections<T> extends StorageReaderBase<T>
     }
 
     protected Map<String, T> createMap() {
-        return new TreeMap<String, T>();
+        return new TreeMap<>();
     }
 
     /* (non-Javadoc)
@@ -66,7 +66,7 @@ public abstract class StorageReaderFileSections<T> extends StorageReaderBase<T>
         int idx = 0;
         Iterable<String> contents = FileUtil.readFile(file);
 
-        List<String> accumulator = new ArrayList<String>();
+        List<String> accumulator = new ArrayList<>();
         String header = null;
 
         for (final String s : contents) {
diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java b/forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java
index f7c35bacbbb..2fa2ea9fa63 100644
--- a/forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java
+++ b/forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java
@@ -75,14 +75,14 @@ public abstract class StorageReaderFolder<T> extends StorageReaderBase<T> {
         }
     }
 
-    public final List<String> objectsThatFailedToLoad = new ArrayList<String>();
+    public final List<String> objectsThatFailedToLoad = new ArrayList<>();
 
     /* (non-Javadoc)
      * @see forge.util.IItemReader#readAll()
      */
     @Override
     public Map<String, T> readAll() {
-        final Map<String, T> result = new TreeMap<String, T>();
+        final Map<String, T> result = new TreeMap<>();
 
         final File[] files = this.directory.listFiles(this.getFileFilter());
         for (final File file : files) {
diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderRecursiveFolderWithUserFolder.java b/forge-core/src/main/java/forge/util/storage/StorageReaderRecursiveFolderWithUserFolder.java
index fba09b57f74..5b81bfa5f2b 100644
--- a/forge-core/src/main/java/forge/util/storage/StorageReaderRecursiveFolderWithUserFolder.java
+++ b/forge-core/src/main/java/forge/util/storage/StorageReaderRecursiveFolderWithUserFolder.java
@@ -77,14 +77,14 @@ public abstract class StorageReaderRecursiveFolderWithUserFolder<T> extends Stor
         }
     }
 
-    public final List<String> objectsThatFailedToLoad = new ArrayList<String>();
+    public final List<String> objectsThatFailedToLoad = new ArrayList<>();
 
     /* (non-Javadoc)
      * @see forge.util.IItemReader#readAll()
      */
     @Override
     public Map<String, T> readAll() {
-        final Map<String, T> result = new TreeMap<String, T>();
+        final Map<String, T> result = new TreeMap<>();
 
         Collection<File> forgeFormats = listFileTree(directory);
         Collection<File> customFormats = listFileTree(userDirectory);
@@ -115,7 +115,7 @@ public abstract class StorageReaderRecursiveFolderWithUserFolder<T> extends Stor
     }
 
     private Collection<File> listFileTree(File dir) {
-        Set<File> fileTree = new HashSet<File>();
+        Set<File> fileTree = new HashSet<>();
         if(dir==null||dir.listFiles(getFileFilter())==null){
             return fileTree;
         }
diff --git a/forge-game/src/main/java/forge/game/Game.java b/forge-game/src/main/java/forge/game/Game.java
index da8d612fed7..6f2d66ffc95 100644
--- a/forge-game/src/main/java/forge/game/Game.java
+++ b/forge-game/src/main/java/forge/game/Game.java
@@ -713,7 +713,7 @@ public class Game {
         ingamePlayers.remove(p);
         lostPlayers.add(p);
 
-        final Map<String, Object> runParams = new TreeMap<String, Object>();
+        final Map<String, Object> runParams = new TreeMap<>();
         runParams.put("Player", p);
         getTriggerHandler().runTrigger(TriggerType.LosesGame, runParams, false);
     }
diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index 89c790b3374..3346938c8fe 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -787,7 +787,7 @@ public class GameAction {
         }
 
         // search for cards with static abilities
-        final FCollection<StaticAbility> staticAbilities = new FCollection<StaticAbility>();
+        final FCollection<StaticAbility> staticAbilities = new FCollection<>();
         final CardCollection staticList = new CardCollection();
 
         game.forEachCardInGame(new Visitor<Card>() {
@@ -880,6 +880,10 @@ public class GameAction {
             c.getStaticCommandList().removeAll(toRemove);
         }
         // Exclude cards in hidden zones from update
+        /*
+         * Refactoring this code to affectedCards.removeIf((Card c) -> c.isInZone(ZoneType.Library));
+         * causes Android build not to compile
+         * */
         Iterator<Card> it = affectedCards.iterator();
         while (it.hasNext()) {
             Card c = it.next();
diff --git a/forge-game/src/main/java/forge/game/GameEntityCache.java b/forge-game/src/main/java/forge/game/GameEntityCache.java
index f61505bbf69..b5532f2bf96 100644
--- a/forge-game/src/main/java/forge/game/GameEntityCache.java
+++ b/forge-game/src/main/java/forge/game/GameEntityCache.java
@@ -8,7 +8,7 @@ import java.util.List;
 import forge.trackable.TrackableObject;
 
 public class GameEntityCache<Entity extends IIdentifiable, View extends TrackableObject> {
-    private HashMap<Integer, Entity> entityCache = new HashMap<Integer, Entity>();
+    private HashMap<Integer, Entity> entityCache = new HashMap<>();
  
     public void put(Integer id, Entity entity) {
         entityCache.put(id, entity);
@@ -33,7 +33,7 @@ public class GameEntityCache<Entity extends IIdentifiable, View extends Trackabl
     }
 
     public List<Entity> getList(Iterable<View> views) {
-        List<Entity> list = new ArrayList<Entity>();
+        List<Entity> list = new ArrayList<>();
         addToList(views, list);
         return list;
     }
diff --git a/forge-game/src/main/java/forge/game/GameEntityView.java b/forge-game/src/main/java/forge/game/GameEntityView.java
index 0e769a8cf56..0349b4c8e54 100644
--- a/forge-game/src/main/java/forge/game/GameEntityView.java
+++ b/forge-game/src/main/java/forge/game/GameEntityView.java
@@ -17,7 +17,7 @@ public abstract class GameEntityView extends TrackableObject {
         if (entities == null) {
             return null;
         }
-        TrackableCollection<GameEntityView> collection = new TrackableCollection<GameEntityView>();
+        TrackableCollection<GameEntityView> collection = new TrackableCollection<>();
         for (GameEntity e : entities) {
             collection.add(e.getView());
         }
diff --git a/forge-game/src/main/java/forge/game/GameFormat.java b/forge-game/src/main/java/forge/game/GameFormat.java
index d0a6f0ce29a..5afed3b31b3 100644
--- a/forge-game/src/main/java/forge/game/GameFormat.java
+++ b/forge-game/src/main/java/forge/game/GameFormat.java
@@ -101,14 +101,14 @@ public class GameFormat implements Comparable<GameFormat> {
             }
             allowedSetCodes = Lists.newArrayList(parsedSets);
         }else{
-            allowedSetCodes = new ArrayList<String>();
+            allowedSetCodes = new ArrayList<>();
         }
 
-        bannedCardNames = bannedCards == null ? new ArrayList<String>() : Lists.newArrayList(bannedCards);
-        restrictedCardNames = restrictedCards == null ? new ArrayList<String>() : Lists.newArrayList(restrictedCards);
-        allowedRarities = rarities == null ? new ArrayList<CardRarity>() : rarities;
+        bannedCardNames = bannedCards == null ? new ArrayList<>() : Lists.newArrayList(bannedCards);
+        restrictedCardNames = restrictedCards == null ? new ArrayList<>() : Lists.newArrayList(restrictedCards);
+        allowedRarities = rarities == null ? new ArrayList<>() : rarities;
         this.restrictedLegendary = restrictedLegendary;
-        additionalCardNames = additionalCards == null ? new ArrayList<String>() : Lists.newArrayList(additionalCards);
+        additionalCardNames = additionalCards == null ? new ArrayList<>() : Lists.newArrayList(additionalCards);
 
         this.allowedSetCodes_ro = Collections.unmodifiableList(allowedSetCodes);
         this.bannedCardNames_ro = Collections.unmodifiableList(bannedCardNames);
@@ -195,7 +195,7 @@ public class GameFormat implements Comparable<GameFormat> {
     }
 
     public List<PaperCard> getAllCards() {
-        List<PaperCard> cards = new ArrayList<PaperCard>();
+        List<PaperCard> cards = new ArrayList<>();
         CardDb commonCards = StaticData.instance().getCommonCards();
         for (String setCode : allowedSetCodes_ro) {
             CardEdition edition = StaticData.instance().getEditions().get(setCode);
@@ -285,7 +285,7 @@ public class GameFormat implements Comparable<GameFormat> {
     }
 
     public static class Reader extends StorageReaderRecursiveFolderWithUserFolder<GameFormat> {
-        List<GameFormat> naturallyOrdered = new ArrayList<GameFormat>();
+        List<GameFormat> naturallyOrdered = new ArrayList<>();
         boolean includeHistoric;
         private List<String> coreFormats = new ArrayList<>();
         {
@@ -484,7 +484,7 @@ public class GameFormat implements Comparable<GameFormat> {
         }
 
         public Set<GameFormat> getAllFormatsOfCard(PaperCard card) {
-            Set<GameFormat> result = new HashSet<GameFormat>();
+            Set<GameFormat> result = new HashSet<>();
             for (GameFormat gf : naturallyOrdered) {
                 if (gf.getFilterRules().apply(card)) {
                     result.add(gf);
@@ -501,7 +501,7 @@ public class GameFormat implements Comparable<GameFormat> {
         }
 
         public Set<GameFormat> getAllFormatsOfDeck(Deck deck, Boolean exhaustive) {
-            SortedSet<GameFormat> result = new TreeSet<GameFormat>();
+            SortedSet<GameFormat> result = new TreeSet<>();
             Set<FormatSubType> coveredTypes = new HashSet<>();
             CardPool allCards = deck.getAllCardsInASinglePool();
             for(GameFormat gf : reverseDateOrdered) {
diff --git a/forge-game/src/main/java/forge/game/GameLog.java b/forge-game/src/main/java/forge/game/GameLog.java
index 979e2880330..8fca317132b 100644
--- a/forge-game/src/main/java/forge/game/GameLog.java
+++ b/forge-game/src/main/java/forge/game/GameLog.java
@@ -34,7 +34,7 @@ import java.util.Observable;
 public class GameLog extends Observable implements Serializable {
     private static final long serialVersionUID = 6465283802022948827L;
 
-    private final List<GameLogEntry> log = new ArrayList<GameLogEntry>();
+    private final List<GameLogEntry> log = new ArrayList<>();
 
     private final transient GameLogFormatter formatter = new GameLogFormatter(this);
     
@@ -70,7 +70,7 @@ public class GameLog extends Observable implements Serializable {
      * @return the log text
      */
     public List<GameLogEntry> getLogEntries(final GameLogEntryType logLevel) { // null to fetch all
-        final List<GameLogEntry> result = new ArrayList<GameLogEntry>();
+        final List<GameLogEntry> result = new ArrayList<>();
     
         for (int i = log.size() - 1; i >= 0; i--) {
             GameLogEntry le = log.get(i);
@@ -82,7 +82,7 @@ public class GameLog extends Observable implements Serializable {
     }
 
     public List<GameLogEntry> getLogEntriesExact(final GameLogEntryType logLevel) { // null to fetch all
-        final List<GameLogEntry> result = new ArrayList<GameLogEntry>();
+        final List<GameLogEntry> result = new ArrayList<>();
     
         for (int i = log.size() - 1; i >= 0; i--) {
             GameLogEntry le = log.get(i);
diff --git a/forge-game/src/main/java/forge/game/GameLogFormatter.java b/forge-game/src/main/java/forge/game/GameLogFormatter.java
index dbaa656ff5e..520d39d33f4 100644
--- a/forge-game/src/main/java/forge/game/GameLogFormatter.java
+++ b/forge-game/src/main/java/forge/game/GameLogFormatter.java
@@ -130,7 +130,7 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
     private static GameLogEntry generateSummary(final List<GameOutcome> gamesPlayed) {
         final GameOutcome outcome1 = gamesPlayed.get(0);
         final HashMap<RegisteredPlayer, String> players = outcome1.getPlayerNames();
-        final HashMap<RegisteredPlayer, Integer> winCount = new HashMap<RegisteredPlayer, Integer>();
+        final HashMap<RegisteredPlayer, Integer> winCount = new HashMap<>();
 
         // Calculate total games each player has won.
         for (final GameOutcome game : gamesPlayed) {
diff --git a/forge-game/src/main/java/forge/game/GameObjectMap.java b/forge-game/src/main/java/forge/game/GameObjectMap.java
index f94953a0462..b98c8d790fe 100644
--- a/forge-game/src/main/java/forge/game/GameObjectMap.java
+++ b/forge-game/src/main/java/forge/game/GameObjectMap.java
@@ -36,7 +36,7 @@ public abstract class GameObjectMap {
 
     @SuppressWarnings("unchecked")
     public <T extends GameObject> List<T> mapList(final List<T> objects) {
-        final List<T> result = new ArrayList<T>();
+        final List<T> result = new ArrayList<>();
         for (final T o : objects) {
             result.add((T) map(o));
         }
diff --git a/forge-game/src/main/java/forge/game/Match.java b/forge-game/src/main/java/forge/game/Match.java
index c716709122b..d5ad5316568 100644
--- a/forge-game/src/main/java/forge/game/Match.java
+++ b/forge-game/src/main/java/forge/game/Match.java
@@ -28,7 +28,7 @@ public class Match {
     private final GameRules rules;
     private final String title;
 
-    private final List<GameOutcome> gamesPlayed = new ArrayList<GameOutcome>();
+    private final List<GameOutcome> gamesPlayed = new ArrayList<>();
     private final List<GameOutcome> gamesPlayedRo;
 
     public Match(final GameRules rules0, final List<RegisteredPlayer> players0, final String title) {
@@ -171,7 +171,7 @@ public class Match {
 
     private static Set<PaperCard> getRemovedAnteCards(Deck toUse) {
         final String keywordToRemove = "Remove CARDNAME from your deck before playing if you're not playing for ante.";
-        Set<PaperCard> myRemovedAnteCards = new HashSet<PaperCard>();
+        Set<PaperCard> myRemovedAnteCards = new HashSet<>();
         for (Entry<DeckSection, CardPool> ds : toUse) {
             for (Entry<PaperCard, Integer> cp : ds.getValue()) {
                 if (Iterables.contains(cp.getKey().getRules().getMainPart().getKeywords(), keywordToRemove)) {
@@ -184,7 +184,7 @@ public class Match {
 
     private static void preparePlayerLibrary(Player player, final ZoneType zoneType, CardPool section, boolean canRandomFoil) {
         PlayerZone library = player.getZone(zoneType);
-        List<Card> newLibrary = new ArrayList<Card>();
+        List<Card> newLibrary = new ArrayList<>();
         for (final Entry<PaperCard, Integer> stackOfCards : section) {
             final PaperCard cp = stackOfCards.getKey();
             for (int i = 0; i < stackOfCards.getValue(); i++) {
@@ -304,7 +304,7 @@ public class Match {
         GameOutcome outcome = lastGame.getOutcome();
 
         // remove all the lost cards from owners' decks
-        List<PaperCard> losses = new ArrayList<PaperCard>();
+        List<PaperCard> losses = new ArrayList<>();
         int cntPlayers = players.size();
         int iWinner = -1;
         for (int i = 0; i < cntPlayers; i++) {
diff --git a/forge-game/src/main/java/forge/game/PlanarDice.java b/forge-game/src/main/java/forge/game/PlanarDice.java
index 34d826b3494..bdf3b292ed0 100644
--- a/forge-game/src/main/java/forge/game/PlanarDice.java
+++ b/forge-game/src/main/java/forge/game/PlanarDice.java
@@ -36,7 +36,7 @@ public enum PlanarDice {
             trigRes = Chaos;
         }
         
-        HashMap<String,Object> runParams = new HashMap<String,Object>();
+        HashMap<String,Object> runParams = new HashMap<>();
         runParams.put("Player", roller);
         runParams.put("Result", trigRes);
         roller.getGame().getTriggerHandler().runTrigger(TriggerType.PlanarDice, runParams,false);
diff --git a/forge-game/src/main/java/forge/game/StaticEffect.java b/forge-game/src/main/java/forge/game/StaticEffect.java
index 1d2d7b73151..31fe957de37 100644
--- a/forge-game/src/main/java/forge/game/StaticEffect.java
+++ b/forge-game/src/main/java/forge/game/StaticEffect.java
@@ -166,7 +166,7 @@ public class StaticEffect {
      */
     public final void addOriginalAbilities(final Card c, final SpellAbility sa) {
         if (!this.originalAbilities.containsKey(c)) {
-            final List<SpellAbility> list = new ArrayList<SpellAbility>();
+            final List<SpellAbility> list = new ArrayList<>();
             list.add(sa);
             this.originalAbilities.put(c, list);
         } else {
@@ -185,7 +185,7 @@ public class StaticEffect {
      *            a {@link java.util.List} object.
      */
     public final void addOriginalAbilities(final Card c, final List<SpellAbility> s) {
-        final List<SpellAbility> list = new ArrayList<SpellAbility>(s);
+        final List<SpellAbility> list = new ArrayList<>(s);
         if (!this.originalAbilities.containsKey(c)) {
             this.originalAbilities.put(c, list);
         } else {
@@ -204,7 +204,7 @@ public class StaticEffect {
      * @return a {@link java.util.List} object.
      */
     public final List<SpellAbility> getOriginalAbilities(final Card c) {
-        final List<SpellAbility> returnList = new ArrayList<SpellAbility>();
+        final List<SpellAbility> returnList = new ArrayList<>();
         if (this.originalAbilities.containsKey(c)) {
             returnList.addAll(this.originalAbilities.get(c));
         }
@@ -271,7 +271,7 @@ public class StaticEffect {
      */
     public final void addOriginalKeyword(final Card c, final String s) {
         if (!this.originalKeywords.containsKey(c)) {
-            final List<String> list = new ArrayList<String>();
+            final List<String> list = new ArrayList<>();
             list.add(s);
             this.originalKeywords.put(c, list);
         } else {
@@ -290,7 +290,7 @@ public class StaticEffect {
      *            a {@link List} object.
      */
     public final void addOriginalKeywords(final Card c, final List<String> s) {
-        final List<String> list = new ArrayList<String>(s);
+        final List<String> list = new ArrayList<>(s);
         if (!this.originalKeywords.containsKey(c)) {
             this.originalKeywords.put(c, list);
         } else {
@@ -309,7 +309,7 @@ public class StaticEffect {
      * @return a {@link List} object.
      */
     public final List<String> getOriginalKeywords(final Card c) {
-        final List<String> returnList = new ArrayList<String>();
+        final List<String> returnList = new ArrayList<>();
         if (this.originalKeywords.containsKey(c)) {
             returnList.addAll(this.originalKeywords.get(c));
         }
@@ -424,7 +424,7 @@ public class StaticEffect {
      */
     public final void addOriginalType(final Card c, final String s) {
         if (!this.originalTypes.containsKey(c)) {
-            final List<String> list = new ArrayList<String>();
+            final List<String> list = new ArrayList<>();
             list.add(s);
             this.originalTypes.put(c, list);
         } else {
@@ -443,7 +443,7 @@ public class StaticEffect {
      *            a {@link java.util.ArrayList} object.
      */
     public final void addOriginalTypes(final Card c, final List<String> s) {
-        final List<String> list = new ArrayList<String>(s);
+        final List<String> list = new ArrayList<>(s);
         if (!this.originalTypes.containsKey(c)) {
             this.originalTypes.put(c, list);
         } else {
@@ -462,7 +462,7 @@ public class StaticEffect {
      * @return a {@link java.util.ArrayList} object.
      */
     public final List<String> getOriginalTypes(final Card c) {
-        final List<String> returnList = new ArrayList<String>();
+        final List<String> returnList = new ArrayList<>();
         if (this.originalTypes.containsKey(c)) {
             returnList.addAll(this.originalTypes.get(c));
         }
@@ -505,7 +505,7 @@ public class StaticEffect {
      */
     public final void addType(final Card c, final String s) {
         if (!this.types.containsKey(c)) {
-            final List<String> list = new ArrayList<String>();
+            final List<String> list = new ArrayList<>();
             list.add(s);
             this.types.put(c, list);
         } else {
@@ -523,7 +523,7 @@ public class StaticEffect {
      * @return a {@link java.util.List} object.
      */
     public final List<String> getTypes(final Card c) {
-        final List<String> returnList = new ArrayList<String>();
+        final List<String> returnList = new ArrayList<>();
         if (this.types.containsKey(c)) {
             returnList.addAll(this.types.get(c));
         }
@@ -823,7 +823,7 @@ public class StaticEffect {
             if (colors.equals("ChosenColor")) {
                 addColors = CardUtil.getShortColorsString(getSource().getChosenColors());
             } else {
-                addColors = CardUtil.getShortColorsString(new ArrayList<String>(Arrays.asList(colors.split(" & "))));
+                addColors = CardUtil.getShortColorsString(new ArrayList<>(Arrays.asList(colors.split(" & "))));
             }
         }
 
@@ -832,7 +832,7 @@ public class StaticEffect {
             if (colors.equals("ChosenColor")) {
                 addColors = CardUtil.getShortColorsString(getSource().getChosenColors());
             } else {
-                addColors = CardUtil.getShortColorsString(new ArrayList<String>(Arrays.asList(colors.split(" & "))));
+                addColors = CardUtil.getShortColorsString(new ArrayList<>(Arrays.asList(colors.split(" & "))));
             }
         }
 
diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
index 399515f6755..e4cb884ad78 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -432,7 +432,7 @@ public class AbilityUtils {
             val = CardFactoryUtil.doXMath(AbilityUtils.calculateAmount(card, l[0], ability), m, card);
         } else if (calcX[0].startsWith("PlayerCount")) {
             final String hType = calcX[0].substring(11);
-            final FCollection<Player> players = new FCollection<Player>();
+            final FCollection<Player> players = new FCollection<>();
             if (hType.equals("Players") || hType.equals("")) {
                 players.addAll(game.getPlayers());
                 val = CardFactoryUtil.playerXCount(players, calcX[1], card);
@@ -577,7 +577,7 @@ public class AbilityUtils {
 
         // Player attribute counting
         if (calcX[0].startsWith("TargetedPlayer")) {
-            final List<Player> players = new ArrayList<Player>();
+            final List<Player> players = new ArrayList<>();
             final SpellAbility saTargeting = sa.getSATargetingPlayer();
             if (null != saTargeting) {
                 Iterables.addAll(players, saTargeting.getTargets().getTargetPlayers());
@@ -585,12 +585,12 @@ public class AbilityUtils {
             return CardFactoryUtil.playerXCount(players, calcX[1], card) * multiplier;
         }
         if (calcX[0].startsWith("ThisTargetedPlayer")) {
-            final List<Player> players = new ArrayList<Player>();
+            final List<Player> players = new ArrayList<>();
             Iterables.addAll(players, sa.getTargets().getTargetPlayers());
             return CardFactoryUtil.playerXCount(players, calcX[1], card) * multiplier;
         }
         if (calcX[0].startsWith("TargetedObjects")) {
-            final List<GameObject> objects = new ArrayList<GameObject>();
+            final List<GameObject> objects = new ArrayList<>();
             // Make list of all targeted objects starting with the root SpellAbility
             SpellAbility loopSA = sa.getRootAbility();
             while (loopSA != null) {
@@ -602,7 +602,7 @@ public class AbilityUtils {
             return CardFactoryUtil.objectXCount(objects, calcX[1], card) * multiplier;
         }
         if (calcX[0].startsWith("TargetedController")) {
-            final List<Player> players = new ArrayList<Player>();
+            final List<Player> players = new ArrayList<>();
             final CardCollection list = getDefinedCards(card, "Targeted", sa);
             final List<SpellAbility> sas = AbilityUtils.getDefinedSpellAbilities(card, "Targeted", sa);
 
@@ -641,7 +641,7 @@ public class AbilityUtils {
             if (calcX[0].startsWith("TriggeredPlayers")) {
                 key = "Triggered" + key.substring(16);
             }
-            final List<Player> players = new ArrayList<Player>();
+            final List<Player> players = new ArrayList<>();
             Iterables.addAll(players, getDefinedPlayers(card, key, sa));
             return CardFactoryUtil.playerXCount(players, calcX[1], card) * multiplier;
         }
@@ -751,7 +751,7 @@ public class AbilityUtils {
      * @return a {@link java.util.ArrayList} object.
      */
     public static FCollection<GameObject> getDefinedObjects(final Card card, final String def, final SpellAbility sa) {
-        final FCollection<GameObject> objects = new FCollection<GameObject>();
+        final FCollection<GameObject> objects = new FCollection<>();
         final String defined = (def == null) ? "Self" : def;
 
         objects.addAll(AbilityUtils.getDefinedPlayers(card, defined, sa));
@@ -1223,7 +1223,7 @@ public class AbilityUtils {
      */
     public static FCollection<SpellAbility> getDefinedSpellAbilities(final Card card, final String def,
             final SpellAbility sa) {
-        final FCollection<SpellAbility> sas = new FCollection<SpellAbility>();
+        final FCollection<SpellAbility> sas = new FCollection<>();
         final String defined = (def == null) ? "Self" : applyAbilityTextChangeEffects(def, sa); // default to Self
         final Game game = card.getGame();
 
@@ -1690,7 +1690,7 @@ public class AbilityUtils {
     }
 
     public static final List<SpellAbility> getBasicSpellsFromPlayEffect(final Card tgtCard, final Player controller) {
-        List<SpellAbility> sas = new ArrayList<SpellAbility>();
+        List<SpellAbility> sas = new ArrayList<>();
         for (SpellAbility s : tgtCard.getBasicSpells()) {
             final Spell newSA = (Spell) s.copy();
             newSA.setActivatingPlayer(controller);
diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
index a0d4e8b10b4..831141a7b0b 100644
--- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
@@ -186,7 +186,7 @@ public abstract class SpellAbilityEffect {
 
     private static FCollection<Player> getPlayers(final boolean definedFirst, final String definedParam, final SpellAbility sa) {
         final boolean useTargets = sa.usesTargeting() && (!definedFirst || !sa.hasParam(definedParam));
-        return useTargets ? new FCollection<Player>(sa.getTargets().getTargetPlayers()) 
+        return useTargets ? new FCollection<>(sa.getTargets().getTargetPlayers())
                 : AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam(definedParam), sa);
     }
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java
index 0f3219c7e55..623a727ed55 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java
@@ -71,17 +71,17 @@ public class AnimateAllEffect extends AnimateEffectBase {
             types.add(host.getChosenType());
         }
 
-        final List<String> keywords = new ArrayList<String>();
+        final List<String> keywords = new ArrayList<>();
         if (sa.hasParam("Keywords")) {
             keywords.addAll(Arrays.asList(sa.getParam("Keywords").split(" & ")));
         }
 
-        final List<String> removeKeywords = new ArrayList<String>();
+        final List<String> removeKeywords = new ArrayList<>();
         if (sa.hasParam("RemoveKeywords")) {
             removeKeywords.addAll(Arrays.asList(sa.getParam("RemoveKeywords").split(" & ")));
         }
 
-        final List<String> hiddenKeywords = new ArrayList<String>();
+        final List<String> hiddenKeywords = new ArrayList<>();
         if (sa.hasParam("HiddenKeywords")) {
             hiddenKeywords.addAll(Arrays.asList(sa.getParam("HiddenKeywords").split(" & ")));
         }
@@ -101,29 +101,29 @@ public class AnimateAllEffect extends AnimateEffectBase {
             if (colors.equals("ChosenColor")) {
                 tmpDesc = CardUtil.getShortColorsString(host.getChosenColors());
             } else {
-                tmpDesc = CardUtil.getShortColorsString(new ArrayList<String>(Arrays.asList(colors.split(","))));
+                tmpDesc = CardUtil.getShortColorsString(new ArrayList<>(Arrays.asList(colors.split(","))));
             }
         }
         final String finalDesc = tmpDesc;
 
         // abilities to add to the animated being
-        final List<String> abilities = new ArrayList<String>();
+        final List<String> abilities = new ArrayList<>();
         if (sa.hasParam("Abilities")) {
             abilities.addAll(Arrays.asList(sa.getParam("Abilities").split(",")));
         }
         // replacement effects to add to the animated being
-        final List<String> replacements = new ArrayList<String>();
+        final List<String> replacements = new ArrayList<>();
         if (sa.hasParam("Replacements")) {
             replacements.addAll(Arrays.asList(sa.getParam("Replacements").split(",")));
         }
         // triggers to add to the animated being
-        final List<String> triggers = new ArrayList<String>();
+        final List<String> triggers = new ArrayList<>();
         if (sa.hasParam("Triggers")) {
             triggers.addAll(Arrays.asList(sa.getParam("Triggers").split(",")));
         }
 
         // sVars to add to the animated being
-        final List<String> sVars = new ArrayList<String>();
+        final List<String> sVars = new ArrayList<>();
         if (sa.hasParam("sVars")) {
             sVars.addAll(Arrays.asList(sa.getParam("sVars").split(",")));
         }
@@ -154,7 +154,7 @@ public class AnimateAllEffect extends AnimateEffectBase {
                     keywords, removeKeywords, hiddenKeywords, timestamp);
 
             // give abilities
-            final List<SpellAbility> addedAbilities = new ArrayList<SpellAbility>();
+            final List<SpellAbility> addedAbilities = new ArrayList<>();
             if (abilities.size() > 0) {
                 for (final String s : abilities) {
                     final String actualAbility = host.getSVar(s);
@@ -165,7 +165,7 @@ public class AnimateAllEffect extends AnimateEffectBase {
             }
 
             // remove abilities
-            final List<SpellAbility> removedAbilities = new ArrayList<SpellAbility>();
+            final List<SpellAbility> removedAbilities = new ArrayList<>();
             if (sa.hasParam("OverwriteAbilities") || removeAll || removeIntrinsic) {
                 for (final SpellAbility ab : c.getSpellAbilities()) {
                     if (ab.isAbility()) {
@@ -178,7 +178,7 @@ public class AnimateAllEffect extends AnimateEffectBase {
                 }
             }
             // give replacement effects
-            final List<ReplacementEffect> addedReplacements = new ArrayList<ReplacementEffect>();
+            final List<ReplacementEffect> addedReplacements = new ArrayList<>();
             if (replacements.size() > 0) {
                 for (final String s : replacements) {
                     final String actualReplacement = host.getSVar(s);
@@ -187,7 +187,7 @@ public class AnimateAllEffect extends AnimateEffectBase {
                 }
             }
             // Grant triggers
-            final List<Trigger> addedTriggers = new ArrayList<Trigger>();
+            final List<Trigger> addedTriggers = new ArrayList<>();
             if (triggers.size() > 0) {
                 for (final String s : triggers) {
                     final String actualTrigger = host.getSVar(s);
@@ -197,7 +197,7 @@ public class AnimateAllEffect extends AnimateEffectBase {
             }
 
             // suppress triggers from the animated card
-            final List<Trigger> removedTriggers = new ArrayList<Trigger>();
+            final List<Trigger> removedTriggers = new ArrayList<>();
             if (sa.hasParam("OverwriteTriggers") || removeAll || removeIntrinsic) {
                 final FCollectionView<Trigger> triggersToRemove = c.getTriggers();
                 for (final Trigger trigger : triggersToRemove) {
@@ -210,7 +210,7 @@ public class AnimateAllEffect extends AnimateEffectBase {
             }
 
             // suppress static abilities from the animated card
-            final List<StaticAbility> removedStatics = new ArrayList<StaticAbility>();
+            final List<StaticAbility> removedStatics = new ArrayList<>();
             if (sa.hasParam("OverwriteStatics") || removeAll || removeIntrinsic) {
                 for (final StaticAbility stAb : c.getStaticAbilities()) {
                     if (removeIntrinsic && !stAb.isIntrinsic()) {
@@ -222,7 +222,7 @@ public class AnimateAllEffect extends AnimateEffectBase {
             }
 
             // suppress static abilities from the animated card
-            final List<ReplacementEffect> removedReplacements = new ArrayList<ReplacementEffect>();
+            final List<ReplacementEffect> removedReplacements = new ArrayList<>();
             if (sa.hasParam("OverwriteReplacements") || removeAll || removeIntrinsic) {
                 for (final ReplacementEffect re : c.getReplacementEffects()) {
                     if (removeIntrinsic && !re.isIntrinsic()) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java
index 44643d555d2..3e1b4f5e11d 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java
@@ -166,7 +166,7 @@ public class AttachEffect extends SpellAbilityEffect {
 
         Player p = source.getController();
         if (tgt.canTgtPlayer()) {
-            final FCollection<Player> players = new FCollection<Player>();
+            final FCollection<Player> players = new FCollection<>();
 
             for (Player player : game.getPlayers()) {
                 if (player.isValid(tgt.getValidTgts(), aura.getActivatingPlayer(), source, null)) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/BalanceEffect.java b/forge-game/src/main/java/forge/game/ability/effects/BalanceEffect.java
index 27821b41b89..311fd3ae2a0 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/BalanceEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/BalanceEffect.java
@@ -34,7 +34,7 @@ public class BalanceEffect extends SpellAbilityEffect {
         int min = Integer.MAX_VALUE;
         
         final FCollectionView<Player> players = game.getPlayersInTurnOrder();
-        final List<CardCollection> validCards = new ArrayList<CardCollection>(players.size());
+        final List<CardCollection> validCards = new ArrayList<>(players.size());
         
         for(int i = 0; i < players.size(); i++) {
             // Find the minimum of each Valid per player
diff --git a/forge-game/src/main/java/forge/game/ability/effects/BidLifeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/BidLifeEffect.java
index 0ea798f50e9..36026b174dc 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/BidLifeEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/BidLifeEffect.java
@@ -22,7 +22,7 @@ public class BidLifeEffect extends SpellAbilityEffect {
     public void resolve(SpellAbility sa) {
         final Card host = sa.getHostCard();
         final Player activator = sa.getActivatingPlayer();
-        final FCollection<Player> bidPlayers = new FCollection<Player>();
+        final FCollection<Player> bidPlayers = new FCollection<>();
         final int startBidding;
         if (sa.hasParam("StartBidding")) {
             String start = sa.getParam("StartBidding");
diff --git a/forge-game/src/main/java/forge/game/ability/effects/BlockEffect.java b/forge-game/src/main/java/forge/game/ability/effects/BlockEffect.java
index 5160b929da7..3ec32f0532e 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/BlockEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/BlockEffect.java
@@ -22,7 +22,7 @@ public class BlockEffect extends SpellAbilityEffect {
         final Game game = host.getGame();
         final Combat combat = game.getPhaseHandler().getCombat();
 
-        List<Card> attackers = new ArrayList<Card>();
+        List<Card> attackers = new ArrayList<>();
         if (sa.hasParam("DefinedAttacker")) {
             for (final Card attacker : AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("DefinedAttacker"), sa)) {
                 if (combat.isAttacking(attacker))
@@ -30,7 +30,7 @@ public class BlockEffect extends SpellAbilityEffect {
             }
         }
 
-        List<Card> blockers = new ArrayList<Card>();
+        List<Card> blockers = new ArrayList<>();
         if (sa.hasParam("DefinedBlocker")) {
             for (final Card blocker : AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("DefinedBlocker"), sa)) {
                 if (blocker.isCreature() && blocker.isInZone(ZoneType.Battlefield))
@@ -90,14 +90,14 @@ public class BlockEffect extends SpellAbilityEffect {
 
         // end standard pre-
 
-        List<String> attackers = new ArrayList<String>();
+        List<String> attackers = new ArrayList<>();
         if (sa.hasParam("DefinedAttacker")) {
             for (final Card attacker : AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("DefinedAttacker"), sa)) {
                 attackers.add(attacker.toString());
             }
         }
 
-        List<String> blockers = new ArrayList<String>();
+        List<String> blockers = new ArrayList<>();
         if (sa.hasParam("DefinedBlocker")) {
             for (final Card blocker : AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("DefinedBlocker"), sa)) {
                 blockers.add(blocker.toString());
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
index 8cbf3f0ba5b..8f8baaaaa00 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
@@ -641,7 +641,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
 
         // for things like Gaea's Blessing
         if (destination.equals(ZoneType.Library) && sa.hasParam("Shuffle") && "True".equals(sa.getParam("Shuffle"))) {
-            FCollection<Player> pl = new FCollection<Player>();
+            FCollection<Player> pl = new FCollection<>();
             // use defined controller. it does need to work even without Targets.
             if (sa.hasParam("TargetsWithDefinedController")) {
                 pl.addAll(AbilityUtils.getDefinedPlayers(hostCard, sa.getParam("TargetsWithDefinedController"), sa));
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java
index 7407314dff0..7b7a0f2740c 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java
@@ -34,7 +34,7 @@ public class ChooseColorEffect extends SpellAbilityEffect {
     public void resolve(SpellAbility sa) {
         final Card card = sa.getHostCard();
 
-        List<String> colorChoices = new ArrayList<String>(MagicColor.Constant.ONLY_COLORS);
+        List<String> colorChoices = new ArrayList<>(MagicColor.Constant.ONLY_COLORS);
         if (sa.hasParam("Choices")) {
             String[] restrictedChoices = sa.getParam("Choices").split(",");
             colorChoices = Arrays.asList(restrictedChoices);
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseDirectionEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseDirectionEffect.java
index b2bf0f36a9c..3c0dac6f8a1 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChooseDirectionEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseDirectionEffect.java
@@ -16,7 +16,7 @@ public class ChooseDirectionEffect extends SpellAbilityEffect {
     public void resolve(final SpellAbility sa) {
         final Card source = sa.getHostCard();
         final Game game = source.getGame();
-        final FCollection<Player> left = new FCollection<Player>(game.getPlayers());
+        final FCollection<Player> left = new FCollection<>(game.getPlayers());
         // TODO: We'd better set up turn order UI here
         final String info = "Left (clockwise): " + left + "\r\nRight (anticlockwise):" + Lists.reverse(left);
         sa.getActivatingPlayer().getController().notifyOfValue(sa, source, info);
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java
index 731cfcc5426..36ac0d24e5c 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java
@@ -29,9 +29,9 @@ public class ChooseTypeEffect extends SpellAbilityEffect {
     public void resolve(SpellAbility sa) {
         final Card card = sa.getHostCard();
         final String type = sa.getParam("Type");
-        final List<String> invalidTypes = sa.hasParam("InvalidTypes") ? Arrays.asList(sa.getParam("InvalidTypes").split(",")) : new ArrayList<String>();
+        final List<String> invalidTypes = sa.hasParam("InvalidTypes") ? Arrays.asList(sa.getParam("InvalidTypes").split(",")) : new ArrayList<>();
 
-        final List<String> validTypes = new ArrayList<String>();
+        final List<String> validTypes = new ArrayList<>();
         if (sa.hasParam("ValidTypes")) {
             validTypes.addAll(Arrays.asList(sa.getParam("ValidTypes").split(",")));
         }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java
index 930f2b28477..55d43b0c51e 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java
@@ -32,7 +32,7 @@ public class ClashEffect extends SpellAbilityEffect {
         final boolean victory = clashWithOpponent(sa);
 
         // Run triggers
-        final HashMap<String, Object> runParams = new HashMap<String, Object>();
+        final HashMap<String, Object> runParams = new HashMap<>();
         runParams.put("Player", sa.getHostCard().getController());
 
         if (victory) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java
index 5976bfe7173..0e2ea5a6ce6 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java
@@ -22,7 +22,7 @@ public class ControlExchangeEffect extends SpellAbilityEffect {
         Card object1 = null;
         Card object2 = null;
         final TargetRestrictions tgt = sa.getTargetRestrictions();
-        List<Card> tgts = tgt == null ? new ArrayList<Card>() : Lists.newArrayList(sa.getTargets().getTargetCards());
+        List<Card> tgts = tgt == null ? new ArrayList<>() : Lists.newArrayList(sa.getTargets().getTargetCards());
         if (tgts.size() > 0) {
             object1 = tgts.get(0);
         }
@@ -47,7 +47,7 @@ public class ControlExchangeEffect extends SpellAbilityEffect {
         Card object1 = null;
         Card object2 = null;
         final TargetRestrictions tgt = sa.getTargetRestrictions();
-        List<Card> tgts = tgt == null ? new ArrayList<Card>() : Lists.newArrayList(sa.getTargets().getTargetCards());
+        List<Card> tgts = tgt == null ? new ArrayList<>() : Lists.newArrayList(sa.getTargets().getTargetCards());
         if (tgts.size() > 0) {
             object1 = tgts.get(0);
         }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java
index fcb79639e2b..a1db15665f8 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java
@@ -78,7 +78,7 @@ public class CopySpellAbilityEffect extends SpellAbilityEffect {
         }
 
         boolean mayChooseNewTargets = true;
-        List<SpellAbility> copies = new ArrayList<SpellAbility>();
+        List<SpellAbility> copies = new ArrayList<>();
         
         if (sa.hasParam("CopyMultipleSpells")) {
             final int spellCount = Integer.parseInt(sa.getParam("CopyMultipleSpells"));
diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffect.java
index 4c35db52d4d..fb2df2a405a 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffect.java
@@ -69,7 +69,7 @@ public class DamagePreventEffect extends SpellAbilityEffect {
         int numDam = AbilityUtils.calculateAmount(host, sa.getParam("Amount"), sa);
 
         final List<GameObject> tgts = getTargets(sa);
-        final List<Card> untargetedCards = new ArrayList<Card>();
+        final List<Card> untargetedCards = new ArrayList<>();
         
         if (sa.hasParam("Radiance") && (sa.usesTargeting())) {
             Card origin = null;
@@ -96,12 +96,12 @@ public class DamagePreventEffect extends SpellAbilityEffect {
                 final Card c = (Card) o;
                 if (c.isInPlay() && (!targeted || c.canBeTargetedBy(sa))) {
                     if (preventionWithEffect) {
-                        Map<String, String> effectMap = new TreeMap<String, String>();
+                        Map<String, String> effectMap = new TreeMap<>();
                         effectMap.put("EffectString", sa.getSVar(sa.getParam("PreventionSubAbility")));
                         effectMap.put("ShieldAmount", String.valueOf(numDam));
                         if (sa.hasParam("ShieldEffectTarget")) {
                             String effTgtString = "";
-                            List<GameObject> effTgts = new ArrayList<GameObject>();
+                            List<GameObject> effTgts = new ArrayList<>();
                             effTgts = AbilityUtils.getDefinedObjects(host, sa.getParam("ShieldEffectTarget"), sa);
                             for (final Object effTgt : effTgts) {
                                 if (effTgt instanceof Card) {
@@ -123,12 +123,12 @@ public class DamagePreventEffect extends SpellAbilityEffect {
                 final Player p = (Player) o;
                 if (!targeted || p.canBeTargetedBy(sa)) {
                     if (preventionWithEffect) {
-                        Map<String, String> effectMap = new TreeMap<String, String>();
+                        Map<String, String> effectMap = new TreeMap<>();
                         effectMap.put("EffectString", sa.getSVar(sa.getParam("PreventionSubAbility")));
                         effectMap.put("ShieldAmount", String.valueOf(numDam));
                         if (sa.hasParam("ShieldEffectTarget")) {
                             String effTgtString = "";
-                            List<GameObject> effTgts = new ArrayList<GameObject>();
+                            List<GameObject> effTgts = new ArrayList<>();
                             effTgts = AbilityUtils.getDefinedObjects(host, sa.getParam("ShieldEffectTarget"), sa);
                             for (final Object effTgt : effTgts) {
                                 if (effTgt instanceof Card) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
index f3e66bad91b..7c654e8689d 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
@@ -264,7 +264,7 @@ public class DigEffect extends SpellAbilityEffect {
                             if ( p == chooser ) { // the digger can still see all the dug cards when choosing
                                 chooser.getController().tempShowCards(top);
                             }
-                            List<Card> chosen = new ArrayList<Card>();
+                            List<Card> chosen = new ArrayList<>();
 
                             int max = anyNumber ? valid.size() : Math.min(valid.size(),destZone1ChangeNum);
                             int min = (anyNumber || optional) ? 0 : max;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
index ac5bd969092..4218d8897f7 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
@@ -108,7 +108,7 @@ public class DiscardEffect extends SpellAbilityEffect {
         final Game game = source.getGame();
         //final boolean anyNumber = sa.hasParam("AnyNumber");
 
-        final List<Card> discarded = new ArrayList<Card>();
+        final List<Card> discarded = new ArrayList<>();
         final List<Player> targets = getTargetPlayers(sa),
                 discarders;
         Player firstTarget = null;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/DrainManaEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DrainManaEffect.java
index 20353da8342..873a8fab135 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DrainManaEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DrainManaEffect.java
@@ -27,7 +27,7 @@ public class DrainManaEffect extends SpellAbilityEffect {
     @Override
     public void resolve(SpellAbility sa) {
         final TargetRestrictions tgt = sa.getTargetRestrictions();
-        List<Mana> drained = new ArrayList<Mana>();
+        List<Mana> drained = new ArrayList<>();
 
         for (final Player p : getTargetPlayers(sa)) {
             if ((tgt == null) || p.canBeTargetedBy(sa)) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/LifeSetEffect.java b/forge-game/src/main/java/forge/game/ability/effects/LifeSetEffect.java
index 984f76b5ab4..5224b7792a6 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/LifeSetEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/LifeSetEffect.java
@@ -19,7 +19,7 @@ public class LifeSetEffect extends SpellAbilityEffect {
         final boolean redistribute = sa.hasParam("Redistribute");
         final int lifeAmount = redistribute ? 20 : AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("LifeAmount"), sa);
         final TargetRestrictions tgt = sa.getTargetRestrictions();
-        final List<Integer> lifetotals = new ArrayList<Integer>();
+        final List<Integer> lifetotals = new ArrayList<>();
         
         if (redistribute) {
             for (final Player p : getTargetPlayers(sa)) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/MustBlockEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MustBlockEffect.java
index f48ca1824c9..504d17ba0b1 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/MustBlockEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/MustBlockEffect.java
@@ -23,7 +23,7 @@ public class MustBlockEffect extends SpellAbilityEffect {
         if (sa.hasParam("DefinedAttacker")) {
             cards = AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("DefinedAttacker"), sa);
         } else {
-            cards = new ArrayList<Card>();
+            cards = new ArrayList<>();
             cards.add(host);
         }
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
index 38dceefcb16..4056b367799 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
@@ -97,7 +97,7 @@ public class PlayEffect extends SpellAbilityEffect {
                 cards = Lists.newArrayList(Iterables.filter(cards, cpp));
             }
             if (sa.hasParam("RandomCopied")) {
-                final List<PaperCard> copysource = new ArrayList<PaperCard>(cards);
+                final List<PaperCard> copysource = new ArrayList<>(cards);
                 final CardCollection choice = new CardCollection();
                 final String num = sa.hasParam("RandomNum") ? sa.getParam("RandomNum") : "1";
                 int ncopied = AbilityUtils.calculateAmount(source, num, sa);
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java
index 8929a776217..6f09ea7e577 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java
@@ -48,7 +48,7 @@ public class ProtectAllEffect extends SpellAbilityEffect {
 
         final boolean isChoice = sa.getParam("Gains").contains("Choice");
         final List<String> choices = ProtectEffect.getProtectionList(sa);
-        final List<String> gains = new ArrayList<String>();
+        final List<String> gains = new ArrayList<>();
         if (isChoice) {
             Player choser = sa.getActivatingPlayer();
             final String choice = choser.getController().chooseProtectionType("Choose a protection", sa, choices);
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java
index df30dea7f34..45b268b9873 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java
@@ -100,7 +100,7 @@ public class ProtectEffect extends SpellAbilityEffect {
 
         final boolean isChoice = sa.getParam("Gains").contains("Choice");
         final List<String> choices = getProtectionList(sa);
-        final List<String> gains = new ArrayList<String>();
+        final List<String> gains = new ArrayList<>();
         final List<Card> tgtCards = getTargetCards(sa);
         
         if (isChoice && !choices.isEmpty())  {
@@ -128,7 +128,7 @@ public class ProtectEffect extends SpellAbilityEffect {
             gainsKWList.add(TextUtil.concatWithSpace("Protection from", color));
         }
 
-        final List<Card> untargetedCards = new ArrayList<Card>();
+        final List<Card> untargetedCards = new ArrayList<>();
         final TargetRestrictions tgt = sa.getTargetRestrictions();
 
         if (sa.hasParam("Radiance") && (tgt != null)) {
@@ -205,7 +205,7 @@ public class ProtectEffect extends SpellAbilityEffect {
     
 
     public static List<String> getProtectionList(final SpellAbility sa) {
-        final List<String> gains = new ArrayList<String>();
+        final List<String> gains = new ArrayList<>();
 
         final String gainStr = sa.getParam("Gains");
         if (gainStr.equals("Choice")) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
index d89e2c9066b..4641d05d75f 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
@@ -29,10 +29,10 @@ public class RestartGameEffect extends SpellAbilityEffect {
         final Player activator = sa.getActivatingPlayer();
         final Game game = activator.getGame();
         FCollectionView<Player> players = game.getPlayers();
-        Map<Player, List<Card>> playerLibraries = new HashMap<Player, List<Card>>();
+        Map<Player, List<Card>> playerLibraries = new HashMap<>();
 
         // Don't grab Ante Zones
-        List<ZoneType> restartZones = new ArrayList<ZoneType>(Arrays.asList(ZoneType.Battlefield,
+        List<ZoneType> restartZones = new ArrayList<>(Arrays.asList(ZoneType.Battlefield,
                 ZoneType.Library, ZoneType.Graveyard, ZoneType.Hand, ZoneType.Exile, ZoneType.Command));
 
         ZoneType leaveZone = ZoneType.smartValueOf(sa.hasParam("RestrictFromZone") ? sa.getParam("RestrictFromZone") : null);
diff --git a/forge-game/src/main/java/forge/game/ability/effects/RunSVarAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RunSVarAbilityEffect.java
index 903c20b25d0..e812e83a209 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/RunSVarAbilityEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/RunSVarAbilityEffect.java
@@ -20,7 +20,7 @@ public class RunSVarAbilityEffect extends SpellAbilityEffect {
         if (sVars == null || cards.isEmpty()) {
         	return;
         }
-        List<SpellAbility> validSA = new ArrayList<SpellAbility>();
+        List<SpellAbility> validSA = new ArrayList<>();
         final boolean isTrigger = sa.hasParam("IsTrigger");
         for (final Card tgtC : cards) {
             if (!tgtC.hasSVar(sVars)) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/StoreMapEffect.java b/forge-game/src/main/java/forge/game/ability/effects/StoreMapEffect.java
index 32d4d05e12e..a74bb75cd6f 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/StoreMapEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/StoreMapEffect.java
@@ -14,8 +14,8 @@ public class StoreMapEffect extends SpellAbilityEffect {
     @Override
     public void resolve(SpellAbility sa) {
         final Card source = sa.getHostCard();
-        List<GameEntity> entity = new ArrayList<GameEntity>();
-        List<Object> objects = new ArrayList<Object>();
+        List<GameEntity> entity = new ArrayList<>();
+        List<Object> objects = new ArrayList<>();
 
         if (sa.hasParam("RememberEntity")) {
             entity.addAll(AbilityUtils.getDefinedPlayers(source, sa.getParam("RememberEntity"), sa));
diff --git a/forge-game/src/main/java/forge/game/card/CardState.java b/forge-game/src/main/java/forge/game/card/CardState.java
index ccb021be854..ae24cc3a7a0 100644
--- a/forge-game/src/main/java/forge/game/card/CardState.java
+++ b/forge-game/src/main/java/forge/game/card/CardState.java
@@ -56,11 +56,11 @@ public class CardState extends GameObject {
     private String baseLoyalty = "";
     private KeywordCollection intrinsicKeywords = new KeywordCollection();
 
-    private final FCollection<SpellAbility> nonManaAbilities = new FCollection<SpellAbility>();
-    private final FCollection<SpellAbility> manaAbilities = new FCollection<SpellAbility>();
-    private FCollection<Trigger> triggers = new FCollection<Trigger>();
-    private FCollection<ReplacementEffect> replacementEffects = new FCollection<ReplacementEffect>();
-    private FCollection<StaticAbility> staticAbilities = new FCollection<StaticAbility>();
+    private final FCollection<SpellAbility> nonManaAbilities = new FCollection<>();
+    private final FCollection<SpellAbility> manaAbilities = new FCollection<>();
+    private FCollection<Trigger> triggers = new FCollection<>();
+    private FCollection<ReplacementEffect> replacementEffects = new FCollection<>();
+    private FCollection<StaticAbility> staticAbilities = new FCollection<>();
     private String imageKey = "";
     private Map<String, String> sVars = Maps.newTreeMap();
 
@@ -257,24 +257,24 @@ public class CardState extends GameObject {
     }
 
     public final FCollectionView<SpellAbility> getSpellAbilities() {
-        FCollection<SpellAbility> newCol = new FCollection<SpellAbility>(manaAbilities);
+        FCollection<SpellAbility> newCol = new FCollection<>(manaAbilities);
         newCol.addAll(nonManaAbilities);
         card.updateSpellAbilities(newCol, this, null);
         return newCol;
     }
     public final FCollectionView<SpellAbility> getManaAbilities() {
-        FCollection<SpellAbility> newCol = new FCollection<SpellAbility>(manaAbilities);
+        FCollection<SpellAbility> newCol = new FCollection<>(manaAbilities);
         card.updateSpellAbilities(newCol, this, true);
         return newCol;
     }
     public final FCollectionView<SpellAbility> getNonManaAbilities() {
-        FCollection<SpellAbility> newCol = new FCollection<SpellAbility>(nonManaAbilities);
+        FCollection<SpellAbility> newCol = new FCollection<>(nonManaAbilities);
         card.updateSpellAbilities(newCol, this, false);
         return newCol;
     }
 
     public final FCollectionView<SpellAbility> getIntrinsicSpellAbilities() {
-        return new FCollection<SpellAbility>(Iterables.filter(getSpellAbilities(), SpellAbilityPredicates.isIntrinsic()));
+        return new FCollection<>(Iterables.filter(getSpellAbilities(), SpellAbilityPredicates.isIntrinsic()));
     }
 
     public final boolean hasSpellAbility(final SpellAbility sa) {
@@ -386,7 +386,7 @@ public class CardState extends GameObject {
         return staticAbilities.remove(stab);
     }
     public final void setStaticAbilities(final Iterable<StaticAbility> staticAbilities0) {
-        staticAbilities = new FCollection<StaticAbility>(staticAbilities0);
+        staticAbilities = new FCollection<>(staticAbilities0);
     }
     public final void clearStaticAbilities() {
         staticAbilities.clear();
diff --git a/forge-game/src/main/java/forge/game/card/CardUtil.java b/forge-game/src/main/java/forge/game/card/CardUtil.java
index 8d0c2000fff..2f1efa59769 100644
--- a/forge-game/src/main/java/forge/game/card/CardUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardUtil.java
@@ -423,7 +423,7 @@ public final class CardUtil {
                 colors.add(MagicColor.Constant.COLORLESS);
             }
         } else if (reflectProperty.equals("Produce")) {
-            final FCollection<SpellAbility> abilities = new FCollection<SpellAbility>();
+            final FCollection<SpellAbility> abilities = new FCollection<>();
             for (final Card c : cards) {
                 abilities.addAll(c.getManaAbilities());
             }
diff --git a/forge-game/src/main/java/forge/game/card/CardView.java b/forge-game/src/main/java/forge/game/card/CardView.java
index 8762d2816d2..8f33fc065ad 100644
--- a/forge-game/src/main/java/forge/game/card/CardView.java
+++ b/forge-game/src/main/java/forge/game/card/CardView.java
@@ -46,7 +46,7 @@ public class CardView extends GameEntityView {
         if (cards == null) {
             return null;
         }
-        TrackableCollection<CardView> collection = new TrackableCollection<CardView>();
+        TrackableCollection<CardView> collection = new TrackableCollection<>();
         for (Card c : cards) {
             if (c.getCardForUi() == c) { //only add cards that match their card for UI
                 collection.add(c.getView());
@@ -352,7 +352,7 @@ public class CardView extends GameEntityView {
         TrackableCollection<PlayerView> col = get(prop);
         if (mayLook) {
             if (col == null) {
-                col = new TrackableCollection<PlayerView>(p.getView());
+                col = new TrackableCollection<>(p.getView());
                 set(prop, col);
             }
             else if (col.add(p.getView())) {
@@ -1060,7 +1060,7 @@ public class CardView extends GameEntityView {
         if (oldCards.add(cardToAdd)) {
             TrackableCollection<CardView> views = get(key);
             if (views == null) {
-                views = new TrackableCollection<CardView>();
+                views = new TrackableCollection<>();
                 views.add(cardToAdd.getView());
                 set(key, views);
             }
@@ -1081,7 +1081,7 @@ public class CardView extends GameEntityView {
         for (Card c : cardsToAdd) {
             if (c != null && oldCards.add(c)) {
                 if (views == null) {
-                    views = new TrackableCollection<CardView>();
+                    views = new TrackableCollection<>();
                     views.add(c.getView());
                     set(key, views);
                 }
diff --git a/forge-game/src/main/java/forge/game/combat/AttackConstraints.java b/forge-game/src/main/java/forge/game/combat/AttackConstraints.java
index f7b59f9413f..181c27e769e 100644
--- a/forge-game/src/main/java/forge/game/combat/AttackConstraints.java
+++ b/forge-game/src/main/java/forge/game/combat/AttackConstraints.java
@@ -45,7 +45,7 @@ public class AttackConstraints {
                     "If a creature with a magnet counter on it attacks, all creatures with magnet counters on them attack if able.");
         }
 
-        final MapToAmount<Card> attacksIfOtherAttacks = new LinkedHashMapToAmount<Card>();
+        final MapToAmount<Card> attacksIfOtherAttacks = new LinkedHashMapToAmount<>();
         for (final Card possibleAttacker : possibleAttackers) {
             attacksIfOtherAttacks.add(possibleAttacker, possibleAttacker.getAmountOfKeyword("If a creature you control attacks, CARDNAME also attacks if able."));
         }
@@ -53,7 +53,7 @@ public class AttackConstraints {
         for (final Card possibleAttacker : possibleAttackers) {
             restrictions.put(possibleAttacker, new AttackRestriction(possibleAttacker, possibleDefenders));
 
-            final MapToAmount<Card> causesToAttack = new LinkedHashMapToAmount<Card>();
+            final MapToAmount<Card> causesToAttack = new LinkedHashMapToAmount<>();
             for (final Entry<Card, Integer> entry : attacksIfOtherAttacks.entrySet()) {
                 if (entry.getKey() != possibleAttacker) {
                     causesToAttack.add(entry.getKey(), entry.getValue().intValue());
@@ -97,7 +97,7 @@ public class AttackConstraints {
             return Pair.of(Collections.emptyMap(), Integer.valueOf(0));
         }
 
-        final MapToAmount<Map<Card, GameEntity>> possible = new LinkedHashMapToAmount<Map<Card, GameEntity>>();
+        final MapToAmount<Map<Card, GameEntity>> possible = new LinkedHashMapToAmount<>();
         final List<Attack> reqs = getSortedFilteredRequirements();
         final CardCollection myPossibleAttackers = new CardCollection(possibleAttackers);
 
@@ -172,8 +172,8 @@ public class AttackConstraints {
     }
 
     private final FCollection<Map<Card, GameEntity>> collectLegalAttackers(final List<Attack> reqs, final int maximum) {
-        return new FCollection<Map<Card, GameEntity>>
-            (collectLegalAttackers(Collections.emptyMap(), deepClone(reqs), new CardCollection(), maximum));
+        return new FCollection<>
+                (collectLegalAttackers(Collections.emptyMap(), deepClone(reqs), new CardCollection(), maximum));
     }
 
     private final List<Map<Card, GameEntity>> collectLegalAttackers(final Map<Card, GameEntity> attackers, final List<Attack> reqs, final CardCollection reserved, final int maximum) {
@@ -182,7 +182,7 @@ public class AttackConstraints {
         int localMaximum = maximum;
         final boolean isLimited = globalRestrictions.getMax() != -1;
         final Map<Card, GameEntity> myAttackers = Maps.newHashMap(attackers);
-        final MapToAmount<GameEntity> toDefender = new LinkedHashMapToAmount<GameEntity>();
+        final MapToAmount<GameEntity> toDefender = new LinkedHashMapToAmount<>();
         int attackersNeeded = 0;
 
         outer: while(!reqs.isEmpty()) {
diff --git a/forge-game/src/main/java/forge/game/combat/AttackRequirement.java b/forge-game/src/main/java/forge/game/combat/AttackRequirement.java
index 8c40d44d7e6..2841352d515 100644
--- a/forge-game/src/main/java/forge/game/combat/AttackRequirement.java
+++ b/forge-game/src/main/java/forge/game/combat/AttackRequirement.java
@@ -29,9 +29,9 @@ public class AttackRequirement {
     private final MapToAmount<Card> causesToAttack;
 
     public AttackRequirement(final Card attacker, final MapToAmount<Card> causesToAttack, final FCollectionView<GameEntity> possibleDefenders) {
-        this.defenderSpecific = new LinkedHashMapToAmount<GameEntity>();
-        this.defenderOrPWSpecific = new LinkedHashMapToAmount<GameEntity>();
-        this.defenderSpecificAlternatives = new HashMap<GameEntity, List<GameEntity>>();
+        this.defenderSpecific = new LinkedHashMapToAmount<>();
+        this.defenderOrPWSpecific = new LinkedHashMapToAmount<>();
+        this.defenderSpecificAlternatives = new HashMap<>();
 
         this.causesToAttack = causesToAttack;
 
diff --git a/forge-game/src/main/java/forge/game/combat/AttackRestriction.java b/forge-game/src/main/java/forge/game/combat/AttackRestriction.java
index 2f47ffd92e2..6535808a622 100644
--- a/forge-game/src/main/java/forge/game/combat/AttackRestriction.java
+++ b/forge-game/src/main/java/forge/game/combat/AttackRestriction.java
@@ -26,7 +26,7 @@ public class AttackRestriction {
         this.attacker = attacker;
         setRestrictions();
 
-        final FCollection<GameEntity> cantAttackDefender = new FCollection<GameEntity>();
+        final FCollection<GameEntity> cantAttackDefender = new FCollection<>();
         for (final GameEntity defender : possibleDefenders) {
             if (!CombatUtil.canAttack(attacker, defender)) {
                 cantAttackDefender.add(defender);
diff --git a/forge-game/src/main/java/forge/game/combat/AttackingBand.java b/forge-game/src/main/java/forge/game/combat/AttackingBand.java
index 3158cbcea73..3e9f861600f 100644
--- a/forge-game/src/main/java/forge/game/combat/AttackingBand.java
+++ b/forge-game/src/main/java/forge/game/combat/AttackingBand.java
@@ -65,7 +65,7 @@ public class AttackingBand {
     
     public boolean canJoinBand(Card card) {
         // Trying to join an existing band, attackers should be non-empty and card should exist
-        List<Card> newBand = new ArrayList<Card>(attackers);
+        List<Card> newBand = new ArrayList<>(attackers);
         if (card != null) {
             newBand.add(card);
         }
diff --git a/forge-game/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java
index 4299ce1eede..94aff5f0de3 100644
--- a/forge-game/src/main/java/forge/game/combat/Combat.java
+++ b/forge-game/src/main/java/forge/game/combat/Combat.java
@@ -51,7 +51,7 @@ public class Combat {
     private final Player playerWhoAttacks;
     private final AttackConstraints attackConstraints;
     // Defenders, as they are attacked by hostile forces
-    private final FCollection<GameEntity> attackableEntries = new FCollection<GameEntity>();
+    private final FCollection<GameEntity> attackableEntries = new FCollection<>();
 
     // Keyed by attackable defender (player or planeswalker)
     private final Multimap<GameEntity, AttackingBand> attackedByBands = Multimaps.synchronizedMultimap(ArrayListMultimap.create());
@@ -87,7 +87,7 @@ public class Combat {
         HashMap<AttackingBand, AttackingBand> bandsMap = new HashMap<>();
         for (Entry<GameEntity, AttackingBand> entry : combat.attackedByBands.entries()) {
             AttackingBand origBand = entry.getValue();
-            ArrayList<Card> attackers = new ArrayList<Card>();
+            ArrayList<Card> attackers = new ArrayList<>();
             for (Card c : origBand.getAttackers()) {
                 attackers.add(map.map(c));
             }
@@ -187,7 +187,7 @@ public class Combat {
     }
 
     public final FCollection<GameEntity> getDefendersControlledBy(Player who) {
-        FCollection<GameEntity> res = new FCollection<GameEntity>();
+        FCollection<GameEntity> res = new FCollection<>();
         for (GameEntity ge : attackableEntries) {
             // if defender is the player himself or his cards
             if (ge == who || ge instanceof Card && ((Card) ge).getController() == who) {
@@ -198,7 +198,7 @@ public class Combat {
     }
 
     public final FCollectionView<Player> getDefendingPlayers() {
-        return new FCollection<Player>(Iterables.filter(attackableEntries, Player.class));
+        return new FCollection<>(Iterables.filter(attackableEntries, Player.class));
     }
 
     public final CardCollection getDefendingPlaneswalkers() {
@@ -414,7 +414,7 @@ public class Combat {
     }
 
     public final FCollectionView<AttackingBand> getAttackingBandsBlockedBy(Card blocker) {
-        FCollection<AttackingBand> bands = new FCollection<AttackingBand>();
+        FCollection<AttackingBand> bands = new FCollection<>();
         for (Entry<AttackingBand, Card> kv : blockedBands.entries()) {
             if (kv.getValue().equals(blocker)) {
                 bands.add(kv.getKey());
@@ -902,7 +902,7 @@ public class Combat {
                 return; // card was not even in combat
             }
         }
-        final FCollectionView<AttackingBand> relatedBands = isAttacker ? new FCollection<AttackingBand>(attackingBand) : attackersBlocked;
+        final FCollectionView<AttackingBand> relatedBands = isAttacker ? new FCollection<>(attackingBand) : attackersBlocked;
         lkiCache.put(lastKnownInfo, new CombatLki(isAttacker, relatedBands));
     }
 }
diff --git a/forge-game/src/main/java/forge/game/combat/CombatLki.java b/forge-game/src/main/java/forge/game/combat/CombatLki.java
index 682265f0a18..9e1d60b5bfb 100644
--- a/forge-game/src/main/java/forge/game/combat/CombatLki.java
+++ b/forge-game/src/main/java/forge/game/combat/CombatLki.java
@@ -14,7 +14,7 @@ public class CombatLki {
 
     public CombatLki(boolean isAttacker, FCollectionView<AttackingBand> relatedBands) {
         this.isAttacker = isAttacker;
-        this.relatedBands = new FCollection<AttackingBand>(relatedBands);
+        this.relatedBands = new FCollection<>(relatedBands);
     }
 
     public AttackingBand getFirstBand() {
diff --git a/forge-game/src/main/java/forge/game/combat/CombatUtil.java b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
index 5f020665993..50d7c7aae98 100644
--- a/forge-game/src/main/java/forge/game/combat/CombatUtil.java
+++ b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
@@ -59,7 +59,7 @@ import java.util.Map;
 public class CombatUtil {
 
     public static FCollectionView<GameEntity> getAllPossibleDefenders(final Player playerWhoAttacks) {
-        final FCollection<GameEntity> defenders = new FCollection<GameEntity>();
+        final FCollection<GameEntity> defenders = new FCollection<>();
         for (final Player defender : playerWhoAttacks.getOpponents()) {
             defenders.add(defender);
             final CardCollection planeswalkers = CardLists.filter(defender.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.PLANESWALKERS);
diff --git a/forge-game/src/main/java/forge/game/combat/CombatView.java b/forge-game/src/main/java/forge/game/combat/CombatView.java
index 3d7ef74db64..94863af1395 100644
--- a/forge-game/src/main/java/forge/game/combat/CombatView.java
+++ b/forge-game/src/main/java/forge/game/combat/CombatView.java
@@ -59,7 +59,7 @@ public class CombatView extends TrackableObject {
     public Iterable<CardView> getAttackers() {
         final HashSet<CardView> allAttackers;
         synchronized (this) {
-            allAttackers = new HashSet<CardView>(getAttackersWithDefenders().keySet());
+            allAttackers = new HashSet<>(getAttackersWithDefenders().keySet());
         }
         return allAttackers;
     }
@@ -67,7 +67,7 @@ public class CombatView extends TrackableObject {
     public Iterable<GameEntityView> getDefenders() {
         final HashSet<GameEntityView> allDefenders;
         synchronized (this) {
-            allDefenders = new HashSet<GameEntityView>(getAttackersWithDefenders().values());
+            allDefenders = new HashSet<>(getAttackersWithDefenders().values());
         }
         return allDefenders;
     }
@@ -139,7 +139,7 @@ public class CombatView extends TrackableObject {
         synchronized (this) {
             attackersWithDefenders = Lists.newArrayList(getAttackersWithDefenders().entrySet());
         }
-        final FCollection<CardView> views = new FCollection<CardView>();
+        final FCollection<CardView> views = new FCollection<>();
         for (final Entry<CardView, GameEntityView> entry : attackersWithDefenders) {
             if (defender != null && defender.equals(entry.getValue())) {
                 views.add(entry.getKey());
@@ -152,7 +152,7 @@ public class CombatView extends TrackableObject {
         synchronized (this) {
             bandsWithDefenders = Lists.newArrayList(getBandsWithDefenders().entrySet());
         }
-        final List<FCollection<CardView>> views = new ArrayList<FCollection<CardView>>();
+        final List<FCollection<CardView>> views = new ArrayList<>();
         for (final Entry<FCollection<CardView>, GameEntityView> entry : bandsWithDefenders) {
             if (defender != null && defender.equals(entry.getValue())) {
                 views.add(entry.getKey());
@@ -164,9 +164,9 @@ public class CombatView extends TrackableObject {
     public void addAttackingBand(final Iterable<CardView> attackingBand, final GameEntityView defender, final Iterable<CardView> blockers, final Iterable<CardView> plannedBlockers) {
         if (defender == null) { return; }
 
-        final FCollection<CardView> attackingBandCopy = new FCollection<CardView>();
-        final FCollection<CardView> blockersCopy = new FCollection<CardView>();
-        final FCollection<CardView> plannedBlockersCopy = new FCollection<CardView>();
+        final FCollection<CardView> attackingBandCopy = new FCollection<>();
+        final FCollection<CardView> blockersCopy = new FCollection<>();
+        final FCollection<CardView> plannedBlockersCopy = new FCollection<>();
 
         attackingBandCopy.addAll(attackingBand);
         if (blockers != null) {
diff --git a/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java b/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java
index 9c5f3b810bf..dc8eabe113f 100644
--- a/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java
+++ b/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java
@@ -48,7 +48,7 @@ public class GlobalAttackRestrictions {
             return new GlobalAttackRestrictionViolations(nTooMany, MapToAmountUtil.emptyMap(), MapToAmountUtil.emptyMap());
         }
 
-        final MapToAmount<GameEntity> defenderTooMany = new LinkedHashMapToAmount<GameEntity>(defenderMax.size());
+        final MapToAmount<GameEntity> defenderTooMany = new LinkedHashMapToAmount<>(defenderMax.size());
         outer: for (final GameEntity defender : attackers.values()) {
             final Integer max = defenderMax.get(defender);
             if (max == null) {
@@ -76,7 +76,7 @@ public class GlobalAttackRestrictions {
             }
         }
 
-        final MapToAmount<GameEntity> defenderTooFew = new LinkedHashMapToAmount<GameEntity>(defenderMax.size());
+        final MapToAmount<GameEntity> defenderTooFew = new LinkedHashMapToAmount<>(defenderMax.size());
         for (final GameEntity mandatoryDef : mustBeAttackedByEachOpp) {
             // check to ensure that this defender can even legally be attacked in the first place
             boolean canAttackThisDef = false;
@@ -145,7 +145,7 @@ public class GlobalAttackRestrictions {
      */
     public static GlobalAttackRestrictions getGlobalRestrictions(final Player attackingPlayer, final FCollectionView<GameEntity> possibleDefenders) {
         int max = -1;
-        final MapToAmount<GameEntity> defenderMax = new LinkedHashMapToAmount<GameEntity>(possibleDefenders.size());
+        final MapToAmount<GameEntity> defenderMax = new LinkedHashMapToAmount<>(possibleDefenders.size());
         final PlayerCollection mustBeAttacked = new PlayerCollection();
         final Game game = attackingPlayer.getGame();
 
diff --git a/forge-game/src/main/java/forge/game/cost/CostAddMana.java b/forge-game/src/main/java/forge/game/cost/CostAddMana.java
index 5213f4f6ae6..81ea129bce2 100644
--- a/forge-game/src/main/java/forge/game/cost/CostAddMana.java
+++ b/forge-game/src/main/java/forge/game/cost/CostAddMana.java
@@ -76,7 +76,7 @@ public class CostAddMana extends CostPart {
     public boolean payAsDecided(Player ai, PaymentDecision decision, SpellAbility sa) {
         Card source = sa.getHostCard();
 
-        List<Mana> manaProduced = new ArrayList<Mana>();
+        List<Mana> manaProduced = new ArrayList<>();
         final String type = this.getType();
         for (int n = 0; n < decision.c; n++) {
             if (StringUtils.isNumeric(type)) {
diff --git a/forge-game/src/main/java/forge/game/cost/CostDraw.java b/forge-game/src/main/java/forge/game/cost/CostDraw.java
index 4cd621773ab..b33630f7808 100644
--- a/forge-game/src/main/java/forge/game/cost/CostDraw.java
+++ b/forge-game/src/main/java/forge/game/cost/CostDraw.java
@@ -64,7 +64,7 @@ public class CostDraw extends CostPart {
      * @param source
      */
     private List<Player> getPotentialPlayers(final Player payer, final Card source) {
-        List<Player> res = new ArrayList<Player>();
+        List<Player> res = new ArrayList<>();
         String type = this.getType();
         for (Player p : payer.getGame().getPlayers()) {
             if (p.isValid(type, payer, source, null) && p.canDraw()) {
diff --git a/forge-game/src/main/java/forge/game/cost/CostGainLife.java b/forge-game/src/main/java/forge/game/cost/CostGainLife.java
index bd04dd670e9..75e97f0c5f9 100644
--- a/forge-game/src/main/java/forge/game/cost/CostGainLife.java
+++ b/forge-game/src/main/java/forge/game/cost/CostGainLife.java
@@ -66,7 +66,7 @@ public class CostGainLife extends CostPart {
     
     public List<Player> getPotentialTargets(final Player payer, final Card source)
     {
-        List<Player> res = new ArrayList<Player>();
+        List<Player> res = new ArrayList<>();
         for(Player p : payer.getGame().getPlayers())
         {
             if(p.isValid(getType(), payer, source, null))
diff --git a/forge-game/src/main/java/forge/game/event/GameEventBlockersDeclared.java b/forge-game/src/main/java/forge/game/event/GameEventBlockersDeclared.java
index 2043b0e0895..26b1bcaae18 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventBlockersDeclared.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventBlockersDeclared.java
@@ -37,7 +37,7 @@ public class GameEventBlockersDeclared extends GameEvent {
      */
     @Override
     public String toString() {
-        List<Card> blockerCards = new ArrayList<Card>();
+        List<Card> blockerCards = new ArrayList<>();
         for (MapOfLists<Card, Card> vv : blockers.values()) {
             for (Collection<Card> cc : vv.values()) {
                 blockerCards.addAll(cc);
diff --git a/forge-game/src/main/java/forge/game/keyword/Keyword.java b/forge-game/src/main/java/forge/game/keyword/Keyword.java
index 101dc0a4a90..805b00f6f92 100644
--- a/forge-game/src/main/java/forge/game/keyword/Keyword.java
+++ b/forge-game/src/main/java/forge/game/keyword/Keyword.java
@@ -245,20 +245,20 @@ public enum Keyword {
 
     public static List<Keyword> getAllKeywords() {
         Keyword[] values = values();
-        List<Keyword> keywords = new ArrayList<Keyword>();
+        List<Keyword> keywords = new ArrayList<>();
         for (int i = 1; i < values.length; i++) { //skip UNDEFINED
             keywords.add(values[i]);
         }
         return keywords;
     }
 
-    private static final Map<String, Set<Keyword>> cardKeywordSetLookup = new HashMap<String, Set<Keyword>>();
+    private static final Map<String, Set<Keyword>> cardKeywordSetLookup = new HashMap<>();
 
     public static Set<Keyword> getKeywordSet(PaperCard card) {
         String key = card.getName();
         Set<Keyword> keywordSet = cardKeywordSetLookup.get(key);
         if (keywordSet == null) {
-            keywordSet = new HashSet<Keyword>();
+            keywordSet = new HashSet<>();
             for (KeywordInterface inst : Card.getCardForUi(card).getKeywords()) {
                 final Keyword keyword = inst.getKeyword();
                 if (keyword != Keyword.UNDEFINED) {
diff --git a/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java b/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java
index d652b3c40a9..3208205f582 100644
--- a/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java
+++ b/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java
@@ -109,7 +109,7 @@ public class ManaCostBeingPaid {
 
     // holds Mana_Part objects
     // ManaPartColor is stored before ManaPartGeneric
-    private final Map<ManaCostShard, ShardCount> unpaidShards = new HashMap<ManaCostShard, ShardCount>();
+    private final Map<ManaCostShard, ShardCount> unpaidShards = new HashMap<>();
     private Map<String, Integer> xManaCostPaidByColor;
     private final String sourceRestriction;
     private byte sunburstMap = 0;
@@ -124,7 +124,7 @@ public class ManaCostBeingPaid {
             unpaidShards.put(m.getKey(), new ShardCount(m.getValue()));
         }
         if (manaCostBeingPaid.xManaCostPaidByColor != null) {
-            xManaCostPaidByColor = new HashMap<String, Integer>(manaCostBeingPaid.xManaCostPaidByColor);
+            xManaCostPaidByColor = new HashMap<>(manaCostBeingPaid.xManaCostPaidByColor);
         }
         sourceRestriction = manaCostBeingPaid.sourceRestriction;
         sunburstMap = manaCostBeingPaid.sunburstMap;
@@ -503,7 +503,7 @@ public class ManaCostBeingPaid {
             sc.xCount--;
             String color = MagicColor.toShortString(colorMask);
             if (xManaCostPaidByColor == null) {
-                xManaCostPaidByColor = new HashMap<String, Integer>();
+                xManaCostPaidByColor = new HashMap<>();
             }
             Integer xColor = xManaCostPaidByColor.get(color);
             if (xColor == null) {
@@ -594,7 +594,7 @@ public class ManaCostBeingPaid {
         }
 
         int nGeneric = getGenericManaAmount();
-        List<ManaCostShard> shards = new ArrayList<ManaCostShard>(unpaidShards.keySet());
+        List<ManaCostShard> shards = new ArrayList<>(unpaidShards.keySet());
 
         // TODO Fix this. Should we really be changing Shards here?
         if (false && pool != null) { //replace shards with generic mana if they can be paid with any color mana
@@ -668,7 +668,7 @@ public class ManaCostBeingPaid {
     }
 
     public final List<ManaCostShard> getUnpaidShards() {
-        List<ManaCostShard> result = new ArrayList<ManaCostShard>();
+        List<ManaCostShard> result = new ArrayList<>();
         for (Entry<ManaCostShard, ShardCount> kv : unpaidShards.entrySet()) {
            for (int i = kv.getValue().totalCount; i > 0; i--) {
                result.add(kv.getKey());
diff --git a/forge-game/src/main/java/forge/game/mana/ManaPool.java b/forge-game/src/main/java/forge/game/mana/ManaPool.java
index bf68649ae12..9fb66880820 100644
--- a/forge-game/src/main/java/forge/game/mana/ManaPool.java
+++ b/forge-game/src/main/java/forge/game/mana/ManaPool.java
@@ -100,7 +100,7 @@ public class ManaPool extends ManaConversionMatrix implements Iterable<Mana> {
 
     public final List<Mana> clearPool(boolean isEndOfPhase) {
         // isEndOfPhase parameter: true = end of phase, false = mana drain effect
-        List<Mana> cleared = new ArrayList<Mana>();
+        List<Mana> cleared = new ArrayList<>();
         if (floatingMana.isEmpty()) { return cleared; }
 
         if (isEndOfPhase && owner.getGame().getStaticEffects().getGlobalRuleChange(GlobalRuleChange.manapoolsDontEmpty)) {
@@ -125,7 +125,7 @@ public class ManaPool extends ManaConversionMatrix implements Iterable<Mana> {
         for (Byte b : keys) {
             Collection<Mana> cm = floatingMana.get(b);
             if (isEndOfPhase && !owner.getGame().getPhaseHandler().is(PhaseType.CLEANUP)) {
-                final List<Mana> pMana = new ArrayList<Mana>();
+                final List<Mana> pMana = new ArrayList<>();
                 for (final Mana mana : cm) {
                     if (mana.getManaAbility()!= null && mana.getManaAbility().isPersistentMana()) {
                         pMana.add(mana);
@@ -159,7 +159,7 @@ public class ManaPool extends ManaConversionMatrix implements Iterable<Mana> {
     }
 
     private void convertManaColor(final byte originalColor, final byte toColor) {
-        List<Mana> convert = new ArrayList<Mana>();
+        List<Mana> convert = new ArrayList<>();
         Collection<Mana> cm = floatingMana.get(originalColor);
         for (Mana m : cm) {
             convert.add(new Mana(toColor, m.getSourceCard(), m.getManaAbility()));
@@ -287,7 +287,7 @@ public class ManaPool extends ManaConversionMatrix implements Iterable<Mana> {
             return false;
         }
 
-        final List<Mana> removeFloating = new ArrayList<Mana>();
+        final List<Mana> removeFloating = new ArrayList<>();
 
         boolean manaNotAccountedFor = false;
         // loop over mana produced by mana ability
diff --git a/forge-game/src/main/java/forge/game/phase/ExtraTurn.java b/forge-game/src/main/java/forge/game/phase/ExtraTurn.java
index 156e788cf1d..5d7a0d29c17 100644
--- a/forge-game/src/main/java/forge/game/phase/ExtraTurn.java
+++ b/forge-game/src/main/java/forge/game/phase/ExtraTurn.java
@@ -36,7 +36,7 @@ import forge.game.trigger.Trigger;
 public class ExtraTurn {
 
     private Player player = null;
-    private List<Trigger> delTrig = Collections.synchronizedList(new ArrayList<Trigger>());
+    private List<Trigger> delTrig = Collections.synchronizedList(new ArrayList<>());
     private boolean skipUntap = false;
     private boolean cantSetSchemesInMotion = false;
     /**
diff --git a/forge-game/src/main/java/forge/game/phase/Phase.java b/forge-game/src/main/java/forge/game/phase/Phase.java
index 9b31c09900a..3a84791af1c 100644
--- a/forge-game/src/main/java/forge/game/phase/Phase.java
+++ b/forge-game/src/main/java/forge/game/phase/Phase.java
@@ -45,11 +45,11 @@ public class Phase implements java.io.Serializable {
         this.type = type;
     }
 
-    protected final List<GameCommand> at = new ArrayList<GameCommand>();
-    private final List<GameCommand> until = new ArrayList<GameCommand>();
-    private final HashMap<Player, ArrayList<GameCommand>> untilMap = new HashMap<Player, ArrayList<GameCommand>>();
-    private final HashMap<Player, ArrayList<GameCommand>> untilEndMap = new HashMap<Player, ArrayList<GameCommand>>();
-    private final HashMap<Player, ArrayList<GameCommand>> registerMap = new HashMap<Player, ArrayList<GameCommand>>();
+    protected final List<GameCommand> at = new ArrayList<>();
+    private final List<GameCommand> until = new ArrayList<>();
+    private final HashMap<Player, ArrayList<GameCommand>> untilMap = new HashMap<>();
+    private final HashMap<Player, ArrayList<GameCommand>> untilEndMap = new HashMap<>();
+    private final HashMap<Player, ArrayList<GameCommand>> registerMap = new HashMap<>();
 
     /**
      * <p>
diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
index 00ca310ff9e..9aa823316e2 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
@@ -70,7 +70,7 @@ public class PhaseHandler implements java.io.Serializable {
     private PhaseType phase = null;
     private int turn = 0;
 
-    private final transient Stack<ExtraTurn> extraTurns = new Stack<ExtraTurn>();
+    private final transient Stack<ExtraTurn> extraTurns = new Stack<>();
     private final transient Map<PhaseType, Stack<PhaseType>> extraPhases = Maps.newEnumMap(PhaseType.class);
 
     private int nUpkeepsThisTurn = 0;
@@ -663,7 +663,7 @@ public class PhaseHandler implements java.io.Serializable {
             // map: defender => (many) attacker => (many) blocker
             Map<GameEntity, MapOfLists<Card, Card>> blockers = Maps.newHashMap();
             for (GameEntity ge : combat.getDefendersControlledBy(p)) {
-                MapOfLists<Card, Card> protectThisDefender = new HashMapOfLists<Card, Card>(CollectionSuppliers.arrayLists());
+                MapOfLists<Card, Card> protectThisDefender = new HashMapOfLists<>(CollectionSuppliers.arrayLists());
                 for (Card att : combat.getAttackersOf(ge)) {
                     protectThisDefender.addAll(att, combat.getBlockers(att));
                 }
@@ -916,7 +916,7 @@ public class PhaseHandler implements java.io.Serializable {
         // 500.8. Some effects can add phases to a turn. They do this by adding the phases directly after the specified phase.
         // If multiple extra phases are created after the same phase, the most recently created phase will occur first.
         if (!extraPhases.containsKey(afterPhase)) {
-            extraPhases.put(afterPhase, new Stack<PhaseType>());
+            extraPhases.put(afterPhase, new Stack<>());
         }
         extraPhases.get(afterPhase).push(extraPhase);
     }
@@ -1077,7 +1077,7 @@ public class PhaseHandler implements java.io.Serializable {
     }
 
     private boolean checkStateBasedEffects() {
-        final Set<Card> allAffectedCards = new HashSet<Card>();
+        final Set<Card> allAffectedCards = new HashSet<>();
         do {
             // Rule 704.3  Whenever a player would get priority, the game checks ... for state-based actions,
             game.getAction().checkStateEffects(false, allAffectedCards);
diff --git a/forge-game/src/main/java/forge/game/phase/PhaseType.java b/forge-game/src/main/java/forge/game/phase/PhaseType.java
index eda13a747f7..15fda8e63d1 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseType.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseType.java
@@ -74,7 +74,7 @@ public enum PhaseType {
     }
 
     public static List<PhaseType> listValueOf(final String values) {
-        final List<PhaseType> result = new ArrayList<PhaseType>();
+        final List<PhaseType> result = new ArrayList<>();
         for (final String s : values.split("[, ]+")) {
             result.add(PhaseType.smartValueOf(s));
         }
@@ -87,7 +87,7 @@ public enum PhaseType {
      * @return
      */
     public static List<PhaseType> parseRange(String values) {
-        final List<PhaseType> result = new ArrayList<PhaseType>();
+        final List<PhaseType> result = new ArrayList<>();
         for (final String s : values.split(",")) {
             int idxArrow = s.indexOf("->");
             if (idxArrow >= 0) {
diff --git a/forge-game/src/main/java/forge/game/player/AchievementTracker.java b/forge-game/src/main/java/forge/game/player/AchievementTracker.java
index 58ff288510e..4987a380b4b 100644
--- a/forge-game/src/main/java/forge/game/player/AchievementTracker.java
+++ b/forge-game/src/main/java/forge/game/player/AchievementTracker.java
@@ -10,8 +10,8 @@ import forge.game.spellability.SpellAbility;
 
 //class for storing information during a game that is used at the end of the game to determine achievements
 public class AchievementTracker {
-    public final Set<String> activatedUltimates = new HashSet<String>();
-    public final Set<String> challengesCompleted = new HashSet<String>();
+    public final Set<String> activatedUltimates = new HashSet<>();
+    public final Set<String> challengesCompleted = new HashSet<>();
     public int mulliganTo = 7;
     public int spellsCast = 0;
     public int maxStormCount = 0;
diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
index 4489f06814b..aa6d211b49f 100644
--- a/forge-game/src/main/java/forge/game/player/Player.java
+++ b/forge-game/src/main/java/forge/game/player/Player.java
@@ -119,7 +119,7 @@ public class Player extends GameEntity implements Comparable<Player> {
 
     private Map<Card, DetachedCardEffect> staticAbilities = Maps.newHashMap();
 
-    private Map<Long, KeywordsChange> changedKeywords = new ConcurrentSkipListMap<Long, KeywordsChange>();
+    private Map<Long, KeywordsChange> changedKeywords = new ConcurrentSkipListMap<>();
     private ManaPool manaPool = new ManaPool(this);
     private GameEntity mustAttackEntity = null;
     private GameEntity mustAttackEntityThisTurn = null;
@@ -768,8 +768,8 @@ public class Player extends GameEntity implements Comparable<Player> {
             CardCollection preventionEffectSources = new CardCollection(shieldMap.keySet());
             Card shieldSource = preventionEffectSources.get(0);
             if (preventionEffectSources.size() > 1) {
-                Map<String, Card> choiceMap = new TreeMap<String, Card>();
-                List<String> choices = new ArrayList<String>();
+                Map<String, Card> choiceMap = new TreeMap<>();
+                List<String> choices = new ArrayList<>();
                 for (final Card key : preventionEffectSources) {
                     String effDesc = shieldMap.get(key).get("EffectString");
                     int descIndex = effDesc.indexOf("SpellDescription");
@@ -1148,7 +1148,7 @@ public class Player extends GameEntity implements Comparable<Player> {
     }
 
     public final FCollectionView<StaticAbility> getStaticAbilities() {
-        FCollection<StaticAbility> result = new FCollection<StaticAbility>();
+        FCollection<StaticAbility> result = new FCollection<>();
         for (DetachedCardEffect eff : staticAbilities.values()) {
             result.addAll(eff.getStaticAbilities());
         }
@@ -1711,7 +1711,7 @@ public class Player extends GameEntity implements Comparable<Player> {
         if (land.isFaceDown()) {
             land.turnFaceUp();
         }
-        game.getAction().moveTo(getZone(ZoneType.Battlefield), land, null, new HashMap<String, Object>());
+        game.getAction().moveTo(getZone(ZoneType.Battlefield), land, null, new HashMap<>());
 
         // play a sound
         game.fireEvent(new GameEventLandPlayed(this, land));
diff --git a/forge-game/src/main/java/forge/game/player/PlayerProperty.java b/forge-game/src/main/java/forge/game/player/PlayerProperty.java
index f1c17abdf59..88038cad515 100644
--- a/forge-game/src/main/java/forge/game/player/PlayerProperty.java
+++ b/forge-game/src/main/java/forge/game/player/PlayerProperty.java
@@ -274,7 +274,7 @@ public class PlayerProperty {
             }
             else if (kind.equals("PermanentInPlay")) {
                 int typeNum = 0;
-                List<Player> controlmost = new ArrayList<Player>();
+                List<Player> controlmost = new ArrayList<>();
                 for (final Player p : game.getPlayers()) {
                     final int num = p.getCardsIn(ZoneType.Battlefield).size();
                     if (num > typeNum) {
@@ -311,7 +311,7 @@ public class PlayerProperty {
                     type = TextUtil.fastReplace(type, "Only", "");
                 }
                 int typeNum = 0;
-                List<Player> controlmost = new ArrayList<Player>();
+                List<Player> controlmost = new ArrayList<>();
                 for (final Player p : game.getPlayers()) {
                     final int num = CardLists.getType(p.getCardsIn(ZoneType.Battlefield), type).size();
                     if (num > typeNum) {
@@ -332,7 +332,7 @@ public class PlayerProperty {
         } else if (property.startsWith("withLowest")) {
             if (property.substring(10).equals("Life")) {
                 int lowestLife = player.getLife();
-                List<Player> lowestlifep = new ArrayList<Player>();
+                List<Player> lowestlifep = new ArrayList<>();
                 for (final Player p : game.getPlayers()) {
                     if (p.getLife() == lowestLife) {
                         lowestlifep.add(p);
diff --git a/forge-game/src/main/java/forge/game/player/PlayerView.java b/forge-game/src/main/java/forge/game/player/PlayerView.java
index 989d70ecf38..ec65996b87c 100644
--- a/forge-game/src/main/java/forge/game/player/PlayerView.java
+++ b/forge-game/src/main/java/forge/game/player/PlayerView.java
@@ -41,7 +41,7 @@ public class PlayerView extends GameEntityView {
         if (players == null) {
             return null;
         }
-        TrackableCollection<PlayerView> collection = new TrackableCollection<PlayerView>();
+        TrackableCollection<PlayerView> collection = new TrackableCollection<>();
         for (Player p : players) {
             collection.add(p.getView());
         }
@@ -91,7 +91,7 @@ public class PlayerView extends GameEntityView {
     }
 
     public FCollectionView<PlayerView> getOpponents() {
-        return MoreObjects.firstNonNull(this.<FCollectionView<PlayerView>>get(TrackableProperty.Opponents), new FCollection<PlayerView>());
+        return MoreObjects.firstNonNull(this.<FCollectionView<PlayerView>>get(TrackableProperty.Opponents), new FCollection<>());
     }
     void updateOpponents(Player p) {
         set(TrackableProperty.Opponents, PlayerView.getCollection(p.getOpponents()));
@@ -262,7 +262,7 @@ public class PlayerView extends GameEntityView {
         return damage == null ? 0 : damage.intValue();
     }
     void updateCommanderDamage(Player p) {
-        Map<Integer, Integer> map = new HashMap<Integer, Integer>();
+        Map<Integer, Integer> map = new HashMap<>();
         for (Entry<Card, Integer> entry : p.getCommanderDamage()) {
             map.put(entry.getKey().getId(), entry.getValue());
         }
@@ -415,7 +415,7 @@ public class PlayerView extends GameEntityView {
         return get(TrackableProperty.Mana);
     }
     void updateMana(Player p) {
-        Map<Byte, Integer> mana = new HashMap<Byte, Integer>();
+        Map<Byte, Integer> mana = new HashMap<>();
         for (byte b : ManaAtom.MANATYPES) {
             mana.put(b, p.getManaPool().getAmountOfColor(b));
         }
diff --git a/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java b/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java
index aedf99e5774..094b94ad796 100644
--- a/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java
+++ b/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java
@@ -19,7 +19,7 @@ public class RegisteredPlayer {
     private final Deck originalDeck; // never return or modify this instance (it's a reference to game resources)
     private Deck currentDeck;
 
-    private static final Iterable<PaperCard> EmptyList = Collections.unmodifiableList(new ArrayList<PaperCard>());
+    private static final Iterable<PaperCard> EmptyList = Collections.unmodifiableList(new ArrayList<>());
     
     private LobbyPlayer player = null;
     
diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java
index c53c34bd3ce..0c3f01508a6 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java
@@ -363,7 +363,7 @@ public class SpellAbilityCondition extends SpellAbilityVariables {
         }
 
         if (this.getPlayerContains() != null) {
-            List<Player> list = new ArrayList<Player>();
+            List<Player> list = new ArrayList<>();
             if (this.getPlayerDefined() != null) {
                 list.addAll(AbilityUtils.getDefinedPlayers(sa.getHostCard(), this.getPlayerDefined(), sa));
             }
diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityView.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityView.java
index 3c0bb190692..20e3d91e522 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityView.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityView.java
@@ -17,7 +17,7 @@ public class SpellAbilityView extends TrackableObject implements IHasCardView {
         if (spabs == null) {
             return null;
         }
-        TrackableCollection<SpellAbilityView> collection = new TrackableCollection<SpellAbilityView>();
+        TrackableCollection<SpellAbilityView> collection = new TrackableCollection<>();
         for (SpellAbility spab : spabs) {
             collection.add(spab.getView());
         }
diff --git a/forge-game/src/main/java/forge/game/spellability/StackItemView.java b/forge-game/src/main/java/forge/game/spellability/StackItemView.java
index 22ab4d46cad..efe19f0786e 100644
--- a/forge-game/src/main/java/forge/game/spellability/StackItemView.java
+++ b/forge-game/src/main/java/forge/game/spellability/StackItemView.java
@@ -19,7 +19,7 @@ public class StackItemView extends TrackableObject implements IHasCardView {
         if (instances == null) {
             return null;
         }
-        TrackableCollection<StackItemView> collection = new TrackableCollection<StackItemView>();
+        TrackableCollection<StackItemView> collection = new TrackableCollection<>();
         for (SpellAbilityStackInstance si : instances) {
             collection.add(si.getView());
         }
diff --git a/forge-game/src/main/java/forge/game/spellability/TargetChoices.java b/forge-game/src/main/java/forge/game/spellability/TargetChoices.java
index 6391ab5b509..4d1c812d141 100644
--- a/forge-game/src/main/java/forge/game/spellability/TargetChoices.java
+++ b/forge-game/src/main/java/forge/game/spellability/TargetChoices.java
@@ -41,8 +41,8 @@ public class TargetChoices implements Cloneable {
 
     // Card or Player are legal targets.
     private final CardCollection targetCards = new CardCollection();
-    private final List<Player> targetPlayers = new ArrayList<Player>();
-    private final List<SpellAbility> targetSpells = new ArrayList<SpellAbility>();
+    private final List<Player> targetPlayers = new ArrayList<>();
+    private final List<SpellAbility> targetSpells = new ArrayList<>();
 
     public final int getNumTargeted() {
         return numTargeted;
@@ -117,7 +117,7 @@ public class TargetChoices implements Cloneable {
     }
 
     public final List<GameObject> getTargets() {
-        final List<GameObject> tgts = new ArrayList<GameObject>();
+        final List<GameObject> tgts = new ArrayList<>();
         tgts.addAll(targetPlayers);
         tgts.addAll(targetCards);
         tgts.addAll(targetSpells);
diff --git a/forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java b/forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java
index 270e57585b2..84cf024fd13 100644
--- a/forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java
+++ b/forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java
@@ -77,7 +77,7 @@ public class TargetRestrictions {
 
     // For "Divided" cards. Is this better in TargetChoices?
     private boolean dividedAsYouChoose = false;
-    private HashMap<Object, Integer> dividedMap = new HashMap<Object, Integer>();
+    private HashMap<Object, Integer> dividedMap = new HashMap<>();
     private int stillToDivide = 0;
     
     // Not sure what's up with Mandatory? Why wouldn't targeting be mandatory?
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
index 3e6b6e3fb86..0f66693ebba 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
@@ -750,7 +750,7 @@ public final class StaticAbilityContinuous {
     }
 
     private static void buildIgnorEffectAbility(final StaticAbility stAb, final String costString, final List<Player> players, final CardCollectionView cards) {
-        final List<Player> validActivator = new ArrayList<Player>(players);
+        final List<Player> validActivator = new ArrayList<>(players);
         for (final Card c : cards) {
             validActivator.add(c.getController());
         }
@@ -793,7 +793,7 @@ public final class StaticAbilityContinuous {
         final Card hostCard = stAb.getHostCard();
         final Player controller = hostCard.getController();
 
-        final List<Player> players = new ArrayList<Player>();
+        final List<Player> players = new ArrayList<>();
 
         if (!params.containsKey("Affected")) {
             return players;
diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java
index e901efcb665..09972042775 100644
--- a/forge-game/src/main/java/forge/game/trigger/Trigger.java
+++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java
@@ -122,7 +122,7 @@ public abstract class Trigger extends TriggerReplacementBase {
         this.id = nextId();
         this.intrinsic = intrinsic;
 
-        this.setRunParams(new HashMap<String, Object>()); // TODO: Consider whether this can be null instead, for performance reasons.
+        this.setRunParams(new HashMap<>()); // TODO: Consider whether this can be null instead, for performance reasons.
         this.originalMapParams.putAll(params);
         this.mapParams.putAll(params);
         this.setHostCard(host);
@@ -303,7 +303,7 @@ public abstract class Trigger extends TriggerReplacementBase {
 
         if (this.mapParams.containsKey("APlayerHasMoreLifeThanEachOther")) {
             int highestLife = Integer.MIN_VALUE; // Negative base just in case a few Lich's or Platinum Angels are running around
-            final List<Player> healthiest = new ArrayList<Player>();
+            final List<Player> healthiest = new ArrayList<>();
             for (final Player p : game.getPlayers()) {
                 if (p.getLife() > highestLife) {
                     healthiest.clear();
@@ -323,7 +323,7 @@ public abstract class Trigger extends TriggerReplacementBase {
 
         if (this.mapParams.containsKey("APlayerHasMostCardsInHand")) {
             int largestHand = 0;
-            final List<Player> withLargestHand = new ArrayList<Player>();
+            final List<Player> withLargestHand = new ArrayList<>();
             for (final Player p : game.getPlayers()) {
                 if (p.getCardsIn(ZoneType.Hand).size() > largestHand) {
                     withLargestHand.clear();
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
index 85a7d8a1d6c..d44cc2af616 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
@@ -52,13 +52,13 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Multimaps;
 
 public class TriggerHandler {
-    private final List<TriggerType> suppressedModes = Collections.synchronizedList(new ArrayList<TriggerType>());
-    private final List<Trigger> activeTriggers = Collections.synchronizedList(new ArrayList<Trigger>());
+    private final List<TriggerType> suppressedModes = Collections.synchronizedList(new ArrayList<>());
+    private final List<Trigger> activeTriggers = Collections.synchronizedList(new ArrayList<>());
 
-    private final List<Trigger> delayedTriggers = Collections.synchronizedList(new ArrayList<Trigger>());
-    private final List<Trigger> thisTurnDelayedTriggers = Collections.synchronizedList(new ArrayList<Trigger>());
+    private final List<Trigger> delayedTriggers = Collections.synchronizedList(new ArrayList<>());
+    private final List<Trigger> thisTurnDelayedTriggers = Collections.synchronizedList(new ArrayList<>());
     private final ListMultimap<Player, Trigger> playerDefinedDelayedTriggers = Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
-    private final List<TriggerWaiting> waitingTriggers = Collections.synchronizedList(new ArrayList<TriggerWaiting>());
+    private final List<TriggerWaiting> waitingTriggers = Collections.synchronizedList(new ArrayList<>());
     private final Game game;
 
     public TriggerHandler(final Game gameState) {
@@ -127,7 +127,7 @@ public class TriggerHandler {
     }
 
     public final void clearDelayedTrigger(final Card card) {
-        final List<Trigger> deltrigs = new ArrayList<Trigger>(delayedTriggers);
+        final List<Trigger> deltrigs = new ArrayList<>(delayedTriggers);
 
         for (final Trigger trigger : deltrigs) {
             if (trigger.getHostCard().equals(card)) {
@@ -282,7 +282,7 @@ public class TriggerHandler {
     public final void clearInstrinsicActiveTriggers(final Card c, Zone zoneFrom) {
         final Iterator<Trigger> itr = activeTriggers.iterator();
         Trigger t;
-        final List<Trigger> toBeRemoved = new ArrayList<Trigger>();
+        final List<Trigger> toBeRemoved = new ArrayList<>();
 
         while(itr.hasNext()) {
             t = itr.next();
@@ -348,7 +348,7 @@ public class TriggerHandler {
     }
 
     public final boolean runWaitingTriggers() {
-        final List<TriggerWaiting> waiting = new ArrayList<TriggerWaiting>(waitingTriggers);
+        final List<TriggerWaiting> waiting = new ArrayList<>(waitingTriggers);
         waitingTriggers.clear();
         if (waiting.isEmpty()) {
             return false;
@@ -373,7 +373,7 @@ public class TriggerHandler {
         }
 
         // Copy triggers here, so things can be modified just in case
-        final List<Trigger> delayedTriggersWorkingCopy = new ArrayList<Trigger>(delayedTriggers);
+        final List<Trigger> delayedTriggersWorkingCopy = new ArrayList<>(delayedTriggers);
 
         boolean checkStatics = false;
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerVote.java b/forge-game/src/main/java/forge/game/trigger/TriggerVote.java
index 5b3aef0197b..4ed2b85ad2d 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerVote.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerVote.java
@@ -79,7 +79,7 @@ public class TriggerVote extends Trigger {
     private static FCollection<Player> getVoters(final Player player,
             final ListMultimap<Object, Player> votes,
             final boolean isOpponent, final boolean votedOtherchoice) {
-        final FCollection<Player> voters = new FCollection<Player>();
+        final FCollection<Player> voters = new FCollection<>();
         for (final Object voteType : votes.keySet()) {
             final List<Player> players = votes.get(voteType);
             if (votedOtherchoice ^ players.contains(player)) {
diff --git a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
index 827f5ff62b5..e48396c53a6 100644
--- a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
+++ b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
@@ -463,7 +463,7 @@ public class WrappedAbility extends Ability {
 
         if (triggerParams.containsKey("ResolvingCheck")) {
             // rare cases: Hidden Predators (state trigger, but have "Intervening If" to check IsPresent2) etc.
-            Map<String, String> recheck = new HashMap<String, String>();
+            Map<String, String> recheck = new HashMap<>();
             String key = triggerParams.get("ResolvingCheck");
             String value = regtrig.getMapParams().get(key);
             recheck.put(key, value);
@@ -532,7 +532,7 @@ public class WrappedAbility extends Ability {
                 }
             }
         }
-        final Map<String, Object> triggerMap = new HashMap<String, Object>(sa.getTriggeringObjects());
+        final Map<String, Object> triggerMap = new HashMap<>(sa.getTriggeringObjects());
         for (Entry<String, Object> ev : triggerMap.entrySet()) {
             if (ev.getValue() instanceof Card) {
                 Card card = (Card) ev.getValue();
diff --git a/forge-game/src/main/java/forge/game/zone/CostPaymentStack.java b/forge-game/src/main/java/forge/game/zone/CostPaymentStack.java
index f5717f517d6..f8c59d4983c 100644
--- a/forge-game/src/main/java/forge/game/zone/CostPaymentStack.java
+++ b/forge-game/src/main/java/forge/game/zone/CostPaymentStack.java
@@ -15,7 +15,7 @@ public class CostPaymentStack implements Iterable<IndividualCostPaymentInstance>
     private Stack<IndividualCostPaymentInstance> stack;
 
     public CostPaymentStack() {
-        stack = new Stack<IndividualCostPaymentInstance>();
+        stack = new Stack<>();
     }
 
     public IndividualCostPaymentInstance push(final CostPart cost, final CostPayment payment) {
diff --git a/forge-game/src/main/java/forge/game/zone/MagicStack.java b/forge-game/src/main/java/forge/game/zone/MagicStack.java
index bdaf3207197..fd40f536a70 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -72,9 +72,9 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
     private final List<SpellAbility> simultaneousStackEntryList = Lists.newArrayList();
 
     // They don't provide a LIFO queue, so had to use a deque
-    private final Deque<SpellAbilityStackInstance> stack = new LinkedBlockingDeque<SpellAbilityStackInstance>();
-    private final Stack<SpellAbilityStackInstance> frozenStack = new Stack<SpellAbilityStackInstance>();
-    private final Stack<SpellAbility> undoStack = new Stack<SpellAbility>();
+    private final Deque<SpellAbilityStackInstance> stack = new LinkedBlockingDeque<>();
+    private final Stack<SpellAbilityStackInstance> frozenStack = new Stack<>();
+    private final Stack<SpellAbility> undoStack = new Stack<>();
     private Player undoStackOwner;
 
     private boolean frozen = false;
diff --git a/forge-game/src/main/java/forge/game/zone/ZoneType.java b/forge-game/src/main/java/forge/game/zone/ZoneType.java
index 9f358f902de..3383a83cb14 100644
--- a/forge-game/src/main/java/forge/game/zone/ZoneType.java
+++ b/forge-game/src/main/java/forge/game/zone/ZoneType.java
@@ -46,7 +46,7 @@ public enum ZoneType {
     }
 
     public static List<ZoneType> listValueOf(final String values) {
-        final List<ZoneType> result = new ArrayList<ZoneType>();
+        final List<ZoneType> result = new ArrayList<>();
         for (final String s : values.split("[, ]+")) {
             ZoneType zt = ZoneType.smartValueOf(s);
             if (zt != null) {
diff --git a/forge-game/src/main/java/forge/trackable/TrackableObject.java b/forge-game/src/main/java/forge/trackable/TrackableObject.java
index a4318b4a829..280fe24d3d0 100644
--- a/forge-game/src/main/java/forge/trackable/TrackableObject.java
+++ b/forge-game/src/main/java/forge/trackable/TrackableObject.java
@@ -22,7 +22,7 @@ public abstract class TrackableObject implements IIdentifiable, Serializable {
     protected TrackableObject(final int id0, final Tracker tracker) {
         id = id0;
         this.tracker = tracker;
-        props = new EnumMap<TrackableProperty, Object>(TrackableProperty.class);
+        props = new EnumMap<>(TrackableProperty.class);
         changedProps = EnumSet.noneOf(TrackableProperty.class);
     }
 
diff --git a/forge-game/src/main/java/forge/trackable/TrackableTypes.java b/forge-game/src/main/java/forge/trackable/TrackableTypes.java
index d54c0f1bef3..6214563f8f7 100644
--- a/forge-game/src/main/java/forge/trackable/TrackableTypes.java
+++ b/forge-game/src/main/java/forge/trackable/TrackableTypes.java
@@ -376,7 +376,7 @@ public class TrackableTypes {
     public static final TrackableCollectionType<StackItemView> StackItemViewListType = new TrackableCollectionType<StackItemView>(StackItemViewType) {
         @Override
         protected TrackableCollection<StackItemView> getDefaultValue() {
-            return new TrackableCollection<StackItemView>();
+            return new TrackableCollection<>();
         }
 
         @Override
diff --git a/forge-gui-desktop/src/main/java/forge/ImageCache.java b/forge-gui-desktop/src/main/java/forge/ImageCache.java
index 7cc24a3df86..0bd9e3a87c9 100644
--- a/forge-gui-desktop/src/main/java/forge/ImageCache.java
+++ b/forge-gui-desktop/src/main/java/forge/ImageCache.java
@@ -61,7 +61,7 @@ import java.util.concurrent.TimeUnit;
 public class ImageCache {
     // short prefixes to save memory
 
-    private static final Set<String> _missingIconKeys = new HashSet<String>();
+    private static final Set<String> _missingIconKeys = new HashSet<>();
     private static final LoadingCache<String, BufferedImage> _CACHE = CacheBuilder.newBuilder()
             .maximumSize(FModel.getPreferences().getPrefInt((FPref.UI_IMAGE_CACHE_MAXIMUM)))
             .expireAfterAccess(15, TimeUnit.MINUTES)
diff --git a/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java b/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java
index 72ecf54fb83..25e76e0169e 100644
--- a/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java
+++ b/forge-gui-desktop/src/main/java/forge/control/KeyboardShortcuts.java
@@ -52,7 +52,7 @@ public class KeyboardShortcuts {
         final InputMap im = c.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
         final ActionMap am = c.getActionMap();
 
-        final List<Shortcut> list = new ArrayList<Shortcut>();
+        final List<Shortcut> list = new ArrayList<>();
 
         //========== Match Shortcuts
         /** Show stack. */
@@ -345,9 +345,9 @@ public class KeyboardShortcuts {
         List<String> existingCodes;
 
         if (codestring != null) {
-            existingCodes = new ArrayList<String>(Arrays.asList(codestring.split(" ")));
+            existingCodes = new ArrayList<>(Arrays.asList(codestring.split(" ")));
         } else {
-            existingCodes = new ArrayList<String>();
+            existingCodes = new ArrayList<>();
         }
 
         // Backspace (8) will remove last code from list.
diff --git a/forge-gui-desktop/src/main/java/forge/deckchooser/DecksComboBox.java b/forge-gui-desktop/src/main/java/forge/deckchooser/DecksComboBox.java
index 1f59867d680..d792948e01c 100644
--- a/forge-gui-desktop/src/main/java/forge/deckchooser/DecksComboBox.java
+++ b/forge-gui-desktop/src/main/java/forge/deckchooser/DecksComboBox.java
@@ -27,9 +27,9 @@ public class DecksComboBox extends FComboBoxWrapper<DeckType> {
 
     public void refresh(final DeckType deckType, final boolean isForCommander) {
         if(isForCommander){
-            setModel(new DefaultComboBoxModel<DeckType>(DeckType.CommanderOptions));
+            setModel(new DefaultComboBoxModel<>(DeckType.CommanderOptions));
         }else {
-            setModel(new DefaultComboBoxModel<DeckType>(DeckType.ConstructedOptions));
+            setModel(new DefaultComboBoxModel<>(DeckType.ConstructedOptions));
         }
         setSelectedItem(deckType);
     }
diff --git a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java
index 3d218ce0fd8..c25f55b5d78 100644
--- a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java
+++ b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java
@@ -506,13 +506,13 @@ public class FDeckChooser extends JPanel implements IDecksComboBoxListener {
     private List<String> getSelectedDecksFromSavedState(final String savedState) {
         try {
             if (StringUtils.isBlank(savedState)) {
-                return new ArrayList<String>();
+                return new ArrayList<>();
             } else {
                 return Arrays.asList(savedState.split(";")[1].split(SELECTED_DECK_DELIMITER));
             }
         } catch (final Exception ex) {
             System.err.println(ex + " [savedState=" + savedState + "]");
-            return new ArrayList<String>();
+            return new ArrayList<>();
         }
     }
 
diff --git a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java
index a28f4a94202..7ee3252e5a1 100644
--- a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java
+++ b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckViewer.java
@@ -36,7 +36,7 @@ import java.util.TreeMap;
 @SuppressWarnings("serial")
 public class FDeckViewer extends FDialog {
     private final Deck deck;
-    private final List<DeckSection> sections = new ArrayList<DeckSection>();
+    private final List<DeckSection> sections = new ArrayList<>();
     private final CardManager cardManager;
     private DeckSection currentSection;
 
diff --git a/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java b/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java
index 3b9eaa6d65d..1f06e198b63 100644
--- a/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java
+++ b/forge-gui-desktop/src/main/java/forge/error/BugReportDialog.java
@@ -67,7 +67,7 @@ public class BugReportDialog {
 
         // Button is not modified, String gets the automatic listener to hide
         // the dialog
-        List<Object> options = new ArrayList<Object>();
+        List<Object> options = new ArrayList<>();
         options.add(new JButton(new _Report()));
         // option to enable automatic Sentry submission
         options.add(new JCheckBox(new _ActivateSentry()));
diff --git a/forge-gui-desktop/src/main/java/forge/gui/BoxedProductCardListViewer.java b/forge-gui-desktop/src/main/java/forge/gui/BoxedProductCardListViewer.java
index 98343afae07..d62d8bd0f62 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/BoxedProductCardListViewer.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/BoxedProductCardListViewer.java
@@ -100,7 +100,7 @@ public class BoxedProductCardListViewer extends FDialog {
      */
     public BoxedProductCardListViewer(final String title, final String message, final List<PaperCard> list, final Icon dialogIcon) {
         this.list = Collections.unmodifiableList(list);
-        this.jList = new JList<PaperCard>(new ChooserListModel());
+        this.jList = new JList<>(new ChooserListModel());
         this.detail = new CardDetailPanel();
         this.picture = new CardPicturePanel();
         this.picture.setOpaque(false);
diff --git a/forge-gui-desktop/src/main/java/forge/gui/CardListViewer.java b/forge-gui-desktop/src/main/java/forge/gui/CardListViewer.java
index 620b0b2ce3d..8a9a98c6530 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/CardListViewer.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/CardListViewer.java
@@ -98,7 +98,7 @@ public class CardListViewer extends FDialog {
      */
     public CardListViewer(final String title, final String message, final List<PaperCard> list, final Icon dialogIcon) {
         this.list = Collections.unmodifiableList(list);
-        this.jList = new JList<PaperCard>(new ChooserListModel());
+        this.jList = new JList<>(new ChooserListModel());
         this.detail = new CardDetailPanel();
         this.picture = new CardPicturePanel();
         this.picture.setOpaque(false);
diff --git a/forge-gui-desktop/src/main/java/forge/gui/DualListBox.java b/forge-gui-desktop/src/main/java/forge/gui/DualListBox.java
index 7943e5fb22c..02f7034d946 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/DualListBox.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/DualListBox.java
@@ -79,10 +79,10 @@ public class DualListBox<T> extends FDialog {
 
         targetRemainingSourcesMin = remainingSourcesMin;
         targetRemainingSourcesMax = remainingSourcesMax;
-        sourceListModel = new UnsortedListModel<T>();
-        sourceList = new FList<T>(sourceListModel);
-        destListModel = new UnsortedListModel<T>();
-        destList = new FList<T>(destListModel);
+        sourceListModel = new UnsortedListModel<>();
+        sourceList = new FList<>(sourceListModel);
+        destListModel = new UnsortedListModel<>();
+        destList = new FList<>(destListModel);
 
         final Runnable onAdd = new Runnable() {
             @SuppressWarnings("unchecked")
@@ -90,7 +90,7 @@ public class DualListBox<T> extends FDialog {
             public void run() {
                 if (!addButton.isEnabled()) { return; }
 
-                List<T> selected = new ArrayList<T>();
+                List<T> selected = new ArrayList<>();
                 for (Object item : sourceList.getSelectedValuesList()) {
                     selected.add((T)item);
                 }
@@ -107,7 +107,7 @@ public class DualListBox<T> extends FDialog {
             public void run() {
                 if (!removeButton.isEnabled()) { return; }
 
-                List<T> selected = new ArrayList<T>();
+                List<T> selected = new ArrayList<>();
                 for (Object item : destList.getSelectedValuesList()) {
                     selected.add((T)item);
                 }
diff --git a/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java b/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java
index a5db47f9733..b47791c4b84 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java
@@ -89,7 +89,7 @@ public class GuiChoose {
             return getInteger(message, min, max);
         }
 
-        final List<Object> choices = new ArrayList<Object>();
+        final List<Object> choices = new ArrayList<>();
         for (int i = min; i <= cutoff; i++) {
             choices.add(Integer.valueOf(i));
         }
@@ -143,7 +143,7 @@ public class GuiChoose {
     public static <T> List<T> getChoices(final String message, final int min, final int max, final Collection<T> choices, final T selected, final Function<T, String> display, final CMatchUI matchUI) {
         if (choices == null || choices.isEmpty()) {
             if (min == 0) {
-                return new ArrayList<T>();
+                return new ArrayList<>();
             }
             throw new RuntimeException("choice required from empty list");
         }
@@ -151,7 +151,7 @@ public class GuiChoose {
         final Callable<List<T>> showChoice = new Callable<List<T>>() {
             @Override
             public List<T> call() {
-                final ListChooser<T> c = new ListChooser<T>(message, min, max, choices, display);
+                final ListChooser<T> c = new ListChooser<>(message, min, max, choices, display);
                 final JList<T> list = c.getLstChoices();
                 if (matchUI != null) {
                     list.addListSelectionListener(new ListSelectionListener() {
@@ -224,7 +224,7 @@ public class GuiChoose {
             }
         };
 
-        final FutureTask<List<T>> future = new FutureTask<List<T>>(showChoice);
+        final FutureTask<List<T>> future = new FutureTask<>(showChoice);
         FThreads.invokeInEdtAndWait(future);
         try {
             return future.get();
@@ -251,7 +251,7 @@ public class GuiChoose {
         final Callable<List<T>> callable = new Callable<List<T>>() {
             @Override
             public List<T> call() {
-                final DualListBox<T> dual = new DualListBox<T>(remainingObjectsMin, remainingObjectsMax, sourceChoices, destChoices, matchUI);
+                final DualListBox<T> dual = new DualListBox<>(remainingObjectsMin, remainingObjectsMax, sourceChoices, destChoices, matchUI);
                 dual.setSecondColumnLabelText(top);
 
                 dual.setSideboardMode(sideboardingMode);
@@ -275,7 +275,7 @@ public class GuiChoose {
             }
         };
 
-        final FutureTask<List<T>> ft = new FutureTask<List<T>>(callable);
+        final FutureTask<List<T>> ft = new FutureTask<>(callable);
         FThreads.invokeInEdtAndWait(ft);
         try {
             return ft.get();
@@ -298,7 +298,7 @@ public class GuiChoose {
 		    return cardList;
 		}
 	    };
-	final FutureTask<List<CardView>> ft = new FutureTask<List<CardView>>(callable);
+	final FutureTask<List<CardView>> ft = new FutureTask<>(callable);
         FThreads.invokeInEdtAndWait(ft);
 	gui.clearSelectables();
         try {
diff --git a/forge-gui-desktop/src/main/java/forge/gui/GuiDialog.java b/forge-gui-desktop/src/main/java/forge/gui/GuiDialog.java
index 1152cc40270..6924ba602ae 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/GuiDialog.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/GuiDialog.java
@@ -35,7 +35,7 @@ public class GuiDialog {
                 return Boolean.valueOf(answer == 0);
             }};
 
-        final FutureTask<Boolean> future = new FutureTask<Boolean>(confirmTask);
+        final FutureTask<Boolean> future = new FutureTask<>(confirmTask);
         FThreads.invokeInEdtAndWait(future);
         try {
             return future.get().booleanValue();
diff --git a/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java b/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java
index 1ff99429027..0b4880b2f3f 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java
@@ -313,7 +313,7 @@ public class ImportDialog {
         // associates a file operation type with its enablement checkbox and the set
         // of file move/copy operations that enabling it would entail
         private final Map<OpType, Pair<FCheckBox, ? extends Map<File, File>>> _selections =
-                new HashMap<OpType, Pair<FCheckBox, ? extends Map<File, File>>>();
+                new HashMap<>();
 
         // attached to all changeable widgets to keep the UI in sync
         private final ChangeListener _stateChangedListener = new ChangeListener() {
@@ -359,7 +359,7 @@ public class ImportDialog {
             _addSelectionWidget(knownDeckPanel, OpType.UNKNOWN_DECK,     "Unknown decks");
             final JPanel unknownDeckPanel = new JPanel(new MigLayout("insets 0, gap 5"));
             unknownDeckPanel.setOpaque(false);
-            _unknownDeckCombo = new FComboBoxWrapper<_UnknownDeckChoice>();
+            _unknownDeckCombo = new FComboBoxWrapper<>();
             _unknownDeckCombo.addItem(new _UnknownDeckChoice("Constructed", ForgeConstants.DECK_CONSTRUCTED_DIR));
             _unknownDeckCombo.addItem(new _UnknownDeckChoice("Draft",       ForgeConstants.DECK_DRAFT_DIR));
             _unknownDeckCombo.addItem(new _UnknownDeckChoice("Planar",      ForgeConstants.DECK_PLANE_DIR));
@@ -464,14 +464,14 @@ public class ImportDialog {
             // use a skip list map instead of a regular hashmap so that the files are sorted
             // alphabetically in the logs.  note that this is a concurrent data structure
             // since it will be modified and read simultaneously by different threads
-            _selections.put(type, Pair.of(cb, new ConcurrentSkipListMap<File, File>()));
+            _selections.put(type, Pair.of(cb, new ConcurrentSkipListMap<>()));
             parent.add(cb, constraints);
         }
 
         // must be called from GUI event loop thread
         private void _updateUI() {
             // update checkbox text labels with current totals
-            final Set<OpType> selectedOptions = new HashSet<OpType>();
+            final Set<OpType> selectedOptions = new HashSet<>();
             for (final Map.Entry<OpType, Pair<FCheckBox, ? extends Map<File, File>>> entry : _selections.entrySet()) {
                 final Pair<FCheckBox, ? extends Map<File, File>> selection = entry.getValue();
                 final FCheckBox cb = selection.getLeft();
@@ -494,7 +494,7 @@ public class ImportDialog {
             Timer timer = null;
 
             try {
-                final Map<OpType, Map<File, File>> selections = new HashMap<OpType, Map<File, File>>();
+                final Map<OpType, Map<File, File>> selections = new HashMap<>();
                 for (final Map.Entry<OpType, Pair<FCheckBox, ? extends Map<File, File>>> entry : _selections.entrySet()) {
                     selections.put(entry.getKey(), entry.getValue().getRight());
                 }
@@ -607,7 +607,7 @@ public class ImportDialog {
                         // user an option to fix
                         if (_isMigration) {
                             // assemble a list of selections that need to be selected to complete a full migration
-                            final List<String> unselectedButShouldBe = new ArrayList<String>();
+                            final List<String> unselectedButShouldBe = new ArrayList<>();
                             for (final Map.Entry<OpType, Pair<FCheckBox, ? extends Map<File, File>>> entry : _selections.entrySet()) {
                                 if (OpType.POSSIBLE_SET_CARD_PIC == entry.getKey()) {
                                     continue;
@@ -709,7 +709,7 @@ public class ImportDialog {
             super("OperationLogUpdater");
             setDaemon(true);
 
-            _selections   = new HashMap<OpType, Map<File, File>>();
+            _selections   = new HashMap<>();
             _operationLog = operationLog;
 
             // remove references to FCheckBox when populating map -- we can't safely access it from a thread
@@ -844,7 +844,7 @@ public class ImportDialog {
 
             // build local operations map that only includes data that we can access from the background thread
             // use a tree map to maintain alphabetical order
-            _operations = new TreeMap<File, File>();
+            _operations = new TreeMap<>();
             for (final Map.Entry<OpType, Pair<FCheckBox, ? extends Map<File, File>>> entry : selections.entrySet()) {
                 final Pair<FCheckBox, ? extends Map<File, File>> selection = entry.getValue();
                 if (selection.getLeft().isSelected()) {
diff --git a/forge-gui-desktop/src/main/java/forge/gui/ListChooser.java b/forge-gui-desktop/src/main/java/forge/gui/ListChooser.java
index ae670d53f84..123e612e206 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/ListChooser.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/ListChooser.java
@@ -87,7 +87,7 @@ public class ListChooser<T> {
         this.minChoices = minChoices;
         this.maxChoices = maxChoices;
         this.list = list.getClass().isInstance(List.class) ? (List<T>)list : Lists.newArrayList(list);
-        this.lstChoices = new FList<T>(new ChooserListModel());
+        this.lstChoices = new FList<>(new ChooserListModel());
 
         final ImmutableList<String> options;
         if (minChoices == 0) {
diff --git a/forge-gui-desktop/src/main/java/forge/gui/MultiLineLabelUI.java b/forge-gui-desktop/src/main/java/forge/gui/MultiLineLabelUI.java
index 74084fea249..69f585fc7fd 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/MultiLineLabelUI.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/MultiLineLabelUI.java
@@ -517,7 +517,7 @@ public class MultiLineLabelUI extends BasicLabelUI implements ComponentListener
      * @return a list of text lines to render
      */
     protected List<String> prepareLines(final JLabel l) {
-        final List<String> lines = new ArrayList<String>(MultiLineLabelUI.defaultSize);
+        final List<String> lines = new ArrayList<>(MultiLineLabelUI.defaultSize);
         final String text = l.getText();
         if (text == null) {
             return null; // Null guard
@@ -603,7 +603,7 @@ public class MultiLineLabelUI extends BasicLabelUI implements ComponentListener
         /**
          * Reused segments.
          */
-        private final List<Segment> segments = new ArrayList<Segment>(2);
+        private final List<Segment> segments = new ArrayList<>(2);
 
         /**
          * Singleton instance.
diff --git a/forge-gui-desktop/src/main/java/forge/gui/UnsortedListModel.java b/forge-gui-desktop/src/main/java/forge/gui/UnsortedListModel.java
index 26ffe0ad346..19030dcc8cd 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/UnsortedListModel.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/UnsortedListModel.java
@@ -44,7 +44,7 @@ public class UnsortedListModel<T> extends AbstractListModel<T> {
     }
 
     public void addAll(final ListModel<T> otherModel) {
-        final Collection<T> elements = new ArrayList<T>();
+        final Collection<T> elements = new ArrayList<>();
         final int size = otherModel.getSize();
         for (int i = 0; size > i; ++i) {
             elements.add(otherModel.getElementAt(i));
diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/DragCell.java b/forge-gui-desktop/src/main/java/forge/gui/framework/DragCell.java
index ded574680bb..cd127e8f352 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/framework/DragCell.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/framework/DragCell.java
@@ -50,7 +50,7 @@ public final class DragCell extends JPanel implements ILocalRepaint {
     private final int margin = 2 * tabPaddingPx;
 
     // Tab handling layout stuff
-    private final List<IVDoc<? extends ICDoc>> allDocs = new ArrayList<IVDoc<? extends ICDoc>>();
+    private final List<IVDoc<? extends ICDoc>> allDocs = new ArrayList<>();
     private final JLabel lblHandle = new DragHandle();
     private final JLabel lblOverflow = new JLabel();
     private IVDoc<? extends ICDoc> docSelected = null;
@@ -355,7 +355,7 @@ public final class DragCell extends JPanel implements ILocalRepaint {
         if (allDocs.isEmpty())      { return; }
 
         // Order tabs by priority
-        final List<DragTab> priority = new ArrayList<DragTab>();
+        final List<DragTab> priority = new ArrayList<>();
         final DragTab selectedTab = docSelected.getTabLabel();
         DragTab nextTab = selectedTab;
 
diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java b/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java
index b809f33f005..8c2f6a38f3e 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java
@@ -556,7 +556,7 @@ public final class SLayoutIO {
         EDocID selectedId = null;
         double x0 = 0, y0 = 0, w0 = 0, h0 = 0;
         
-        MapOfLists<LayoutInfo, EDocID> model = new HashMapOfLists<LayoutInfo, EDocID>(CollectionSuppliers.arrayLists());
+        MapOfLists<LayoutInfo, EDocID> model = new HashMapOfLists<>(CollectionSuppliers.arrayLists());
         
         LayoutInfo currentKey = null;
         while (null != reader && reader.hasNext()) {
diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/SRearrangingUtil.java b/forge-gui-desktop/src/main/java/forge/gui/framework/SRearrangingUtil.java
index 73b0e1cd4a8..83144ef6a40 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/framework/SRearrangingUtil.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/framework/SRearrangingUtil.java
@@ -45,7 +45,7 @@ public final class SRearrangingUtil {
     private static DragCell cellSrc                        = null;
     private static DragCell cellNew                        = null;
     private static Dropzone dropzone                       = Dropzone.NONE;
-    private static List<IVDoc<? extends ICDoc>> docsToMove = new ArrayList<IVDoc<? extends ICDoc>>();
+    private static List<IVDoc<? extends ICDoc>> docsToMove = new ArrayList<>();
     private static IVDoc<? extends ICDoc> srcSelectedDoc   = null;
 
     private static final SkinCursor CUR_L = FSkin.getCursor(FSkinProp.IMG_CUR_L, 16, 16, "CUR_L");
@@ -312,7 +312,7 @@ public final class SRearrangingUtil {
      * from any side which shares corners with the gap.  */
     private static void fillGap() {
         // Variables to help with matching the borders
-        final List<DragCell> cellsToResize = new ArrayList<DragCell>();
+        final List<DragCell> cellsToResize = new ArrayList<>();
         final int srcX = cellSrc.getAbsX();
         final int srcX2 = cellSrc.getAbsX2();
         final int srcY = cellSrc.getAbsY();
diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/SResizingUtil.java b/forge-gui-desktop/src/main/java/forge/gui/framework/SResizingUtil.java
index dfc7c4c3fcd..5c6902bd3cc 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/framework/SResizingUtil.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/framework/SResizingUtil.java
@@ -22,10 +22,10 @@ import java.util.List;
  * <br><br><i>(S at beginning of class name denotes a static factory.)</i>
  */
 public final class SResizingUtil {
-    private static final List<DragCell> LEFT_PANELS = new ArrayList<DragCell>();
-    private static final List<DragCell> RIGHT_PANELS = new ArrayList<DragCell>();
-    private static final List<DragCell> TOP_PANELS = new ArrayList<DragCell>();
-    private static final List<DragCell> BOTTOM_PANELS = new ArrayList<DragCell>();
+    private static final List<DragCell> LEFT_PANELS = new ArrayList<>();
+    private static final List<DragCell> RIGHT_PANELS = new ArrayList<>();
+    private static final List<DragCell> TOP_PANELS = new ArrayList<>();
+    private static final List<DragCell> BOTTOM_PANELS = new ArrayList<>();
 
     private static int dX;
     private static int evtX;
@@ -135,7 +135,7 @@ public final class SResizingUtil {
         double roughVal = 0;
         int smoothVal = 0;
         
-        Set<Component> existingComponents = new HashSet<Component>();
+        Set<Component> existingComponents = new HashSet<>();
         for (Component c : pnlContent.getComponents()) {
             existingComponents.add(c);
         }
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
index 3ebaff3221a..caf187048ea 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
@@ -49,7 +49,7 @@ public class CardManager extends ItemManager<PaperCard> {
     @Override
     protected Iterable<Entry<PaperCard, Integer>> getUnique(Iterable<Entry<PaperCard, Integer>> items) {
         //use special technique for getting unique cards so that cards without art aren't shown
-        HashMap<String, Entry<PaperCard, Integer>> map = new HashMap<String, Entry<PaperCard, Integer>>();
+        HashMap<String, Entry<PaperCard, Integer>> map = new HashMap<>();
         for (Entry<PaperCard, Integer> item : items) {
             final String key = item.getKey().getName();
             final Entry<PaperCard, Integer> oldValue = map.get(key);
@@ -218,7 +218,7 @@ public class CardManager extends ItemManager<PaperCard> {
                     filter.edit();
                 }
                 else {
-                    filter = new AdvancedSearchFilter<PaperCard>(itemManager);
+                    filter = new AdvancedSearchFilter<>(itemManager);
                     itemManager.lockFiltering = true; //ensure filter not applied until added
                     boolean result = filter.edit();
                     itemManager.lockFiltering = false;
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
index b5d1755ebc0..10ff32736d7 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
@@ -108,7 +108,7 @@ public final class DeckManager extends ItemManager<DeckProxy> implements IHasGam
         if (config0.getCols().containsKey(ColumnDef.DECK_ACTIONS)) {
             final ItemTableColumn column = new ItemTableColumn(new ItemColumn(config0.getCols().get(ColumnDef.DECK_ACTIONS)));
             column.setCellRenderer(new DeckActionsRenderer());
-            colOverrides = new HashMap<ColumnDef, ItemTableColumn>();
+            colOverrides = new HashMap<>();
             colOverrides.put(ColumnDef.DECK_ACTIONS, column);
         }
         super.setup(config0, colOverrides);
@@ -307,7 +307,7 @@ public final class DeckManager extends ItemManager<DeckProxy> implements IHasGam
                     filter.edit();
                 }
                 else {
-                    filter = new AdvancedSearchFilter<DeckProxy>(DeckManager.this);
+                    filter = new AdvancedSearchFilter<>(DeckManager.this);
                     lockFiltering = true; //ensure filter not applied until added
                     boolean result = filter.edit();
                     lockFiltering = false;
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java
index 887196a8970..11ee664dc7c 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/ItemManager.java
@@ -77,8 +77,8 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
     private final ItemManagerModel<T> model;
     private Predicate<? super T> filterPredicate = null;
     private final Map<Class<? extends ItemFilter<? extends T>>, List<ItemFilter<? extends T>>> filters =
-            new HashMap<Class<? extends ItemFilter<? extends T>>, List<ItemFilter<? extends T>>>();
-    private final List<ItemFilter<? extends T>> orderedFilters = new ArrayList<ItemFilter<? extends T>>();
+            new HashMap<>();
+    private final List<ItemFilter<? extends T>> orderedFilters = new ArrayList<>();
     private boolean wantUnique = false;
     private boolean alwaysNonUnique = false;
     private boolean allowMultipleSelections = false;
@@ -88,7 +88,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
     private final Class<T> genericType;
     private final CDetailPicture cDetailPicture;
     private ItemManagerConfig config;
-    private final List<ListSelectionListener> selectionListeners = new ArrayList<ListSelectionListener>();
+    private final List<ListSelectionListener> selectionListeners = new ArrayList<>();
 
     private final ItemFilter<? extends T> mainSearchFilter;
     private final SkinnedPanel pnlButtons = new SkinnedPanel(new MigLayout("insets 0, gap 0, ax center, hidemode 3"));
@@ -125,7 +125,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
         .tooltip("Toggle to show/hide options for current view")
         .build();
 
-    private final List<ItemView<T>> views = new ArrayList<ItemView<T>>();
+    private final List<ItemView<T>> views = new ArrayList<>();
     private final ItemListView<T> listView;
     private final ImageView<T> imageView;
     private ItemView<T> currentView;
@@ -143,12 +143,12 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
         this.cDetailPicture = cDetailPicture;
         this.genericType = genericType0;
         this.wantUnique = wantUnique0;
-        this.model = new ItemManagerModel<T>(genericType0);
+        this.model = new ItemManagerModel<>(genericType0);
 
         this.mainSearchFilter = createSearchFilter();
         this.mainSearchFilter.setAllowRemove(false);
 
-        this.listView = new ItemListView<T>(this, this.model);
+        this.listView = new ItemListView<>(this, this.model);
         this.imageView = createImageView(this.model);
 
         this.views.add(this.listView);
@@ -157,7 +157,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
     }
 
     protected ImageView<T> createImageView(final ItemManagerModel<T> model0) {
-        return new ImageView<T>(this, model0);
+        return new ImageView<>(this, model0);
     }
 
     public final CDetailPicture getCDetailPicture() {
@@ -562,7 +562,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
      */
     @Override
     public ItemPool<T> getSelectedItemPool() {
-        final ItemPool<T> selectedItemPool = new ItemPool<T>(this.genericType);
+        final ItemPool<T> selectedItemPool = new ItemPool<>(this.genericType);
         for (final T item : getSelectedItems()) {
             selectedItemPool.add(item, getItemCount(item));
         }
@@ -634,7 +634,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
      */
     @Override
     public boolean setSelectedStrings(final Iterable<String> strings) {
-        final List<T> items = new ArrayList<T>();
+        final List<T> items = new ArrayList<>();
         for (final String str : strings) {
             final T item = stringToItem(str);
             if (item != null) {
@@ -652,7 +652,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
      */
     @Override
     public boolean selectItemEntrys(final Iterable<Entry<T, Integer>> itemEntrys) {
-        final List<T> items = new ArrayList<T>();
+        final List<T> items = new ArrayList<>();
         for (final Entry<T, Integer> itemEntry : itemEntrys) {
             items.add(itemEntry.getKey());
         }
@@ -734,7 +734,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
         if (this.isUnfiltered()) {
             this.model.addItem(item, qty);
         }
-        final List<T> items = new ArrayList<T>();
+        final List<T> items = new ArrayList<>();
         items.add(item);
         this.updateView(false, items);
     }
@@ -755,7 +755,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
             this.model.addItems(itemsToAdd);
         }
 
-        final List<T> items = new ArrayList<T>();
+        final List<T> items = new ArrayList<>();
         for (final Map.Entry<T, Integer> item : itemsToAdd) {
             items.add(item.getKey());
         }
@@ -857,7 +857,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
     @SuppressWarnings("unchecked")
     public void addFilter(final ItemFilter<? extends T> filter) {
         final Class<? extends ItemFilter<? extends T>> filterClass = (Class<? extends ItemFilter<? extends T>>) filter.getClass();
-        List<ItemFilter<? extends T>> classFilters = this.filters.computeIfAbsent(filterClass, k -> new ArrayList<ItemFilter<? extends T>>());
+        List<ItemFilter<? extends T>> classFilters = this.filters.computeIfAbsent(filterClass, k -> new ArrayList<>());
         if (classFilters.size() > 0) {
             //if filter with the same class already exists, try to merge if allowed
             //NOTE: can always use first filter for these checks since if
@@ -932,7 +932,7 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel implem
     public boolean applyFilters() {
         if (this.lockFiltering || !this.initialized) { return false; }
 
-        final List<Predicate<? super T>> predicates = new ArrayList<Predicate<? super T>>();
+        final List<Predicate<? super T>> predicates = new ArrayList<>();
         for (final ItemFilter<? extends T> filter : this.orderedFilters) { //TODO: Support custom filter logic
             if (filter.isEnabled() && !filter.isEmpty()) {
                 predicates.add(filter.buildPredicate(this.genericType));
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java
index 30f671c7957..2c6ff484f2a 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/AdvancedSearchFilter.java
@@ -38,7 +38,7 @@ public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T>
 
     public AdvancedSearchFilter(ItemManager<? super T> itemManager0) {
         super(itemManager0);
-        model = new AdvancedSearch.Model<T>();
+        model = new AdvancedSearch.Model<>();
     }
 
     @Override
@@ -54,7 +54,7 @@ public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T>
 
     @Override
     public ItemFilter<T> createCopy() {
-        return new AdvancedSearchFilter<T>(itemManager);
+        return new AdvancedSearchFilter<>(itemManager);
     }
 
     @Override
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardCMCFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardCMCFilter.java
index 6a040c82653..8b66faa6d9d 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardCMCFilter.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardCMCFilter.java
@@ -44,7 +44,7 @@ public class CardCMCFilter extends StatTypeFilter<PaperCard> {
 
     @Override
     protected final Predicate<PaperCard> buildPredicate() {
-        final List<Predicate<CardRules>> cmcs = new ArrayList<Predicate<CardRules>>();
+        final List<Predicate<CardRules>> cmcs = new ArrayList<>();
 
         for (StatTypes s : buttonMap.keySet()) {
             if (s.predicate != null && buttonMap.get(s).isSelected()) {
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardQuestWorldFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardQuestWorldFilter.java
index 2d94f90ef61..0970b593e07 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardQuestWorldFilter.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardQuestWorldFilter.java
@@ -11,7 +11,7 @@ import forge.quest.QuestWorld;
 
 
 public class CardQuestWorldFilter extends CardFormatFilter {
-    private final Set<QuestWorld> questWorlds = new HashSet<QuestWorld>();
+    private final Set<QuestWorld> questWorlds = new HashSet<>();
 
     public CardQuestWorldFilter(final ItemManager<? super PaperCard> itemManager0) {
         super(itemManager0);
@@ -72,7 +72,7 @@ public class CardQuestWorldFilter extends CardFormatFilter {
 
     @Override
     protected Iterable<String> getList() {
-        final Set<String> strings = new HashSet<String>();
+        final Set<String> strings = new HashSet<>();
         for (final QuestWorld w : this.questWorlds) {
             strings.add(w.getName());
         }
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardSearchFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardSearchFilter.java
index 4f87e5fd468..03e5c7b9621 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardSearchFilter.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardSearchFilter.java
@@ -53,7 +53,7 @@ public class CardSearchFilter extends TextSearchFilter<PaperCard> {
     protected final void buildWidget(JPanel widget) {
         super.buildWidget(widget);
 
-        cbSearchMode = new FComboBoxWrapper<String>();
+        cbSearchMode = new FComboBoxWrapper<>();
         cbSearchMode.addItem("in");
         cbSearchMode.addItem("not in");
         cbSearchMode.addTo(widget);
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardSetFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardSetFilter.java
index 62ae54615cb..03404c13a46 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardSetFilter.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardSetFilter.java
@@ -14,7 +14,7 @@ import java.util.Set;
  *
  */
 public class CardSetFilter extends CardFormatFilter {
-    private final Set<String> sets = new HashSet<String>();
+    private final Set<String> sets = new HashSet<>();
 
     public CardSetFilter(ItemManager<? super PaperCard> itemManager0, Collection<String> sets0, boolean allowReprints0) {
         super(itemManager0);
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardTypeFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardTypeFilter.java
index ebc9ecef2ba..9f032ab3163 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardTypeFilter.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardTypeFilter.java
@@ -41,7 +41,7 @@ public class CardTypeFilter extends StatTypeFilter<PaperCard> {
 
     @Override
     protected final Predicate<PaperCard> buildPredicate() {
-        final List<Predicate<CardRules>> types = new ArrayList<Predicate<CardRules>>();
+        final List<Predicate<CardRules>> types = new ArrayList<>();
 
         for (StatTypes s : buttonMap.keySet()) {
             if (s.predicate != null && buttonMap.get(s).isSelected()) {
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckFolderFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckFolderFilter.java
index 5fc0deb7b86..82936633767 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckFolderFilter.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckFolderFilter.java
@@ -13,7 +13,7 @@ import java.util.Set;
  *
  */
 public class DeckFolderFilter extends ListLabelFilter<DeckProxy> {
-    protected final Set<String> folders = new HashSet<String>();
+    protected final Set<String> folders = new HashSet<>();
 
     public DeckFolderFilter(ItemManager<? super DeckProxy> itemManager0) {
         super(itemManager0);
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckQuestWorldFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckQuestWorldFilter.java
index f17dc05b42b..366f6058452 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckQuestWorldFilter.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckQuestWorldFilter.java
@@ -11,7 +11,7 @@ import forge.quest.QuestWorld;
 
 
 public class DeckQuestWorldFilter extends DeckFormatFilter {
-    private final Set<QuestWorld> questWorlds = new HashSet<QuestWorld>();
+    private final Set<QuestWorld> questWorlds = new HashSet<>();
 
     public DeckQuestWorldFilter(final ItemManager<? super DeckProxy> itemManager0) {
         super(itemManager0);
@@ -72,7 +72,7 @@ public class DeckQuestWorldFilter extends DeckFormatFilter {
 
     @Override
     protected Iterable<String> getList() {
-        final Set<String> strings = new HashSet<String>();
+        final Set<String> strings = new HashSet<>();
         for (final QuestWorld w : this.questWorlds) {
             strings.add(w.getName());
         }
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckSetFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckSetFilter.java
index 801516e79e1..b3c62397f23 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckSetFilter.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/DeckSetFilter.java
@@ -11,7 +11,7 @@ import java.util.Set;
 
 
 public class DeckSetFilter extends DeckFormatFilter {
-    private final Set<String> sets = new HashSet<String>();
+    private final Set<String> sets = new HashSet<>();
 
     public DeckSetFilter(ItemManager<? super DeckProxy> itemManager0, Collection<String> sets0, boolean allowReprints0) {
         super(itemManager0);
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/FormatFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/FormatFilter.java
index 114437e9d3c..e6899c98b31 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/FormatFilter.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/FormatFilter.java
@@ -13,7 +13,7 @@ import java.util.Set;
 
 public abstract class FormatFilter<T extends InventoryItem> extends ListLabelFilter<T> {
     protected boolean allowReprints = true;
-    protected final Set<GameFormat> formats = new HashSet<GameFormat>();
+    protected final Set<GameFormat> formats = new HashSet<>();
 
     public FormatFilter(ItemManager<? super T> itemManager0) {
         super(itemManager0);
@@ -25,8 +25,8 @@ public abstract class FormatFilter<T extends InventoryItem> extends ListLabelFil
 
     @Override
     protected String getTooltip() {
-        Set<String> sets = new HashSet<String>();
-        Set<String> bannedCards = new HashSet<String>();
+        Set<String> sets = new HashSet<>();
+        Set<String> bannedCards = new HashSet<>();
         Set<String> additionalCards = new HashSet<>();
 
         for (GameFormat format : this.formats) {
@@ -158,7 +158,7 @@ public abstract class FormatFilter<T extends InventoryItem> extends ListLabelFil
 
     @Override
     protected Iterable<String> getList() {
-        Set<String> strings = new HashSet<String>();
+        Set<String> strings = new HashSet<>();
         for (GameFormat f : this.formats) {
             strings.add(f.getName());
         }
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java
index 15d0fbcee87..0c84dea03da 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java
@@ -24,7 +24,7 @@ public abstract class StatTypeFilter<T extends InventoryItem> extends ToggleButt
 
     public StatTypeFilter(ItemManager<? super T> itemManager0) {
         super(itemManager0);
-        buttonMap = new HashMap<StatTypes, FLabel>();
+        buttonMap = new HashMap<>();
     }
 
     @SuppressWarnings("serial")
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TextSearchFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TextSearchFilter.java
index dc9ad7af8f4..1bee48d047e 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TextSearchFilter.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TextSearchFilter.java
@@ -27,7 +27,7 @@ public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
 
     @Override
     public ItemFilter<T> createCopy() {
-        TextSearchFilter<T> copy = new TextSearchFilter<T>(itemManager);
+        TextSearchFilter<T> copy = new TextSearchFilter<>(itemManager);
         copy.getWidget(); //initialize widget
         copy.txtSearch.setText(this.txtSearch.getText());
         return copy;
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/ToggleButtonsFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/ToggleButtonsFilter.java
index aa33152ff6c..735cb0e459b 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/ToggleButtonsFilter.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/ToggleButtonsFilter.java
@@ -23,7 +23,7 @@ import forge.toolbox.LayoutHelper;
 @SuppressWarnings("serial")
 public abstract class ToggleButtonsFilter<T extends InventoryItem> extends ItemFilter<T> {
     protected boolean lockFiltering;
-    private final List<FLabel> buttons = new ArrayList<FLabel>();
+    private final List<FLabel> buttons = new ArrayList<>();
 
     protected ToggleButtonsFilter(ItemManager<? super T> itemManager0) {
         super(itemManager0);
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TokenSearchFilter.java b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TokenSearchFilter.java
index d7f0b14170d..e1fd9d7c54e 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TokenSearchFilter.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/filters/TokenSearchFilter.java
@@ -51,7 +51,7 @@ public class TokenSearchFilter extends TextSearchFilter<PaperToken> {
     protected final void buildWidget(JPanel widget) {
         super.buildWidget(widget);
 
-        cbSearchMode = new FComboBoxWrapper<String>();
+        cbSearchMode = new FComboBoxWrapper<>();
         cbSearchMode.addItem("in");
         cbSearchMode.addItem("not in");
         cbSearchMode.addTo(widget);
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
index d7bfcd1bba6..c4ab75b5ff9 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
@@ -71,7 +71,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
     private static final int MAX_COLUMN_COUNT = 10;
 
     private final CardViewDisplay display;
-    private final List<Integer> selectedIndices = new ArrayList<Integer>();
+    private final List<Integer> selectedIndices = new ArrayList<>();
     private int columnCount = 4;
     private boolean allowMultipleSelections;
     private ColumnDef pileBy = null;
@@ -82,8 +82,8 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
     private Point hoverScrollPos;
     private ItemInfo hoveredItem;
     private ItemInfo focalItem;
-    private final List<ItemInfo> orderedItems = new ArrayList<ItemInfo>();
-    private final List<Group> groups = new ArrayList<Group>();
+    private final List<ItemInfo> orderedItems = new ArrayList<>();
+    private final List<Group> groups = new ArrayList<>();
     final Localizer localizer = Localizer.getInstance();
 
     private static boolean isPreferenceEnabled(final ForgePreferences.FPref preferenceName) {
@@ -162,9 +162,9 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
     }
     private final ExpandCollapseButton btnExpandCollapseAll = new ExpandCollapseButton();
 
-    private final FComboBoxWrapper<Object> cbGroupByOptions = new FComboBoxWrapper<Object>();
-    private final FComboBoxWrapper<Object> cbPileByOptions = new FComboBoxWrapper<Object>();
-    private final FComboBoxWrapper<Integer> cbColumnCount = new FComboBoxWrapper<Integer>();
+    private final FComboBoxWrapper<Object> cbGroupByOptions = new FComboBoxWrapper<>();
+    private final FComboBoxWrapper<Object> cbPileByOptions = new FComboBoxWrapper<>();
+    private final FComboBoxWrapper<Integer> cbColumnCount = new FComboBoxWrapper<>();
 
     public ImageView(final ItemManager<T> itemManager0, final ItemManagerModel<T> model0) {
         super(itemManager0, model0);
@@ -588,7 +588,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
             if (forRefresh && pileBy != null) { //refresh piles if needed
                 //use TreeMap to build pile set so iterating below sorts on key
                 ColumnDef groupPileBy = groupBy == null ? pileBy : groupBy.getGroupPileBy(i, pileBy);
-                Map<Comparable<?>, Pile> piles = new TreeMap<Comparable<?>, Pile>();
+                Map<Comparable<?>, Pile> piles = new TreeMap<>();
                 for (ItemInfo itemInfo : group.items) {
                     Comparable<?> key = groupPileBy.fnSort.apply(itemInfo);
                     if (!piles.containsKey(key)) {
@@ -927,8 +927,8 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
         }
     }
     private class Group extends DisplayArea {
-        private final List<ItemInfo> items = new ArrayList<ItemInfo>();
-        private final List<Pile> piles = new ArrayList<Pile>();
+        private final List<ItemInfo> items = new ArrayList<>();
+        private final List<Pile> piles = new ArrayList<>();
         private final String name;
         private boolean isCollapsed;
 
@@ -946,7 +946,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
         }
     }
     private class Pile extends DisplayArea {
-        private final List<ItemInfo> items = new ArrayList<ItemInfo>();
+        private final List<ItemInfo> items = new ArrayList<>();
     }
     private class ItemInfo extends DisplayArea implements Entry<InventoryItem, Integer> {
         private final T item;
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java
index bfa7320e7ef..23dc2860af2 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java
@@ -155,7 +155,7 @@ public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
         final DefaultTableColumnModel colmodel = new DefaultTableColumnModel();
 
         //ensure columns ordered properly
-        final List<ItemTableColumn> columns = new LinkedList<ItemTableColumn>();
+        final List<ItemTableColumn> columns = new LinkedList<>();
         for (final ItemColumnConfig colConfig : config.getCols().values()) {
             if (colOverrides == null || !colOverrides.containsKey(colConfig.getDef())) {
                 columns.add(new ItemTableColumn(new ItemColumn(colConfig)));
@@ -287,7 +287,7 @@ public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
 
     @Override
     public Iterable<Integer> getSelectedIndices() {
-        final List<Integer> indices = new ArrayList<Integer>();
+        final List<Integer> indices = new ArrayList<>();
         final int[] selectedRows = this.table.getSelectedRows();
         for (int i = 0; i < selectedRows.length; i++) {
             indices.add(selectedRows[i]);
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemView.java
index aaff5a98c15..914af73bdbd 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemView.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemView.java
@@ -179,7 +179,7 @@ public abstract class ItemView<T extends InventoryItem> {
     }
 
     public final Collection<T> getSelectedItems() {
-        final List<T> items = new ArrayList<T>();
+        final List<T> items = new ArrayList<>();
         for (final Integer i : getSelectedIndices()) {
             final T item = getItemAtIndex(i);
             if (item != null) {
@@ -205,7 +205,7 @@ public abstract class ItemView<T extends InventoryItem> {
         return setSelectedItems(items, true);
     }
     public final boolean setSelectedItems(final Iterable<T> items, final boolean scrollIntoView) {
-        final List<Integer> indices = new ArrayList<Integer>();
+        final List<Integer> indices = new ArrayList<>();
         for (final T item : items) {
             final int index = getIndexOfItem(item);
             if (index != -1) {
@@ -249,7 +249,7 @@ public abstract class ItemView<T extends InventoryItem> {
         final int count = getCount();
         if (count == 0) { return; }
 
-        final List<Integer> indexList = new ArrayList<Integer>();
+        final List<Integer> indexList = new ArrayList<>();
         for (final Integer index : indices) {
             if (index >= 0 && index < count) {
                 indexList.add(index);
diff --git a/forge-gui-desktop/src/main/java/forge/menus/ForgeMenu.java b/forge-gui-desktop/src/main/java/forge/menus/ForgeMenu.java
index afa9e46045a..e788bb92d3d 100644
--- a/forge-gui-desktop/src/main/java/forge/menus/ForgeMenu.java
+++ b/forge-gui-desktop/src/main/java/forge/menus/ForgeMenu.java
@@ -24,7 +24,7 @@ public final class ForgeMenu {
 
     private JPopupMenu popupMenu;
     private IMenuProvider provider;
-    private static HashMap<KeyStroke, JMenuItem> activeShortcuts = new HashMap<KeyStroke, JMenuItem>();
+    private static HashMap<KeyStroke, JMenuItem> activeShortcuts = new HashMap<>();
 
     public ForgeMenu() {
         refresh();
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java
index 7b0dbe9978b..5ee535771e8 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java
@@ -67,7 +67,7 @@ public class AddBasicLandsDialog {
     private static final int ADD_BTN_SIZE = 30;
     private static final int LAND_PANEL_PADDING = 3;
 
-    private final FComboBoxPanel<CardEdition> cbLandSet = new FComboBoxPanel<CardEdition>("Land Set:", FlowLayout.CENTER, Iterables.filter(StaticData.instance().getEditions(), CardEdition.Predicates.hasBasicLands));
+    private final FComboBoxPanel<CardEdition> cbLandSet = new FComboBoxPanel<>("Land Set:", FlowLayout.CENTER, Iterables.filter(StaticData.instance().getEditions(), CardEdition.Predicates.hasBasicLands));
 
     private final MainPanel panel = new MainPanel();
     private final LandPanel pnlPlains = new LandPanel("Plains");
@@ -313,7 +313,7 @@ public class AddBasicLandsDialog {
 
             cardName = cardName0;
             cardPanel = new LandCardPanel();
-            cbLandArt = new FComboBox<String>();
+            cbLandArt = new FComboBox<>();
             cbLandArt.setFont(cbLandSet.getFont());
             cbLandArt.addActionListener(new ActionListener() {
                 @Override
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java
index 3fd7cf4f62b..80f2ac05ea1 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/CDeckEditorUI.java
@@ -69,7 +69,7 @@ public enum CDeckEditorUI implements ICDoc {
     private final VTinyLeadersDecks vTinyLeadersDecks;
 
     CDeckEditorUI() {
-        screenChildControllers = new HashMap<FScreen, ACEditorBase<? extends InventoryItem, ? extends DeckBase>>();
+        screenChildControllers = new HashMap<>();
         this.cDetailPicture = new CDetailPicture();
         this.vAllDecks = VAllDecks.SINGLETON_INSTANCE;
         this.vAllDecks.setCDetailPicture(cDetailPicture);
@@ -163,7 +163,7 @@ public enum CDeckEditorUI implements ICDoc {
     private <T extends InventoryItem> void moveSelectedItems(final ItemManager<T> itemManager, final _MoveAction moveAction, final int maxQty) {
         if (maxQty == 0) { return; }
 
-        final ItemPool<T> items = new ItemPool<T>(itemManager.getGenericType());
+        final ItemPool<T> items = new ItemPool<>(itemManager.getGenericType());
         for (final T item : itemManager.getSelectedItems()) {
             final int qty = Math.min(maxQty, itemManager.getItemCount(item));
             if (qty > 0) {
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/DeckImport.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/DeckImport.java
index d82b0652b1c..4484002b868 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/DeckImport.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/DeckImport.java
@@ -85,8 +85,8 @@ public class DeckImport<TItem extends InventoryItem, TModel extends DeckBase> ex
     private final FCheckBox dateTimeCheck = new FCheckBox("Use only sets released before:", false);
     private final FCheckBox onlyCoreExpCheck = new FCheckBox("Use only core and expansion sets", true);
 
-    private final FComboBox<String> monthDropdown = new FComboBox<String>(); //don't need wrappers since skin can't change while this dialog is open
-    private final FComboBox<Integer> yearDropdown = new FComboBox<Integer>();
+    private final FComboBox<String> monthDropdown = new FComboBox<>(); //don't need wrappers since skin can't change while this dialog is open
+    private final FComboBox<Integer> yearDropdown = new FComboBox<>();
 
     private final DeckImportController controller;
     private final ACEditorBase<TItem, TModel> host;
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
index 4fc4420725a..1e809ae2752 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
@@ -163,7 +163,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
     private ItemPool<TItem> createPoolForItem(final TItem item, final int qty) {
         if (item == null || qty <= 0) { return null; }
 
-        final ItemPool<TItem> pool = new ItemPool<TItem>((Class<TItem>)item.getClass());
+        final ItemPool<TItem> pool = new ItemPool<>((Class<TItem>) item.getClass());
         pool.add(item, qty);
         return pool;
     }
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java
index 1271ca3925c..a6aff9b7132 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java
@@ -63,7 +63,7 @@ public final class CEditorCommander extends CDeckEditor<Deck> {
     private DragCell allDecksParent = null;
     private DragCell deckGenParent = null;
 
-    private List<DeckSection> allSections = new ArrayList<DeckSection>();
+    private List<DeckSection> allSections = new ArrayList<>();
     private final ItemPool<PaperCard> commanderPool;
     private final ItemPool<PaperCard> normalPool;
 
@@ -114,16 +114,16 @@ public final class CEditorCommander extends CDeckEditor<Deck> {
         CardCollections decks = FModel.getDecks();
         switch (gameType) {
         case TinyLeaders:
-            this.controller = new DeckController<Deck>(decks.getTinyLeaders(), this, newCreator);
+            this.controller = new DeckController<>(decks.getTinyLeaders(), this, newCreator);
             break;
         case Brawl:
-            this.controller = new DeckController<Deck>(decks.getBrawl(), this, newCreator);
+            this.controller = new DeckController<>(decks.getBrawl(), this, newCreator);
             break;
         case Oathbreaker:
-            this.controller = new DeckController<Deck>(decks.getOathbreaker(), this, newCreator);
+            this.controller = new DeckController<>(decks.getOathbreaker(), this, newCreator);
             break;
         default:
-            this.controller = new DeckController<Deck>(decks.getCommander(), this, newCreator);
+            this.controller = new DeckController<>(decks.getCommander(), this, newCreator);
             break;
         }
 
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java
index 1acfb3064d5..eec8c20c98a 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java
@@ -58,7 +58,7 @@ import java.util.Map.Entry;
  */
 public final class CEditorConstructed extends CDeckEditor<Deck> {
     private DeckController<Deck> controller;
-    private final List<DeckSection> allSections = new ArrayList<DeckSection>();
+    private final List<DeckSection> allSections = new ArrayList<>();
     private ItemPool<PaperCard> normalPool, avatarPool, planePool, schemePool, conspiracyPool, commanderPool;
 
     Predicate<CardRules> commanderFilter;
@@ -149,19 +149,19 @@ public final class CEditorConstructed extends CDeckEditor<Deck> {
 
         switch (this.gameType) {
             case Constructed:
-                this.controller = new DeckController<Deck>(FModel.getDecks().getConstructed(), this, newCreator);
+                this.controller = new DeckController<>(FModel.getDecks().getConstructed(), this, newCreator);
                 break;
             case Commander:
-                this.controller = new DeckController<Deck>(FModel.getDecks().getCommander(), this, newCreator);
+                this.controller = new DeckController<>(FModel.getDecks().getCommander(), this, newCreator);
                 break;
             case Oathbreaker:
-                this.controller = new DeckController<Deck>(FModel.getDecks().getOathbreaker(), this, newCreator);
+                this.controller = new DeckController<>(FModel.getDecks().getOathbreaker(), this, newCreator);
                 break;
             case Brawl:
-                this.controller = new DeckController<Deck>(FModel.getDecks().getBrawl(), this, newCreator);
+                this.controller = new DeckController<>(FModel.getDecks().getBrawl(), this, newCreator);
                 break;
             case TinyLeaders:
-                this.controller = new DeckController<Deck>(FModel.getDecks().getTinyLeaders(), this, newCreator);
+                this.controller = new DeckController<>(FModel.getDecks().getTinyLeaders(), this, newCreator);
                 break;
         }
 
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorLimited.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorLimited.java
index e2c6b928827..c35e194b880 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorLimited.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorLimited.java
@@ -62,7 +62,7 @@ public final class CEditorLimited extends CDeckEditor<DeckGroup> {
     private DragCell brawlDecksParent = null;
     private DragCell tinyLeadersDecksParent = null;
     private DragCell deckGenParent = null;
-    private final List<DeckSection> allSections = new ArrayList<DeckSection>();
+    private final List<DeckSection> allSections = new ArrayList<>();
 
     //========== Constructor
 
@@ -92,7 +92,7 @@ public final class CEditorLimited extends CDeckEditor<DeckGroup> {
                 return new DeckGroup("");
             }
         };
-        this.controller = new DeckController<DeckGroup>(deckMap0, this, newCreator);
+        this.controller = new DeckController<>(deckMap0, this, newCreator);
 
         getBtnAddBasicLands().setCommand(new UiCommand() {
             @Override
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
index e502263eee2..9294853a1e9 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
@@ -75,7 +75,7 @@ import java.util.Map.Entry;
 public final class CEditorQuest extends CDeckEditor<Deck> {
     private final QuestController questData;
     private final DeckController<Deck> controller;
-    private final List<DeckSection> allSections = new ArrayList<DeckSection>();
+    private final List<DeckSection> allSections = new ArrayList<>();
     private DragCell allDecksParent = null;
     private DragCell deckGenParent = null;
 
@@ -139,7 +139,7 @@ public final class CEditorQuest extends CDeckEditor<Deck> {
             }
         };
 
-        this.controller = new DeckController<Deck>(questData0.getMyDecks(), this, newCreator);
+        this.controller = new DeckController<>(questData0.getMyDecks(), this, newCreator);
 
         getBtnAddBasicLands().setCommand(new UiCommand() {
             @Override
@@ -158,7 +158,7 @@ public final class CEditorQuest extends CDeckEditor<Deck> {
 
     // fills number of decks using each card
     private Map<PaperCard, Integer> countDecksForEachCard() {
-        final Map<PaperCard, Integer> result = new HashMap<PaperCard, Integer>();
+        final Map<PaperCard, Integer> result = new HashMap<>();
         for (final Deck deck : this.questData.getMyDecks()) {
             for (final Entry<PaperCard, Integer> e : deck.getMain()) {
                 final PaperCard card = e.getKey();
@@ -393,7 +393,7 @@ public final class CEditorQuest extends CDeckEditor<Deck> {
         //Fixes null pointer error on switching tabs while quest deck editor is open. TODO: Find source of bug possibly?
         if(sectionMode == null) sectionMode = DeckSection.Main;
 
-        final Map<ColumnDef, ItemTableColumn> colOverridesCatalog = new HashMap<ColumnDef, ItemTableColumn>();
+        final Map<ColumnDef, ItemTableColumn> colOverridesCatalog = new HashMap<>();
         ItemTableColumn.addColOverride(ItemManagerConfig.QUEST_EDITOR_POOL, colOverridesCatalog, ColumnDef.NEW, this.questData.getCards().getFnNewCompare(), this.questData.getCards().getFnNewGet());
 
         //Based on which section the editor is in, display the remaining card pool (or applicable card pool if in
@@ -428,8 +428,8 @@ public final class CEditorQuest extends CDeckEditor<Deck> {
     public void update() {
         this.decksUsingMyCards = this.countDecksForEachCard();
 
-        final Map<ColumnDef, ItemTableColumn> colOverridesCatalog = new HashMap<ColumnDef, ItemTableColumn>();
-        final Map<ColumnDef, ItemTableColumn> colOverridesDeck = new HashMap<ColumnDef, ItemTableColumn>();
+        final Map<ColumnDef, ItemTableColumn> colOverridesCatalog = new HashMap<>();
+        final Map<ColumnDef, ItemTableColumn> colOverridesDeck = new HashMap<>();
 
         ItemTableColumn.addColOverride(ItemManagerConfig.QUEST_EDITOR_POOL, colOverridesCatalog, ColumnDef.NEW, this.questData.getCards().getFnNewCompare(), this.questData.getCards().getFnNewGet());
         ItemTableColumn.addColOverride(ItemManagerConfig.QUEST_DECK_EDITOR, colOverridesDeck, ColumnDef.NEW, this.questData.getCards().getFnNewCompare(), this.questData.getCards().getFnNewGet());
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestCardShop.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestCardShop.java
index 11e1c512e83..c730d6595c9 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestCardShop.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestCardShop.java
@@ -209,8 +209,8 @@ public final class CEditorQuestCardShop extends ACEditorBase<InventoryItem, Deck
     @SuppressWarnings("serial")
     @Override
     public void update() {
-        final Map<ColumnDef, ItemTableColumn> colOverridesCatalog = new HashMap<ColumnDef, ItemTableColumn>();
-        final Map<ColumnDef, ItemTableColumn> colOverridesDeck = new HashMap<ColumnDef, ItemTableColumn>();
+        final Map<ColumnDef, ItemTableColumn> colOverridesCatalog = new HashMap<>();
+        final Map<ColumnDef, ItemTableColumn> colOverridesDeck = new HashMap<>();
 
         // Add spell shop-specific columns
         ItemTableColumn.addColOverride(ItemManagerConfig.SPELL_SHOP, colOverridesCatalog, ColumnDef.PRICE, QuestSpellShop.fnPriceCompare, QuestSpellShop.fnPriceGet);
@@ -251,7 +251,7 @@ public final class CEditorQuestCardShop extends ACEditorBase<InventoryItem, Deck
         double multiplier = QuestSpellShop.updateMultiplier();
         this.cardsForSale = this.questData.getCards().getShopList();
 
-        final ItemPool<InventoryItem> ownedItems = new ItemPool<InventoryItem>(InventoryItem.class);
+        final ItemPool<InventoryItem> ownedItems = new ItemPool<>(InventoryItem.class);
         ownedItems.addAllOfType(this.questData.getCards().getCardpool().getView());
 
         this.getCatalogManager().setPool(cardsForSale);
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java
index 0d75829e2dd..3b34554ccf9 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java
@@ -62,7 +62,7 @@ import java.util.Map.Entry;
 public final class CEditorQuestLimited extends CDeckEditor<DeckGroup> {
     private final QuestController questData;
     private final DeckController<DeckGroup> controller;
-    private final List<DeckSection> allSections = new ArrayList<DeckSection>();
+    private final List<DeckSection> allSections = new ArrayList<>();
     private DragCell allDecksParent = null;
     private DragCell deckGenParent = null;
 
@@ -118,7 +118,7 @@ public final class CEditorQuestLimited extends CDeckEditor<DeckGroup> {
             }
         };
 
-        this.controller = new DeckController<DeckGroup>(questData0.getDraftDecks(), this, newCreator);
+        this.controller = new DeckController<>(questData0.getDraftDecks(), this, newCreator);
         controller.getView().getDeckManager().setup(ItemManagerConfig.DRAFT_POOL);
         controller.setModel(questData0.getDraftDecks().get(QuestEventDraft.DECK_NAME));
 
@@ -132,7 +132,7 @@ public final class CEditorQuestLimited extends CDeckEditor<DeckGroup> {
 
     // fills number of decks using each card
     private Map<PaperCard, Integer> countDecksForEachCard() {
-        final Map<PaperCard, Integer> result = new HashMap<PaperCard, Integer>();
+        final Map<PaperCard, Integer> result = new HashMap<>();
         for (final Deck deck : this.questData.getMyDecks()) {
             for (final Entry<PaperCard, Integer> e : deck.getMain()) {
                 final PaperCard card = e.getKey();
@@ -234,8 +234,8 @@ public final class CEditorQuestLimited extends CDeckEditor<DeckGroup> {
 
         this.decksUsingMyCards = this.countDecksForEachCard();
 
-        final Map<ColumnDef, ItemTableColumn> colOverridesCatalog = new HashMap<ColumnDef, ItemTableColumn>();
-        final Map<ColumnDef, ItemTableColumn> colOverridesDeck = new HashMap<ColumnDef, ItemTableColumn>();
+        final Map<ColumnDef, ItemTableColumn> colOverridesCatalog = new HashMap<>();
+        final Map<ColumnDef, ItemTableColumn> colOverridesDeck = new HashMap<>();
 
         ItemTableColumn.addColOverride(ItemManagerConfig.QUEST_EDITOR_POOL, colOverridesCatalog, ColumnDef.NEW, this.questData.getCards().getFnNewCompare(), this.questData.getCards().getFnNewGet());
         ItemTableColumn.addColOverride(ItemManagerConfig.QUEST_DECK_EDITOR, colOverridesDeck, ColumnDef.NEW, this.questData.getCards().getFnNewCompare(), this.questData.getCards().getFnNewGet());
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java
index a032572d708..6f09ba6e073 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java
@@ -85,7 +85,7 @@ public final class CEditorVariant extends CDeckEditor<Deck> {
                 return new Deck();
             }
         };
-        this.controller = new DeckController<Deck>(folder, this, newCreator);
+        this.controller = new DeckController<>(folder, this, newCreator);
 
         getBtnAddBasicLands().setCommand(new UiCommand() {
             @Override
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CProbabilities.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CProbabilities.java
index 25cbfc46521..7a3fd676276 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CProbabilities.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CProbabilities.java
@@ -61,17 +61,17 @@ public enum CProbabilities implements ICDoc {
         final ACEditorBase<T, TModel> ed = (ACEditorBase<T, TModel>)
                 CDeckEditorUI.SINGLETON_INSTANCE.getCurrentEditorController();
 
-        if (ed == null) { return new ArrayList<String>(); }
+        if (ed == null) { return new ArrayList<>(); }
 
         final ItemPool<PaperCard> deck = ItemPool.createFrom(ed.getDeckManager().getPool(), PaperCard.class);
 
-        final List<String> cardProbabilities = new ArrayList<String>();
+        final List<String> cardProbabilities = new ArrayList<>();
 
         final List<PaperCard> shuffled = deck.toFlatList();
         Collections.shuffle(shuffled, MyRandom.getRandom());
 
         // Log totals of each card for decrementing
-        final Map<PaperCard, Integer> cardTotals = new HashMap<PaperCard, Integer>();
+        final Map<PaperCard, Integer> cardTotals = new HashMap<>();
         for (final PaperCard c : shuffled) {
             if (cardTotals.containsKey(c)) { cardTotals.put(c, cardTotals.get(c) + 1); }
             else { cardTotals.put(c, 1); }
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java
index 30b034a5de8..d3d2a19ae3e 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java
@@ -136,7 +136,7 @@ public class DeckController<T extends DeckBase> {
     }
 
     private HashMap<String, Integer> groupByName(CardPool section) {
-        HashMap<String, Integer> result = new HashMap<String, Integer>();
+        HashMap<String, Integer> result = new HashMap<>();
 
         for (Map.Entry<PaperCard, Integer> entry : section) {
             PaperCard importedCard = entry.getKey();
@@ -190,7 +190,7 @@ public class DeckController<T extends DeckBase> {
     }
 
     private HashMap<String, PaperCard> getBasicLandsByName(CardPool sourceSection) {
-        HashMap<String, PaperCard> result = new HashMap<String, PaperCard>();
+        HashMap<String, PaperCard> result = new HashMap<>();
 
         for (Map.Entry<PaperCard, Integer> entry : sourceSection) {
             PaperCard card = entry.getKey();
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/menus/CDeckEditorUIMenus.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/menus/CDeckEditorUIMenus.java
index 21117a5c25b..1f1c8a47df4 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/menus/CDeckEditorUIMenus.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/menus/CDeckEditorUIMenus.java
@@ -13,7 +13,7 @@ public class CDeckEditorUIMenus {
     private final boolean SHOW_ICONS = true;
 
     public List<JMenu> getMenus() {
-        List<JMenu> menus = new ArrayList<JMenu>();
+        List<JMenu> menus = new ArrayList<>();
         menus.add(DeckFileMenu.getMenu(SHOW_ICONS));
         return menus;
     }
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java
index fc09b9c4033..46e9d1c9748 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java
@@ -27,7 +27,7 @@ public class CLobby {
     }
 
     private void addDecks(final Iterable<DeckProxy> commanderDecks, FList<Object> deckList, String... initialItems) {
-        Vector<Object> listData = new Vector<Object>();
+        Vector<Object> listData = new Vector<>();
         for (String item : initialItems) {
             listData.add(item);
         }
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java b/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java
index d983a97902d..c6afcf7e625 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java
@@ -75,8 +75,8 @@ public class PlayerPanel extends FPanel {
     private FRadioButton radioOpen;
     private FCheckBox chkReady;
 
-    private final FComboBoxWrapper<Object> teamComboBox = new FComboBoxWrapper<Object>();
-    private final FComboBoxWrapper<Object> aeTeamComboBox = new FComboBoxWrapper<Object>();
+    private final FComboBoxWrapper<Object> teamComboBox = new FComboBoxWrapper<>();
+    private final FComboBoxWrapper<Object> aeTeamComboBox = new FComboBoxWrapper<>();
 
     private final FLabel closeBtn;
     private final FLabel deckBtn = new FLabel.ButtonBuilder().text(localizer.getMessage("lblSelectaDeck")).build();
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java b/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java
index 3fe77120d36..99a38f3f046 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/VHomeUI.java
@@ -85,9 +85,9 @@ public enum VHomeUI implements IVTopLevelUI {
     private final SkinColor clrTheme = FSkin.getColor(FSkin.Colors.CLR_THEME);
     private final SkinColor l00 = clrTheme.stepColor(0);
 
-    private final List<IVSubmenu<? extends ICDoc>> allSubmenus = new ArrayList<IVSubmenu<? extends ICDoc>>();
-    private final Map<EDocID, LblMenuItem> allSubmenuLabels = new HashMap<EDocID, LblMenuItem>();
-    private final Map<EMenuGroup, LblGroup> allGroupLabels = new HashMap<EMenuGroup, LblGroup>();
+    private final List<IVSubmenu<? extends ICDoc>> allSubmenus = new ArrayList<>();
+    private final Map<EDocID, LblMenuItem> allSubmenuLabels = new HashMap<>();
+    private final Map<EMenuGroup, LblGroup> allGroupLabels = new HashMap<>();
 
     private final PnlMenu pnlMenu = new PnlMenu();
     private final PnlDisplay pnlDisplay = new PnlDisplay();
@@ -144,7 +144,7 @@ public enum VHomeUI implements IVTopLevelUI {
         allSubmenus.add(VSubmenuReleaseNotes.SINGLETON_INSTANCE);
 
         // For each group: init its panel
-        final SortedMap<EMenuGroup, JPanel> allGroupPanels = new TreeMap<EMenuGroup, JPanel>();
+        final SortedMap<EMenuGroup, JPanel> allGroupPanels = new TreeMap<>();
         for (final EMenuGroup e : EMenuGroup.values()) {
             allGroupPanels.put(e, new PnlGroup());
             allGroupPanels.get(e).setVisible(false);
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
index 4fafd123966..7c0c978b0be 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
@@ -82,7 +82,7 @@ public class VLobby implements ILobbyView {
     // Player frame elements
     private final JPanel playersFrame = new JPanel(new MigLayout("insets 0, gap 0 5, wrap, hidemode 3"));
     private final FScrollPanel playersScroll = new FScrollPanel(new MigLayout("insets 0, gap 0, wrap, hidemode 3"), true);
-    private final List<PlayerPanel> playerPanels = new ArrayList<PlayerPanel>(MAX_PLAYERS);
+    private final List<PlayerPanel> playerPanels = new ArrayList<>(MAX_PLAYERS);
 
     private final FLabel addPlayerBtn = new FLabel.ButtonBuilder().fontSize(14).text(localizer.getMessage("lblAddAPlayer")).build();
 
@@ -99,21 +99,21 @@ public class VLobby implements ILobbyView {
     private final List<FDeckChooser> tinyLeadersDeckChoosers = Lists.newArrayListWithCapacity(MAX_PLAYERS);
     private final List<FDeckChooser> brawlDeckChoosers = Lists.newArrayListWithCapacity(MAX_PLAYERS);
 
-    private final List<FList<Object>> schemeDeckLists = new ArrayList<FList<Object>>();
-    private final List<FPanel> schemeDeckPanels = new ArrayList<FPanel>(MAX_PLAYERS);
+    private final List<FList<Object>> schemeDeckLists = new ArrayList<>();
+    private final List<FPanel> schemeDeckPanels = new ArrayList<>(MAX_PLAYERS);
 
-    private final List<FList<Object>> planarDeckLists = new ArrayList<FList<Object>>();
-    private final List<FPanel> planarDeckPanels = new ArrayList<FPanel>(MAX_PLAYERS);
+    private final List<FList<Object>> planarDeckLists = new ArrayList<>();
+    private final List<FPanel> planarDeckPanels = new ArrayList<>(MAX_PLAYERS);
 
-    private final List<FList<Object>> vgdAvatarLists = new ArrayList<FList<Object>>();
-    private final List<FPanel> vgdPanels = new ArrayList<FPanel>(MAX_PLAYERS);
-    private final List<CardDetailPanel> vgdAvatarDetails = new ArrayList<CardDetailPanel>();
-    private final List<PaperCard> vgdAllAvatars = new ArrayList<PaperCard>();
-    private final List<PaperCard> vgdAllAiAvatars = new ArrayList<PaperCard>();
-    private final List<PaperCard> nonRandomHumanAvatars = new ArrayList<PaperCard>();
-    private final List<PaperCard> nonRandomAiAvatars = new ArrayList<PaperCard>();
-    private final Vector<Object> humanListData = new Vector<Object>();
-    private final Vector<Object> aiListData = new Vector<Object>();
+    private final List<FList<Object>> vgdAvatarLists = new ArrayList<>();
+    private final List<FPanel> vgdPanels = new ArrayList<>(MAX_PLAYERS);
+    private final List<CardDetailPanel> vgdAvatarDetails = new ArrayList<>();
+    private final List<PaperCard> vgdAllAvatars = new ArrayList<>();
+    private final List<PaperCard> vgdAllAiAvatars = new ArrayList<>();
+    private final List<PaperCard> nonRandomHumanAvatars = new ArrayList<>();
+    private final List<PaperCard> nonRandomAiAvatars = new ArrayList<>();
+    private final Vector<Object> humanListData = new Vector<>();
+    private final Vector<Object> aiListData = new Vector<>();
 
     public boolean isForCommander() {
         return isForCommander;
@@ -486,7 +486,7 @@ public class VLobby implements ILobbyView {
         deckPanel.add(new FLabel.Builder().text("Select " + formatName)
                 .fontStyle(Font.BOLD).fontSize(14).fontAlign(SwingConstants.CENTER)
                 .build(), "gaptop 10px, gapbottom 5px, growx, pushx");
-        final FList<Object> deckList = new FList<Object>();
+        final FList<Object> deckList = new FList<>();
         deckList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         deckList.addListSelectionListener(selectionListener);
 
@@ -902,7 +902,7 @@ public class VLobby implements ILobbyView {
     }
 
     List<String> getPlayerNames() {
-        final List<String> names = new ArrayList<String>();
+        final List<String> names = new ArrayList<>();
         for (final PlayerPanel pp : playerPanels) {
             names.add(pp.getPlayerName());
         }
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java
index 949aa703f99..3d25bcd2d51 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java
@@ -31,7 +31,7 @@ public enum CSubmenuGauntletBuild implements ICDoc {
     SINGLETON_INSTANCE;
 
     private final VSubmenuGauntletBuild view = VSubmenuGauntletBuild.SINGLETON_INSTANCE;
-    private final List<Deck> workingDecks = new ArrayList<Deck>();
+    private final List<Deck> workingDecks = new ArrayList<>();
     private final File openStartDir = new File(ForgeConstants.GAUNTLET_DIR.userPrefLoc);
 
     private final FileFilter filterDAT = new FileFilter() {
@@ -169,7 +169,7 @@ public enum CSubmenuGauntletBuild implements ICDoc {
     }
 
     private void dumpDecksIntoList() {
-        final List<String> names = new ArrayList<String>();
+        final List<String> names = new ArrayList<>();
 
         for (final Deck d : workingDecks) {
             names.add(d.getName());
@@ -211,7 +211,7 @@ public enum CSubmenuGauntletBuild implements ICDoc {
             gd = new GauntletData();
         }
 
-        final List<String> names = new ArrayList<String>();
+        final List<String> names = new ArrayList<>();
         for (final Deck d : workingDecks) {
             names.add(d.getName());
         }
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletContests.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletContests.java
index a0bba9a7f20..e220842ad8e 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletContests.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletContests.java
@@ -66,7 +66,7 @@ public enum CSubmenuGauntletContests implements ICDoc {
 
     private void updateData() {
         final File[] files = GauntletIO.getGauntletFilesLocked();
-        final List<GauntletData> data = new ArrayList<GauntletData>();
+        final List<GauntletData> data = new ArrayList<>();
         if (files != null) {
             for (final File f : files) {
                 final GauntletData gd = GauntletIO.loadGauntlet(f);
@@ -105,7 +105,7 @@ public enum CSubmenuGauntletContests implements ICDoc {
 
         final Deck aiDeck = gd.getDecks().get(gd.getCompleted());
 
-        final List<RegisteredPlayer> starter = new ArrayList<RegisteredPlayer>();
+        final List<RegisteredPlayer> starter = new ArrayList<>();
         final RegisteredPlayer human = new RegisteredPlayer(gd.getUserDeck()).setPlayer(GamePlayerUtil.getGuiPlayer());
         starter.add(human);
         starter.add(new RegisteredPlayer(aiDeck).setPlayer(GamePlayerUtil.createAiPlayer()));
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletLoad.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletLoad.java
index aaf79e76226..a5ce391de90 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletLoad.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletLoad.java
@@ -92,7 +92,7 @@ public enum CSubmenuGauntletLoad implements ICDoc {
 
     private void updateData() {
         final File[] files = GauntletIO.getGauntletFilesUnlocked(null);
-        final List<GauntletData> data = new ArrayList<GauntletData>();
+        final List<GauntletData> data = new ArrayList<>();
 
         for (final File f : files) {
             final GauntletData gd = GauntletIO.loadGauntlet(f);
@@ -138,7 +138,7 @@ public enum CSubmenuGauntletLoad implements ICDoc {
             }
         });
 
-        final List<RegisteredPlayer> starter = new ArrayList<RegisteredPlayer>();
+        final List<RegisteredPlayer> starter = new ArrayList<>();
         final RegisteredPlayer human = new RegisteredPlayer(userDeck).setPlayer(GamePlayerUtil.getGuiPlayer());
         starter.add(human);
         starter.add(new RegisteredPlayer(aiDeck).setPlayer(GamePlayerUtil.createAiPlayer()));
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletQuick.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletQuick.java
index 01d5ff3856e..237d7124593 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletQuick.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletQuick.java
@@ -68,7 +68,7 @@ public enum CSubmenuGauntletQuick implements ICDoc {
         });
 
         // Find appropriate filename for new save, create and set new save file.
-        final List<DeckType> allowedDeckTypes = new ArrayList<DeckType>();
+        final List<DeckType> allowedDeckTypes = new ArrayList<>();
         if (view.getBoxColorDecks().isSelected()) { allowedDeckTypes.add(DeckType.COLOR_DECK); }
         if (view.getBoxStandardColorDecks().isSelected()) { allowedDeckTypes.add(DeckType.STANDARD_COLOR_DECK); }
         if (view.getBoxStandardGenDecks().isSelected()) { allowedDeckTypes.add(DeckType.STANDARD_CARDGEN_DECK); }
@@ -83,7 +83,7 @@ public enum CSubmenuGauntletQuick implements ICDoc {
 
         final GauntletData gd = GauntletUtil.createQuickGauntlet(view.getLstDecks().getPlayer().getDeck(), view.getSliOpponents().getValue(), allowedDeckTypes, null);
 
-        final List<RegisteredPlayer> starter = new ArrayList<RegisteredPlayer>();
+        final List<RegisteredPlayer> starter = new ArrayList<>();
         final RegisteredPlayer human = new RegisteredPlayer(gd.getUserDeck()).setPlayer(GamePlayerUtil.getGuiPlayer());
         starter.add(human);
         starter.add(new RegisteredPlayer(gd.getDecks().get(gd.getCompleted())).setPlayer(GamePlayerUtil.createAiPlayer()));
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java
index e496a04cfcb..b02d5215ac2 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java
@@ -43,8 +43,8 @@ public class ContestGauntletLister extends JPanel {
 
     public void setGauntlets(final List<GauntletData> gd0) {
         this.removeAll();
-        final List<RowPanel> tempRows = new ArrayList<RowPanel>();
-        final List<GauntletData> sorted = new ArrayList<GauntletData>();
+        final List<RowPanel> tempRows = new ArrayList<>();
+        final List<GauntletData> sorted = new ArrayList<>();
         for (final GauntletData gd : gd0) { sorted.add(gd); }
         sorted.sort(new Comparator<GauntletData>() {
             @Override
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java
index 3f02a3062f6..f610817ec5f 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java
@@ -62,8 +62,8 @@ public class QuickGauntletLister extends JPanel {
 
     public void refresh() {
         this.removeAll();
-        final List<RowPanel> tempRows = new ArrayList<RowPanel>();
-        final List<GauntletData> sorted = new ArrayList<GauntletData>();
+        final List<RowPanel> tempRows = new ArrayList<>();
+        final List<GauntletData> sorted = new ArrayList<>();
         for (final GauntletData gd : gauntlets) { sorted.add(gd); }
         sorted.sort(new Comparator<GauntletData>() {
             @Override
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletBuild.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletBuild.java
index 8580dc6b133..69adbb2ae16 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletBuild.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletBuild.java
@@ -44,7 +44,7 @@ public enum VSubmenuGauntletBuild implements IVSubmenu<CSubmenuGauntletBuild> {
     private final JPanel pnlDirections = new JPanel();
 
     private final FDeckChooser lstLeft = new FDeckChooser(null, false, GameType.Constructed, false);
-    private final JList<String> lstRight = new FList<String>();
+    private final JList<String> lstRight = new FList<>();
 
     private final FScrollPane scrRight  = new FScrollPane(lstRight, true,
             ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/online/CSubmenuOnlineLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/online/CSubmenuOnlineLobby.java
index 1a843a739f7..8aa5bf49971 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/online/CSubmenuOnlineLobby.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/online/CSubmenuOnlineLobby.java
@@ -139,7 +139,7 @@ public enum CSubmenuOnlineLobby implements ICDoc, IMenuProvider {
      */
     @Override
     public List<JMenu> getMenus() {
-        final List<JMenu> menus = new ArrayList<JMenu>();
+        final List<JMenu> menus = new ArrayList<>();
         menus.add(ConstructedGameMenu.getMenu());
         return menus;
     }
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleCreate.java b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleCreate.java
index a63a0fd52f1..4544a5e040f 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleCreate.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleCreate.java
@@ -48,7 +48,7 @@ public enum CSubmenuPuzzleCreate implements ICDoc, IMenuProvider {
 
     @Override
     public List<JMenu> getMenus() {
-        final List<JMenu> menus = new ArrayList<JMenu>();
+        final List<JMenu> menus = new ArrayList<>();
         menus.add(PuzzleGameMenu.getMenu());
         return menus;
     }
@@ -104,7 +104,7 @@ public enum CSubmenuPuzzleCreate implements ICDoc, IMenuProvider {
             }
         });
 
-        final List<RegisteredPlayer> players = new ArrayList<RegisteredPlayer>();
+        final List<RegisteredPlayer> players = new ArrayList<>();
         final RegisteredPlayer human = new RegisteredPlayer(new Deck()).setPlayer(GamePlayerUtil.getGuiPlayer());
         human.setStartingHand(0);
         players.add(human);
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java
index e9490dffad6..29d2ea6db9c 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java
@@ -67,7 +67,7 @@ public enum CSubmenuPuzzleSolve implements ICDoc, IMenuProvider {
 
     @Override
     public List<JMenu> getMenus() {
-        final List<JMenu> menus = new ArrayList<JMenu>();
+        final List<JMenu> menus = new ArrayList<>();
         menus.add(PuzzleGameMenu.getMenu());
         return menus;
     }
@@ -96,7 +96,7 @@ public enum CSubmenuPuzzleSolve implements ICDoc, IMenuProvider {
             }
         });
 
-        final List<RegisteredPlayer> players = new ArrayList<RegisteredPlayer>();
+        final List<RegisteredPlayer> players = new ArrayList<>();
         final RegisteredPlayer human = new RegisteredPlayer(new Deck()).setPlayer(GamePlayerUtil.getGuiPlayer());
         human.setStartingHand(0);
         players.add(human);
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuChallenges.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuChallenges.java
index 5b0a3ad6750..b35b3edbe36 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuChallenges.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuChallenges.java
@@ -153,7 +153,7 @@ public enum CSubmenuChallenges implements ICDoc {
 
         view.getPnlChallenges().removeAll();
         qCtrl.regenerateChallenges();
-        final List<QuestEventChallenge> challenges = new ArrayList<QuestEventChallenge>();
+        final List<QuestEventChallenge> challenges = new ArrayList<>();
         for(final Object id : qCtrl.getAchievements().getCurrentChallenges()) {
             challenges.add(qCtrl.getChallenges().get(id.toString()));
         }
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestData.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestData.java
index 6294c372932..01c5098a069 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestData.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestData.java
@@ -101,7 +101,7 @@ public enum CSubmenuQuestData implements ICDoc {
                     @Override
                     public void run() {
                         customFormatCodes.clear();
-                        Set<String> sets = new HashSet<String>();
+                        Set<String> sets = new HashSet<>();
                         for(GameFormat format:dialog.getSelectedFormats()){
                             sets.addAll(format.getAllowedSetCodes());
                         }
@@ -133,7 +133,7 @@ public enum CSubmenuQuestData implements ICDoc {
                     @Override
                     public void run() {
                         customPrizeFormatCodes.clear();
-                        Set<String> sets = new HashSet<String>();
+                        Set<String> sets = new HashSet<>();
                         for(GameFormat format:dialog.getSelectedFormats()){
                             sets.addAll(format.getAllowedSetCodes());
                         }
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java
index 0edfa537401..bcf8dfe969d 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java
@@ -64,8 +64,8 @@ public class QuestFileLister extends JPanel {
     /** @param qd0 &emsp; {@link forge.quest.data.QuestData}[] */
     public void setQuests(List<QuestData> qd0) {
         this.removeAll();
-        List<RowPanel> tempRows = new ArrayList<RowPanel>();
-        List<QuestData> sorted = new ArrayList<QuestData>();
+        List<RowPanel> tempRows = new ArrayList<>();
+        List<QuestData> sorted = new ArrayList<>();
         for (QuestData qd : qd0) { sorted.add(qd); }
         sorted.sort(new Comparator<QuestData>() {
             @Override
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuChallenges.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuChallenges.java
index a2ab6a55278..4c8ad44cf77 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuChallenges.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuChallenges.java
@@ -34,10 +34,10 @@ public enum VSubmenuChallenges implements IVSubmenu<CSubmenuChallenges>, IVQuest
             ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
 
     private final StartButton btnStart  = new StartButton();
-    private final FComboBoxWrapper<String> cbxPet  = new FComboBoxWrapper<String>();
+    private final FComboBoxWrapper<String> cbxPet  = new FComboBoxWrapper<>();
     private final FCheckBox cbPlant = new FCheckBox(localizer.getMessage("cbSummonPlant"));
 
-    private final FComboBoxWrapper<String> cbxMatchLength  = new FComboBoxWrapper<String>();
+    private final FComboBoxWrapper<String> cbxMatchLength  = new FComboBoxWrapper<>();
 
     private final FLabel lblZep   = new FLabel.Builder().text(localizer.getMessage("htmlLaunchZeppelin"))
             .hoverable(true).icon(FSkin.getIcon(FSkinProp.ICO_QUEST_ZEP))
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewStall.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewStall.java
index 0eb32eff473..f6ff91680be 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewStall.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/ViewStall.java
@@ -73,7 +73,7 @@ public class ViewStall extends JPanel {
         this.pnlInventory = new JPanel();
         this.scrInventory = new FScrollPane(this.pnlInventory, false);
         this.parentView = v0;
-        this.lstItemPanels = new ArrayList<ViewItem>();
+        this.lstItemPanels = new ArrayList<>();
 
         // Component styling
         this.setOpaque(false);
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/AvatarSelector.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/AvatarSelector.java
index 711dba75f69..99175befc18 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/AvatarSelector.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/AvatarSelector.java
@@ -20,7 +20,7 @@ import forge.view.FDialog;
 
 @SuppressWarnings("serial")
 public class AvatarSelector extends FDialog {
-    private final List<FLabel> selectables = new ArrayList<FLabel>();
+    private final List<FLabel> selectables = new ArrayList<>();
     private final Map<Integer, SkinImage> avatarMap = FSkin.getAvatars();
 
     public AvatarSelector(final String playerName, final int currentIndex, final Collection<Integer> usedIndices) {
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuConstructed.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuConstructed.java
index b813ec6c381..668526600a9 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuConstructed.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuConstructed.java
@@ -49,7 +49,7 @@ public enum CSubmenuConstructed implements ICDoc, IMenuProvider {
      */
     @Override
     public List<JMenu> getMenus() {
-        final List<JMenu> menus = new ArrayList<JMenu>();
+        final List<JMenu> menus = new ArrayList<>();
         menus.add(ConstructedGameMenu.getMenu());
         return menus;
     }
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java
index af71fda0b46..6b87e60fe4c 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java
@@ -160,7 +160,7 @@ public enum CSubmenuDraft implements ICDoc {
             throw new IllegalStateException("Draft: Computer deck is null!");
         }
 
-        final List<RegisteredPlayer> starter = new ArrayList<RegisteredPlayer>();
+        final List<RegisteredPlayer> starter = new ArrayList<>();
         final RegisteredPlayer human = new RegisteredPlayer(humanDeck.getDeck()).setPlayer(GamePlayerUtil.getGuiPlayer());
         starter.add(human);
         starter.add(new RegisteredPlayer(aiDeck).setPlayer(GamePlayerUtil.createAiPlayer()));
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java
index 52a56884ff9..22535e37f10 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java
@@ -161,7 +161,7 @@ public enum CSubmenuSealed implements ICDoc {
             throw new IllegalStateException("Sealed: Computer deck is null!");
         }
 
-        final List<RegisteredPlayer> starter = new ArrayList<RegisteredPlayer>();
+        final List<RegisteredPlayer> starter = new ArrayList<>();
         final RegisteredPlayer human = new RegisteredPlayer(humanDeck.getDeck()).setPlayer(GamePlayerUtil.getGuiPlayer());
         starter.add(human);
         starter.add(new RegisteredPlayer(aiDeck).setPlayer(GamePlayerUtil.createAiPlayer()));
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuWinston.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuWinston.java
index f247de68c7a..85cfe525d19 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuWinston.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuWinston.java
@@ -134,7 +134,7 @@ public enum CSubmenuWinston implements ICDoc {
             throw new IllegalStateException("Draft: Computer deck is null!");
         }
 
-        final List<RegisteredPlayer> starter = new ArrayList<RegisteredPlayer>();
+        final List<RegisteredPlayer> starter = new ArrayList<>();
         final RegisteredPlayer human = new RegisteredPlayer(humanDeck.getDeck()).setPlayer(GamePlayerUtil.getGuiPlayer());
         starter.add(human);
         starter.add(new RegisteredPlayer(aiDeck).setPlayer(GamePlayerUtil.createAiPlayer()));
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuDraft.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuDraft.java
index 4111f83ba8b..da69fcadd8b 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuDraft.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuDraft.java
@@ -46,7 +46,7 @@ public enum VSubmenuDraft implements IVSubmenu<CSubmenuDraft> {
     private final JRadioButton radSingle = new FRadioButton(localizer.getMessage("lblPlayAnOpponent"));
     private final JRadioButton radAll = new FRadioButton(localizer.getMessage("lblPlayAll7opponents"));
 
-    private final JComboBox<String> cbOpponent = new JComboBox<String>();
+    private final JComboBox<String> cbOpponent = new JComboBox<>();
 
     private final JLabel lblInfo = new FLabel.Builder()
         .fontAlign(SwingConstants.LEFT).fontSize(16).fontStyle(Font.BOLD)
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java
index 1aa9040fee7..dee2a078700 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java
@@ -55,7 +55,7 @@ public enum VSubmenuSealed implements IVSubmenu<CSubmenuSealed> {
     private final JRadioButton radSingle = new FRadioButton(localizer.getMessage("lblPlayAnOpponent"));
     private final JRadioButton radAll = new FRadioButton(localizer.getMessage("lblPlayAll7opponents"));
 
-    private final JComboBox<String> cbOpponent = new JComboBox<String>();
+    private final JComboBox<String> cbOpponent = new JComboBox<>();
 
     private final FLabel lblInfo = new FLabel.Builder()
         .fontAlign(SwingConstants.LEFT).fontSize(16).fontStyle(Font.BOLD)
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuWinston.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuWinston.java
index 790c98f2b62..147cfc32205 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuWinston.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuWinston.java
@@ -47,7 +47,7 @@ public enum VSubmenuWinston implements IVSubmenu<CSubmenuWinston> {
     private final StartButton btnStart  = new StartButton();
 
     private final DeckManager lstDecks = new DeckManager(GameType.Winston, CDeckEditorUI.SINGLETON_INSTANCE.getCDetailPicture());
-    private final JList<String> lstAI = new FList<String>();
+    private final JList<String> lstAI = new FList<>();
 
     private final JLabel lblInfo = new FLabel.Builder()
             .fontAlign(SwingConstants.LEFT).fontSize(16).fontStyle(Font.BOLD)
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAchievements.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAchievements.java
index b8f40edaa71..0e075972619 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAchievements.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuAchievements.java
@@ -63,7 +63,7 @@ public enum VSubmenuAchievements implements IVSubmenu<CSubmenuAchievements> {
     private final FLabel lblTitle = new FLabel.Builder()
         .text(localizer.getMessage("lblAchievements")).fontAlign(SwingConstants.CENTER)
         .opaque(true).fontSize(16).build();
-    private final FComboBox<AchievementCollection> cbCollections = new FComboBox<AchievementCollection>();
+    private final FComboBox<AchievementCollection> cbCollections = new FComboBox<>();
     private final TrophyCase trophyCase = new TrophyCase();
     private final FScrollPane scroller = new FScrollPane(trophyCase, false,
             ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
index 44c3e2230b9..7a287619e01 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
@@ -239,9 +239,9 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
 
             String imagePath;
             int artIndex = 1;
-            ArrayList<String> cis = new ArrayList<String>();
+            ArrayList<String> cis = new ArrayList<>();
 
-            HashMap<String, Integer> cardCount = new HashMap<String, Integer>();
+            HashMap<String, Integer> cardCount = new HashMap<>();
             for (CardInSet c : e.getCards()) {
                 if (cardCount.containsKey(c.name)) {
                     cardCount.put(c.name, cardCount.get(c.name) + 1);
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
index dc80e578182..f6af4afd542 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
@@ -121,7 +121,7 @@ public final class CMatchUI
     private final TargetingOverlay targetingOverlay = new TargetingOverlay(this);
 
     private FCollectionView<PlayerView> sortedPlayers;
-    private final Map<String, String> avatarImages = new HashMap<String, String>();
+    private final Map<String, String> avatarImages = new HashMap<>();
     private boolean allHands;
     private boolean showOverlay = true;
     private JPopupMenu openAbilityMenu;
@@ -140,7 +140,7 @@ public final class CMatchUI
     public CMatchUI() {
         this.view = new VMatchUI(this);
         this.screen = FScreen.getMatchScreen(this, view);
-        this.myDocs = new EnumMap<EDocID, IVDoc<? extends ICDoc>>(EDocID.class);
+        this.myDocs = new EnumMap<>(EDocID.class);
         this.myDocs.put(EDocID.CARD_PICTURE, cDetailPicture.getCPicture().getView());
         this.myDocs.put(EDocID.CARD_DETAIL, cDetailPicture.getCDetail().getView());
         // only create an ante doc if playing for ante
@@ -257,7 +257,7 @@ public final class CMatchUI
 
         final String[] indices = FModel.getPreferences().getPref(FPref.UI_AVATARS).split(",");
 
-        final List<VField> fields = new ArrayList<VField>();
+        final List<VField> fields = new ArrayList<>();
         Singletons.getView().getLpnDocument().add(targetingOverlay.getPanel(), FView.TARGETING_LAYER);
         targetingOverlay.getPanel().setSize(Singletons.getControl().getDisplaySize());
 
@@ -285,7 +285,7 @@ public final class CMatchUI
     }
 
     private void initHandViews() {
-        final List<VHand> hands = new ArrayList<VHand>();
+        final List<VHand> hands = new ArrayList<>();
         final Iterable<PlayerView> localPlayers = getLocalPlayers();
 
         int i = 0;
@@ -613,7 +613,7 @@ public final class CMatchUI
         }
     }
     private List<CardPanel> getVisibleCardPanels() {
-        final List<CardPanel> panels = new ArrayList<CardPanel>();
+        final List<CardPanel> panels = new ArrayList<>();
         for (final VHand h : view.getHands()) {
             panels.addAll(h.getHandArea().getCardPanels());
         }
@@ -950,7 +950,7 @@ public final class CMatchUI
             return ImmutableMap.of(firstBlocker, damage);
         }
 
-        final AtomicReference<Map<CardView, Integer>> result = new AtomicReference<Map<CardView,Integer>>();
+        final AtomicReference<Map<CardView, Integer>> result = new AtomicReference<>();
         FThreads.invokeInEdtAndWait(new Runnable() {
             @Override
             public void run() {
@@ -968,7 +968,7 @@ public final class CMatchUI
         // Sort players
         FCollectionView<PlayerView> players = gameView.getPlayers();
         if (players.size() == 2 && myPlayers != null && myPlayers.size() == 1 && myPlayers.get(0).equals(players.get(1))) {
-            players = new FCollection<PlayerView>(new PlayerView[] { players.get(1), players.get(0) });
+            players = new FCollection<>(new PlayerView[]{players.get(1), players.get(0)});
         }
         initMatch(players, myPlayers);
 
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/GameLogPanel.java b/forge-gui-desktop/src/main/java/forge/screens/match/GameLogPanel.java
index 3d26d9e13a8..5400775c273 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/GameLogPanel.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/GameLogPanel.java
@@ -80,7 +80,7 @@ public class GameLogPanel extends JPanel {
         scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
         scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
         scrollPane.getViewport().add(scrollablePanel);
-        layer = new JLayer<FScrollPane>(scrollPane, layerUI);
+        layer = new JLayer<>(scrollPane, layerUI);
         this.add(layer, "w 10:100%, h 100%");
     }
 
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/QuestWinLoseCardViewer.java b/forge-gui-desktop/src/main/java/forge/screens/match/QuestWinLoseCardViewer.java
index fb786da85bc..6f09994f068 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/QuestWinLoseCardViewer.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/QuestWinLoseCardViewer.java
@@ -63,7 +63,7 @@ public class QuestWinLoseCardViewer extends FPanel {
      */
     public QuestWinLoseCardViewer(final List<PaperCard> list) {
         this.list = Collections.unmodifiableList(list);
-        this.jList = new FList<PaperCard>(new ChooserListModel());
+        this.jList = new FList<>(new ChooserListModel());
         this.detail = new CardDetailPanel();
         this.picture = new CardPicturePanel();
         this.scroller = new FScrollPane(this.jList, false);
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java b/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
index be3f8c4545b..922f4b6f5f2 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
@@ -63,12 +63,12 @@ import forge.view.arcane.util.CardPanelMouseListener;
 public class TargetingOverlay {
     private final CMatchUI matchUI;
     private final OverlayPanel pnl = new OverlayPanel();
-    private final List<CardPanel> cardPanels = new ArrayList<CardPanel>();
-    private final List<Arc> arcsFoeAtk = new ArrayList<Arc>();
-    private final List<Arc> arcsFoeDef = new ArrayList<Arc>();
-    private final List<Arc> arcsFriend = new ArrayList<Arc>();
+    private final List<CardPanel> cardPanels = new ArrayList<>();
+    private final List<Arc> arcsFoeAtk = new ArrayList<>();
+    private final List<Arc> arcsFoeDef = new ArrayList<>();
+    private final List<Arc> arcsFriend = new ArrayList<>();
     private final ArcAssembler assembler = new ArcAssembler();
-    private final Set<Integer> stackItemIDs = new HashSet<Integer>();
+    private final Set<Integer> stackItemIDs = new HashSet<>();
 
     private static class Arc {
         private final int x1, y1, x2, y2;
@@ -88,7 +88,7 @@ public class TargetingOverlay {
         }
     }
 
-    private final Set<CardView> cardsVisualized = new HashSet<CardView>();
+    private final Set<CardView> cardsVisualized = new HashSet<>();
     private CardPanel activePanel = null;
 
     //private long lastUpdated = System.currentTimeMillis(); // TODO: determine if timer is needed (see below)
@@ -158,7 +158,7 @@ public class TargetingOverlay {
 
         //final Point docOffsets = FView.SINGLETON_INSTANCE.getLpnDocument().getLocationOnScreen();
         // Locations of arc endpoint, per card, with ID as primary key.
-        final Map<Integer, Point> endpoints = new HashMap<Integer, Point>();
+        final Map<Integer, Point> endpoints = new HashMap<>();
 
         Point cardLocOnScreen;
         Point locOnScreen = this.getPanel().getLocationOnScreen();
@@ -306,7 +306,7 @@ public class TargetingOverlay {
     }
 
     private Map<Integer, Point> getCardEndpoints() {
-        final Map<Integer, Point> endpoints = new HashMap<Integer, Point>();
+        final Map<Integer, Point> endpoints = new HashMap<>();
 
         Point cardLocOnScreen;
         Point locOnScreen = this.getPanel().getLocationOnScreen();
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/VAutoYields.java b/forge-gui-desktop/src/main/java/forge/screens/match/VAutoYields.java
index 0a443bf09d0..ff70964091f 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/VAutoYields.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/VAutoYields.java
@@ -34,11 +34,11 @@ public class VAutoYields extends FDialog {
         super();
         setTitle("Auto-Yields");
 
-        autoYields = new ArrayList<String>();
+        autoYields = new ArrayList<>();
         for (final String autoYield : matchUI.getAutoYields()) {
             autoYields.add(autoYield);
         }
-        lstAutoYields = new FList<String>(new AutoYieldsListModel());
+        lstAutoYields = new FList<>(new AutoYieldsListModel());
 
         int x = PADDING;
         int y = PADDING;
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/VMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/VMatchUI.java
index 5dd1062b2ce..9ff1370c329 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/VMatchUI.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/VMatchUI.java
@@ -29,8 +29,8 @@ import forge.view.FView;
  * <br><br><i>(V at beginning of class name denotes a view class.)</i>
  */
 public class VMatchUI implements IVTopLevelUI {
-    private List<VField> lstFields = new ArrayList<VField>();
-    private List<VHand> lstHands = new ArrayList<VHand>();
+    private List<VField> lstFields = new ArrayList<>();
+    private List<VHand> lstHands = new ArrayList<>();
 
     // Other instantiations
     private final CMatchUI control;
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CHand.java b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CHand.java
index e7aee4c1136..a8285aa86e3 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CHand.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CHand.java
@@ -117,8 +117,8 @@ public class CHand implements ICDoc {
             ordering.addAll(cards);
         }
 
-        final List<CardPanel> placeholders = new ArrayList<CardPanel>();
-        final List<CardPanel> cardPanels = new ArrayList<CardPanel>();
+        final List<CardPanel> placeholders = new ArrayList<>();
+        final List<CardPanel> cardPanels = new ArrayList<>();
 
         for (final CardView card : ordering) {
             CardPanel cardPanel = p.getCardPanel(card.getId());
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VAntes.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VAntes.java
index a744679411a..8fdcce87de6 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VAntes.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VAntes.java
@@ -52,7 +52,7 @@ public class VAntes implements IVDoc<CAntes> {
 
     private final JPanel pnl = new JPanel();
     private final FScrollPane scroller = new FScrollPane(pnl, false);
-    private final SortedSet<AntePanel> allAntes = new TreeSet<AntePanel>();
+    private final SortedSet<AntePanel> allAntes = new TreeSet<>();
 
     //========== Constructor
     public VAntes(final CAntes controller) {
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VLog.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VLog.java
index ae85d6daf6e..a29442777f7 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VLog.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VLog.java
@@ -181,7 +181,7 @@ public class VLog implements IVDoc<CLog> {
             logEntries.removeAll(this.displayedLogEntries);
             return logEntries;
         }
-        return new ArrayList<GameLogEntry>();
+        return new ArrayList<>();
     }
 
     private void addNewLogEntriesToJPanel(final List<GameLogEntry> newLogEntries) {
diff --git a/forge-gui-desktop/src/main/java/forge/screens/workshop/menus/CWorkshopUIMenus.java b/forge-gui-desktop/src/main/java/forge/screens/workshop/menus/CWorkshopUIMenus.java
index aa2a6ab9286..689a031cf28 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/workshop/menus/CWorkshopUIMenus.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/workshop/menus/CWorkshopUIMenus.java
@@ -13,7 +13,7 @@ public class CWorkshopUIMenus {
     private final boolean SHOW_ICONS = true;
 
     public List<JMenu> getMenus() {
-        List<JMenu> menus = new ArrayList<JMenu>();
+        List<JMenu> menus = new ArrayList<>();
         menus.add(WorkshopFileMenu.getMenu(SHOW_ICONS));
         return menus;
     }
diff --git a/forge-gui-desktop/src/main/java/forge/sound/AltSoundSystem.java b/forge-gui-desktop/src/main/java/forge/sound/AltSoundSystem.java
index 38302668390..c0e1db5b9a2 100644
--- a/forge-gui-desktop/src/main/java/forge/sound/AltSoundSystem.java
+++ b/forge-gui-desktop/src/main/java/forge/sound/AltSoundSystem.java
@@ -11,7 +11,7 @@ import java.util.Map;
  * @author agetian
  */
 class AsyncSoundRegistry {
-    static Map<String, Integer> soundsPlayed = new HashMap<String, Integer>();
+    static Map<String, Integer> soundsPlayed = new HashMap<>();
 
     public synchronized static void registerSound(String soundName) {
         if (soundsPlayed.containsKey(soundName)) {
diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java b/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
index 103fdaa5ece..29f75a6f473 100644
--- a/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
@@ -38,7 +38,7 @@ import java.util.StringTokenizer;
  */
 public class CardFaceSymbols {
     /** Constant <code>manaImages</code>. */
-    private static final Map<String, SkinImage> MANA_IMAGES = new HashMap<String, SkinImage>();
+    private static final Map<String, SkinImage> MANA_IMAGES = new HashMap<>();
 
     private static final int manaImageSize = 13;
 
diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FCheckBoxList.java b/forge-gui-desktop/src/main/java/forge/toolbox/FCheckBoxList.java
index d44e767be9d..3ef20e47667 100644
--- a/forge-gui-desktop/src/main/java/forge/toolbox/FCheckBoxList.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/FCheckBoxList.java
@@ -26,7 +26,7 @@ public class FCheckBoxList<E> extends JList<E> {
 
 	public FCheckBoxList(final boolean keepSelectionWhenFocusLost) {
 
-		setCellRenderer(new CellRenderer<E>());
+		setCellRenderer(new CellRenderer<>());
 
 		addMouseListener(new MouseAdapter() {
 			@Override
diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxPanel.java b/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxPanel.java
index 4e8f403e412..dde9c1ab5af 100644
--- a/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxPanel.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxPanel.java
@@ -18,7 +18,7 @@ import forge.toolbox.FSkin.SkinnedLabel;
 @SuppressWarnings("serial")
 public class FComboBoxPanel<E> extends JPanel {
 
-    private static final List<FComboBoxPanel<?>> allPanels = new ArrayList<FComboBoxPanel<?>>();
+    private static final List<FComboBoxPanel<?>> allPanels = new ArrayList<>();
 
     public static void refreshAllSkins() {
         for (final FComboBoxPanel<?> panel : allPanels) {
@@ -48,7 +48,7 @@ public class FComboBoxPanel<E> extends JPanel {
         this(comboBoxCaption0, flowLayout0);
 
         List<E> list = ImmutableList.copyOf(items);
-        setComboBox(new FComboBox<E>(list), list.get(0));
+        setComboBox(new FComboBox<>(list), list.get(0));
     }
 
     public void setComboBox(final FComboBox<E> comboBox0, final E selectedItem) {
diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxWrapper.java b/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxWrapper.java
index 29aa7a1528c..3f5ce9cbfb8 100644
--- a/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxWrapper.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/FComboBoxWrapper.java
@@ -23,7 +23,7 @@ import forge.toolbox.FSkin.SkinFont;
  */
 public class FComboBoxWrapper<E> implements IComboBox<E> {
 
-    private static final List<FComboBoxWrapper<?>> allWrappers = new ArrayList<FComboBoxWrapper<?>>();
+    private static final List<FComboBoxWrapper<?>> allWrappers = new ArrayList<>();
 
     public static void refreshAllSkins() {
         for (final FComboBoxWrapper<?> wrapper : allWrappers) {
@@ -37,7 +37,7 @@ public class FComboBoxWrapper<E> implements IComboBox<E> {
 
     public FComboBoxWrapper() {
         super();
-        comboBox = new FComboBox<E>();
+        comboBox = new FComboBox<>();
         allWrappers.add(this);
     }
 
@@ -209,7 +209,7 @@ public class FComboBoxWrapper<E> implements IComboBox<E> {
         }
 
         //create copy of combo box
-        final FComboBox<E> newComboBox = new FComboBox<E>();
+        final FComboBox<E> newComboBox = new FComboBox<>();
         for (int i = 0; i < comboBox.getItemCount(); i++) {
             newComboBox.addItem(comboBox.getItemAt(i));
         }
diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FDigitalClock.java b/forge-gui-desktop/src/main/java/forge/toolbox/FDigitalClock.java
index 13b850f35c0..57b17e1a7f9 100644
--- a/forge-gui-desktop/src/main/java/forge/toolbox/FDigitalClock.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/FDigitalClock.java
@@ -19,7 +19,7 @@ import forge.toolbox.FSkin.SkinnedLabel;
 public class FDigitalClock extends SkinnedLabel {
     private static final Calendar now = Calendar.getInstance();
     private static final DateFormat timeFormatter = DateFormat.getTimeInstance(DateFormat.SHORT);
-    private static final List<FDigitalClock> clocks = new ArrayList<FDigitalClock>();
+    private static final List<FDigitalClock> clocks = new ArrayList<>();
     private static Timer timer;
     private static String currentTimeDisplay;
 
diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FList.java b/forge-gui-desktop/src/main/java/forge/toolbox/FList.java
index b2f907c0828..a90d824112b 100644
--- a/forge-gui-desktop/src/main/java/forge/toolbox/FList.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/FList.java
@@ -44,7 +44,7 @@ public class FList<E> extends SkinnedList<E> {
         this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT));
         this.setSelectionForeground(this.getSkin().getForeground());
         this.setFont(FSkin.getFont(12));
-        this.setCellRenderer(new ComplexCellRenderer<E>());
+        this.setCellRenderer(new ComplexCellRenderer<>());
 
         this.addFocusListener(new FocusListener() {
             @Override
diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FOptionPane.java b/forge-gui-desktop/src/main/java/forge/toolbox/FOptionPane.java
index 1dbd4a37590..01872d6b5f7 100644
--- a/forge-gui-desktop/src/main/java/forge/toolbox/FOptionPane.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/FOptionPane.java
@@ -107,7 +107,7 @@ public class FOptionPane extends FDialog {
             txtInput = new FTextField.Builder().text(initialInput).build();
             inputField = txtInput;
         } else {
-            cbInput = new FComboBox<T>(inputOptions);
+            cbInput = new FComboBox<>(inputOptions);
             cbInput.setSelectedItem(initialInput);
             inputField = cbInput;
         }
diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FPanel.java b/forge-gui-desktop/src/main/java/forge/toolbox/FPanel.java
index 561ccd4897a..5d6946e78d2 100644
--- a/forge-gui-desktop/src/main/java/forge/toolbox/FPanel.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/FPanel.java
@@ -170,7 +170,7 @@ public class FPanel extends FPanelBase implements ILocalRepaint {
         // More implementations can be added as necessary.
         // See drawForegroundScaled().
 
-        final List<Integer> implemented = new ArrayList<Integer>();
+        final List<Integer> implemented = new ArrayList<>();
         implemented.add(SwingConstants.BOTTOM);
         implemented.add(SwingConstants.CENTER);
 
diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java b/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java
index 79c32a486cc..bccc0c274d9 100644
--- a/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java
@@ -39,7 +39,7 @@ public class PlayerDetailsPanel extends JPanel {
     private final DetailLabel lblExile = new DetailLabel(FSkinProp.IMG_ZONE_EXILE, "Exile (%s)");
     private final DetailLabel lblFlashback = new DetailLabel(FSkinProp.IMG_ZONE_FLASHBACK, "Flashback cards (%s)");
     private final DetailLabel lblCommand = new DetailLabel(FSkinProp.IMG_PLANESWALKER, "Command zone (%s)");
-    private final List<Pair<DetailLabel, Byte>> manaLabels = new ArrayList<Pair<DetailLabel, Byte>>();
+    private final List<Pair<DetailLabel, Byte>> manaLabels = new ArrayList<>();
 
     public PlayerDetailsPanel(final PlayerView player0) {
         player = player0;
diff --git a/forge-gui-desktop/src/main/java/forge/view/FDialog.java b/forge-gui-desktop/src/main/java/forge/view/FDialog.java
index f0e1d73ff35..76dfd9069af 100644
--- a/forge-gui-desktop/src/main/java/forge/view/FDialog.java
+++ b/forge-gui-desktop/src/main/java/forge/view/FDialog.java
@@ -527,7 +527,7 @@ public class FDialog extends SkinnedDialog implements ITitleBarOwner, KeyEventDi
         return getIconImages().isEmpty() ? null : getIconImages().get(0);
     }
 
-    private static final Stack<FDialog> openModals = new Stack<FDialog>();
+    private static final Stack<FDialog> openModals = new Stack<>();
     private static final BackdropPanel backdropPanel = new BackdropPanel();
 
     public static boolean isModalOpen() {
diff --git a/forge-gui-desktop/src/main/java/forge/view/FView.java b/forge-gui-desktop/src/main/java/forge/view/FView.java
index 7dedd44ee6d..8e94854947f 100644
--- a/forge-gui-desktop/src/main/java/forge/view/FView.java
+++ b/forge-gui-desktop/src/main/java/forge/view/FView.java
@@ -46,7 +46,7 @@ public enum FView {
 	public static final Integer OVERLAY_LAYER = NAVIGATION_BAR_REVEAL_LAYER - 1;
 	public static final Integer TARGETING_LAYER = OVERLAY_LAYER - 1;
 
-	private final List<DragCell> allCells = new ArrayList<DragCell>();
+	private final List<DragCell> allCells = new ArrayList<>();
 	private SplashFrame frmSplash;
 
 	// Top-level UI components; all have getters.
@@ -139,17 +139,17 @@ public enum FView {
 		{
 			// get profile directories -- if one of them is actually under the res directory, don't
 			// count is as data to migrate
-			final Set<File> profileDirs = new HashSet<File>();
+			final Set<File> profileDirs = new HashSet<>();
 			for (final String dname : ForgeConstants.PROFILE_DIRS) {
 				profileDirs.add(new File(dname));
 			}
 
-			final List<File> resDirs = new ArrayList<File>();
+			final List<File> resDirs = new ArrayList<>();
 			for (final String resDir : Lists.newArrayList("decks", "gauntlet", "layouts", "pics", "preferences", "quest/data")) {
 				resDirs.add(new File("res", resDir));
 			}
 
-			final Set<File> doNotDeleteDirs = new HashSet<File>();
+			final Set<File> doNotDeleteDirs = new HashSet<>();
 			for (final String dir : Lists.newArrayList("decks", "decks/constructed", "decks/draft", "decks/plane", "decks/scheme", "decks/sealed", "gauntlet", "layouts", "pics", "preferences", "quest/data")) {
 				doNotDeleteDirs.add(new File("res", dir));
 			}
@@ -165,7 +165,7 @@ public enum FView {
 						}
 
 						// assemble a list of remaining files.
-						final List<File> remainingFiles = new LinkedList<File>();
+						final List<File> remainingFiles = new LinkedList<>();
 						_addRemainingFiles(remainingFiles, resDirs, profileDirs, doNotDeleteDirs);
 
 						// if any files remain, display them and make clear that they should be moved or
@@ -356,8 +356,8 @@ public enum FView {
 	// directories listed in profileDirs will not be searched
 	// removes empty directories to reduce tree conflicts
 	private static boolean _addRemainingFiles(final List<File> remainingFiles, final List<File> dirRoots, final Set<File> profileDirs, final Set<File> doNotDeleteDirs) {
-		final Deque<File> stack = new LinkedList<File>(dirRoots);
-		final Set<File> seenDirs = new HashSet<File>();
+		final Deque<File> stack = new LinkedList<>(dirRoots);
+		final Set<File> seenDirs = new HashSet<>();
 		boolean ret = false;
 		while (!stack.isEmpty()) {
 			File cur = stack.peek();
@@ -459,7 +459,7 @@ public enum FView {
 	 * @return {@link java.util.List}<{@link forge.gui.framework.DragCell}>
 	 */
 	public List<DragCell> getDragCells() {
-		final List<DragCell> clone = new ArrayList<DragCell>();
+		final List<DragCell> clone = new ArrayList<>();
 		clone.addAll(allCells);
 		return clone;
 	}
diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
index e3d2270d7dd..f46f022fccb 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
@@ -79,7 +79,7 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
     private final CMatchUI matchUI;
     private CardView card;
     private CardPanel attachedToPanel;
-    private List<CardPanel> attachedPanels = new ArrayList<CardPanel>();
+    private List<CardPanel> attachedPanels = new ArrayList<>();
     private List<CardPanel> stack;
     private boolean tapped;
     private double tappedAngle = 0;
diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java
index 9662888a354..7547f2d1878 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanelContainer.java
@@ -48,7 +48,7 @@ public abstract class CardPanelContainer extends SkinnedPanel {
     private static final long serialVersionUID = -6400018234895548306L;
     private static final int DRAG_SMUDGE = 10;
 
-    private final List<CardPanel> cardPanels = new ArrayList<CardPanel>();
+    private final List<CardPanel> cardPanels = new ArrayList<>();
     private final CMatchUI matchUI;
     private final FScrollPane scrollPane;
 
@@ -59,7 +59,7 @@ public abstract class CardPanelContainer extends SkinnedPanel {
     private CardPanel mouseDownPanel;
     private CardPanel mouseDragPanel;
 
-    private final List<CardPanelMouseListener> listeners = new ArrayList<CardPanelMouseListener>(2);
+    private final List<CardPanelMouseListener> listeners = new ArrayList<>(2);
     private int mouseDragOffsetX, mouseDragOffsetY;
     private int intialMouseDragX = -1, intialMouseDragY;
     private boolean dragEnabled;
diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java
index bacbcd9d0c3..d686c6bb341 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java
@@ -177,7 +177,7 @@ public abstract class FloatingCardArea extends CardArea {
     }
 
     protected void doRefresh() {
-        List<CardPanel> cardPanels = new ArrayList<CardPanel>();
+        List<CardPanel> cardPanels = new ArrayList<>();
         Iterable<CardView> cards = getCards();
         if (cards != null) {
             for (final CardView card : cards) {
diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java
index ff866a62f17..74e6e2e5a5d 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java
@@ -40,7 +40,7 @@ import forge.util.collect.FCollection;
 public class FloatingZone extends FloatingCardArea {
     private static final long serialVersionUID = 1927906492186378596L;
 
-    private static final Map<Integer, FloatingZone> floatingAreas = new HashMap<Integer, FloatingZone>();
+    private static final Map<Integer, FloatingZone> floatingAreas = new HashMap<>();
 
     private static int getKey(final PlayerView player, final ZoneType zone) {
         return 40 * player.getId() + zone.hashCode();
@@ -124,7 +124,7 @@ public class FloatingZone extends FloatingCardArea {
     protected Iterable<CardView> getCards() {
         Iterable<CardView> zoneCards = player.getCards(zone);
         if ( zoneCards != null ) {
-            cardList = new FCollection<CardView>(zoneCards);
+            cardList = new FCollection<>(zoneCards);
             if ( sortedByName ) {
                 cardList.sort(comp);
             }
diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java
index acb07c234c3..212fd9032e1 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java
@@ -62,9 +62,9 @@ public class ListCardArea extends FloatingCardArea {
 	if (storedArea==null) {
 	    storedArea = new ListCardArea(matchUI);
 	}
-	cardList = new ArrayList<CardView>();
+	cardList = new ArrayList<>();
 	for ( CardView cv : cardList0 ) { cardList.add(cv) ; } 
-	moveableCards = new ArrayList<CardView>();  // make sure moveable cards are in cardlist
+	moveableCards = new ArrayList<>();  // make sure moveable cards are in cardlist
 	for ( CardView card : moveableCards0 ) {
 	    if ( cardList.contains(card) ) {
 		moveableCards.add(card);
@@ -90,8 +90,8 @@ public class ListCardArea extends FloatingCardArea {
 		@Override public void actionPerformed(ActionEvent e) { window.setVisible(false); } 
 	    });
 	window.add(doneButton,BorderLayout.SOUTH);
-	cardList = new ArrayList<CardView>(cardList0);  // this is modified - pfps - is there a better way?
-	moveableCards = new ArrayList<CardView>(moveableCards0);
+	cardList = new ArrayList<>(cardList0);  // this is modified - pfps - is there a better way?
+	moveableCards = new ArrayList<>(moveableCards0);
 	title = title0;
 	toTop = toTop0;
 	toBottom = toBottom0;
diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
index 070d3775bbd..291c02b1253 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
@@ -66,7 +66,7 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
     private final boolean mirror;
 
     // Computed in layout.
-    private List<CardStackRow> rows = new ArrayList<CardStackRow>();
+    private List<CardStackRow> rows = new ArrayList<>();
     private int cardWidth, cardHeight;
     private int playAreaWidth, playAreaHeight;
     private int extraCardSpacingX, cardSpacingX, cardSpacingY;
@@ -373,7 +373,7 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
     }
 
     private List<CardStackRow> tryArrangePilesOfWidth(final CardStackRow lands, final CardStackRow tokens, final CardStackRow creatures, CardStackRow others) {
-        List<CardStackRow> template = new ArrayList<PlayArea.CardStackRow>();
+        List<CardStackRow> template = new ArrayList<>();
         
         int afterFirstRow;
 
@@ -400,7 +400,7 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
         int cntOthers = others.size();
 
         // Copy the template for the case 1st approach won't work
-        final List<CardStackRow> templateCopy = new ArrayList<CardStackRow>(template.size());
+        final List<CardStackRow> templateCopy = new ArrayList<>(template.size());
         for (final CardStackRow row : template) {
             templateCopy.add((CardStackRow) row.clone());
         }
@@ -554,7 +554,7 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
                 for (CardPanel p : stack) {
                     if (p != panel && p.getCard() != null && p.getStack() == stack) {
                         if (otherCardViewsToSelect == null) {
-                            otherCardViewsToSelect = new ArrayList<CardView>();
+                            otherCardViewsToSelect = new ArrayList<>();
                         }
                         otherCardViewsToSelect.add(p.getCard());
                     }
@@ -628,10 +628,10 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
             }
         }
 
-        final List<CardView> toAdd = new ArrayList<CardView>(modelCopy);
+        final List<CardView> toAdd = new ArrayList<>(modelCopy);
         toAdd.removeAll(oldCards);
 
-        final List<CardPanel> newPanels = new ArrayList<CardPanel>();
+        final List<CardPanel> newPanels = new ArrayList<>();
         for (final CardView card : toAdd) {
             final CardPanel placeholder = new CardPanel(getMatchUI(), card);
             placeholder.setDisplayEnabled(false);
diff --git a/forge-gui-desktop/src/test/java/forge/CardRankerTest.java b/forge-gui-desktop/src/test/java/forge/CardRankerTest.java
index 8083210629a..3ab71d505a0 100644
--- a/forge-gui-desktop/src/test/java/forge/CardRankerTest.java
+++ b/forge-gui-desktop/src/test/java/forge/CardRankerTest.java
@@ -24,7 +24,7 @@ public class CardRankerTest {
 
     @Test(timeOut = 1000, enabled = true)
     void testRank() {
-        List<PaperCard> list = new ArrayList<PaperCard>();
+        List<PaperCard> list = new ArrayList<>();
         PaperCard c0 = readCard("makindi_patrol.txt");
         list.add(c0);
         PaperCard c1 = readCard("hero_of_goma_fada.txt");
diff --git a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/GameWrapper.java b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/GameWrapper.java
index 628b9b6b160..725f114f550 100644
--- a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/GameWrapper.java
+++ b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/GameWrapper.java
@@ -50,7 +50,7 @@ public class GameWrapper {
 	 * Note that if you use this option, regular startup is ignored (using player deck, shuffling, drawing hand, mulligan, ...)
 	 */
 	public void runGame() {
-		List<RegisteredPlayer> registeredPlayers = new ArrayList<RegisteredPlayer>();
+		List<RegisteredPlayer> registeredPlayers = new ArrayList<>();
 		for( PlayerSpecification player : players ) {
 			RegisteredPlayer registeredPlayer = new RegisteredPlayer(new Deck(player.getName()));
 			LobbyPlayerForTests lobbyPlayer = new LobbyPlayerForTests( player.getName(), playerActions );
@@ -137,7 +137,7 @@ public class GameWrapper {
         //game.getAction().startGame( null ) determines starting player, draws starting hands, handles mulligans, and initiates the first turn
         //skip drawing initial hand and mulliganing
         game.setAge( GameStage.Play );
-        final HashMap<String, Object> runParams = new HashMap<String, Object>();
+        final HashMap<String, Object> runParams = new HashMap<>();
         game.getTriggerHandler().runTrigger( TriggerType.NewGame, runParams, false );
         //first player in the list starts, no coin toss etc
         game.getPhaseHandler().startFirstTurn( game.getPlayers().get( 0 ) );
diff --git a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/LobbyPlayerForTests.java b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/LobbyPlayerForTests.java
index d99d5b1f11b..2c171929f5a 100644
--- a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/LobbyPlayerForTests.java
+++ b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/LobbyPlayerForTests.java
@@ -22,7 +22,7 @@ public class LobbyPlayerForTests extends LobbyPlayer implements IGameEntitiesFac
     
     public LobbyPlayerForTests(String name, PlayerActions playerActions) {
         super(name);
-        playerControllers = new HashMap<Player, PlayerControllerForTests>();
+        playerControllers = new HashMap<>();
         this.playerActions = playerActions;
     }
 
diff --git a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
index f8a0f1eff77..4e3b48f2917 100644
--- a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
+++ b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
@@ -123,7 +123,7 @@ public class PlayerControllerForTests extends PlayerController {
                 (attacker.getName().equals("Grizzly Bears") && blockers.get(0).getName().equals("Ajani's Sunstriker")) ||
                 (attacker.getName().equals("Ajani's Sunstriker") && blockers.get(0).getName().equals("Grizzly Bears"))
         )) {//test_104_3b_player_with_less_than_zero_life_loses_the_game_only_when_a_player_receives_priority_variant_with_combat
-            Map<Card, Integer> result = new HashMap<Card, Integer>();
+            Map<Card, Integer> result = new HashMap<>();
             result.put(blockers.get(0), damageDealt);
             return result;
         }
@@ -609,7 +609,7 @@ public class PlayerControllerForTests extends PlayerController {
                                                                      CardCollectionView untappedCards, boolean improvise) {
         // TODO: AI to choose a creature to tap would go here
         // Probably along with deciding how many creatures to tap
-        return new HashMap<Card, ManaCostShard>();
+        return new HashMap<>();
     }
 
     @Override
diff --git a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/SpecificationHandler.java b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/SpecificationHandler.java
index 96bd43fa372..0eb86f53329 100644
--- a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/SpecificationHandler.java
+++ b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/SpecificationHandler.java
@@ -22,7 +22,7 @@ public abstract class SpecificationHandler<TYPE, SPECIFICATION extends Specifica
     }
 
     public final Iterable<TYPE> findMatches(Iterable<TYPE> items, final SPECIFICATION specification, final IntegerConstraint expectedNumberOfResults) {
-        List<TYPE> matches = new ArrayList<TYPE>();
+        List<TYPE> matches = new ArrayList<>();
         for (TYPE item : items) {
             if (matches(item, specification)) {
                 matches.add(item);
diff --git a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/gamestate/GameStateSpecificationBuilder.java b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/gamestate/GameStateSpecificationBuilder.java
index d4a1492db25..c4e2211fcab 100644
--- a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/gamestate/GameStateSpecificationBuilder.java
+++ b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/gamestate/GameStateSpecificationBuilder.java
@@ -12,8 +12,8 @@ public class GameStateSpecificationBuilder {
 	private final Map<String,PlayerSpecification> playerFacts;
 	
 	public GameStateSpecificationBuilder() {
-		cards = new ArrayList<CardSpecification>();
-		playerFacts = new HashMap<String,PlayerSpecification>();
+		cards = new ArrayList<>();
+		playerFacts = new HashMap<>();
 	}
 	
 	public GameStateSpecificationBuilder addCard( final CardSpecification cardSpecification ) {
diff --git a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/playeractions/DeclareAttackersAction.java b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/playeractions/DeclareAttackersAction.java
index e52e001f0be..5dd9bfd73d7 100644
--- a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/playeractions/DeclareAttackersAction.java
+++ b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/playeractions/DeclareAttackersAction.java
@@ -12,8 +12,8 @@ public class DeclareAttackersAction extends BasePlayerAction {
 	
 	public DeclareAttackersAction( PlayerSpecification player ) {
 		super( player );
-		playerAttackAssignments = new HashMap<CardSpecification, PlayerSpecification>();
-		planeswalkerAttackAssignments = new HashMap<CardSpecification, CardSpecification>();
+		playerAttackAssignments = new HashMap<>();
+		planeswalkerAttackAssignments = new HashMap<>();
 	}
 	
 	/**
diff --git a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/playeractions/PlayerActions.java b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/playeractions/PlayerActions.java
index c891a034cae..acf1eb016b9 100644
--- a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/playeractions/PlayerActions.java
+++ b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/playeractions/PlayerActions.java
@@ -14,7 +14,7 @@ public class PlayerActions {
 	private final List<BasePlayerAction> playerActions;
 	
 	public PlayerActions( List<? extends BasePlayerAction> playerActions ) {
-		this.playerActions = new LinkedList<BasePlayerAction>( playerActions );
+		this.playerActions = new LinkedList<>(playerActions);
 	}
 	
 	public PlayerActions( BasePlayerAction... basePlayerActions ) {
diff --git a/forge-gui-desktop/src/test/java/forge/gui/ListChooserTest.java b/forge-gui-desktop/src/test/java/forge/gui/ListChooserTest.java
index 945058620db..e6518586ad4 100644
--- a/forge-gui-desktop/src/test/java/forge/gui/ListChooserTest.java
+++ b/forge-gui-desktop/src/test/java/forge/gui/ListChooserTest.java
@@ -15,7 +15,7 @@ public class ListChooserTest {
      */
     @Test(groups = { "UnitTest", "fast" }, timeOut = 1000, enabled = false)
     public void listChooserTest1() {
-        final ListChooser<String> c = new ListChooser<String>("choose a or b", 0, 2, Arrays.asList("a", "b"), null);
+        final ListChooser<String> c = new ListChooser<>("choose a or b", 0, 2, Arrays.asList("a", "b"), null);
         System.out.println(c.show());
         for (final String s : c.getSelectedValues()) {
             System.out.println(s);
diff --git a/forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java b/forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java
index 1514efe2284..0569a0e343e 100644
--- a/forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java
+++ b/forge-gui-desktop/src/test/java/forge/item/DeckHintsTest.java
@@ -41,7 +41,7 @@ public class DeckHintsTest {
         Assert.assertNotNull(hints);
         Assert.assertTrue(hints.isValid());
 
-        List<PaperCard> list = new ArrayList<PaperCard>();
+        List<PaperCard> list = new ArrayList<>();
         list.add(readCard("assault_griffin.txt"));
         list.add(readCard("auramancer.txt"));
 
@@ -61,7 +61,7 @@ public class DeckHintsTest {
         Assert.assertNotNull(hints);
         Assert.assertTrue(hints.isValid());
 
-        List<PaperCard> list = new ArrayList<PaperCard>();
+        List<PaperCard> list = new ArrayList<>();
         list.add(readCard("assault_griffin.txt"));
         list.add(readCard("scepter_of_empires.txt"));
         list.add(readCard("crown_of_empires.txt"));
@@ -79,7 +79,7 @@ public class DeckHintsTest {
         Assert.assertNotNull(hints);
         Assert.assertTrue(hints.isValid());
 
-        List<PaperCard> list = new ArrayList<PaperCard>();
+        List<PaperCard> list = new ArrayList<>();
         list.add(readCard("acidic_slime.txt"));
         list.add(readCard("ajanis_sunstriker.txt"));
 
@@ -96,7 +96,7 @@ public class DeckHintsTest {
         Assert.assertNotNull(hints);
         Assert.assertTrue(hints.isValid());
 
-        List<PaperCard> list = new ArrayList<PaperCard>();
+        List<PaperCard> list = new ArrayList<>();
         list.add(readCard("llanowar_elves.txt"));
         list.add(readCard("unsummon.txt"));
 
@@ -125,7 +125,7 @@ public class DeckHintsTest {
         Assert.assertNotNull(hints);
         Assert.assertTrue(hints.isValid());
 
-        List<PaperCard> list = new ArrayList<PaperCard>();
+        List<PaperCard> list = new ArrayList<>();
         list.add(readCard("assault_griffin.txt"));
         list.add(readCard("breaker_of_armies.txt"));
         list.add(readCard("benthic_infiltrator.txt"));
diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index 6afce5fb824..0c1660c760b 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -47,7 +47,7 @@ public class Forge implements ApplicationListener {
     private static KeyInputAdapter keyInputAdapter;
     private static boolean exited;
     private static int continuousRenderingCount = 1; //initialize to 1 since continuous rendering is the default
-    private static final Stack<FScreen> screens = new Stack<FScreen>();
+    private static final Stack<FScreen> screens = new Stack<>();
     private static boolean textureFiltering = false;
     private static boolean destroyThis = false;
     public static String extrawide = "default";
@@ -486,7 +486,7 @@ public class Forge implements ApplicationListener {
     }
 
     private static class MainInputProcessor extends FGestureAdapter {
-        private static final List<FDisplayObject> potentialListeners = new ArrayList<FDisplayObject>();
+        private static final List<FDisplayObject> potentialListeners = new ArrayList<>();
         private static char lastKeyTyped;
         private static boolean keyTyped, shiftKeyDown;
 
diff --git a/forge-gui-mobile/src/forge/Graphics.java b/forge-gui-mobile/src/forge/Graphics.java
index 64ca50b75a7..58467efc9eb 100644
--- a/forge-gui-mobile/src/forge/Graphics.java
+++ b/forge-gui-mobile/src/forge/Graphics.java
@@ -27,7 +27,7 @@ public class Graphics {
 
     private final SpriteBatch batch = new SpriteBatch();
     private final ShapeRenderer shapeRenderer = new ShapeRenderer();
-    private final Stack<Matrix4> transforms = new Stack<Matrix4>();
+    private final Stack<Matrix4> transforms = new Stack<>();
     private final Vector3 tmp = new Vector3();
     private float regionHeight;
     private Rectangle bounds;
diff --git a/forge-gui-mobile/src/forge/animation/ForgeAnimation.java b/forge-gui-mobile/src/forge/animation/ForgeAnimation.java
index 0c285fff516..4ce7ceb42d3 100644
--- a/forge-gui-mobile/src/forge/animation/ForgeAnimation.java
+++ b/forge-gui-mobile/src/forge/animation/ForgeAnimation.java
@@ -8,7 +8,7 @@ import com.badlogic.gdx.Gdx;
 import forge.Forge;
 
 public abstract class ForgeAnimation {
-    private static final List<ForgeAnimation> activeAnimations = new ArrayList<ForgeAnimation>();
+    private static final List<ForgeAnimation> activeAnimations = new ArrayList<>();
     // A guard against inspecting activeAnimations while it's in the process of being edited
     private static boolean changingActiveAnimations = false;
 
diff --git a/forge-gui-mobile/src/forge/animation/ForgeTransition.java b/forge-gui-mobile/src/forge/animation/ForgeTransition.java
index 89fe4e7fd11..4e2fb125394 100644
--- a/forge-gui-mobile/src/forge/animation/ForgeTransition.java
+++ b/forge-gui-mobile/src/forge/animation/ForgeTransition.java
@@ -15,7 +15,7 @@ public class ForgeTransition extends ForgeAnimation {
         @Override protected void doLayout(final float width, final float height) {
         }
     };
-    private static final Map<FDisplayObject, TransitionObject> transitionLookup = new LinkedHashMap<FDisplayObject, TransitionObject>();
+    private static final Map<FDisplayObject, TransitionObject> transitionLookup = new LinkedHashMap<>();
 
     public static void queue(final FDisplayObject obj, final Rectangle destBounds, final float duration, final Runnable onFinished) {
         queue(obj, destBounds, duration, 0, false, onFinished);
@@ -87,7 +87,7 @@ public class ForgeTransition extends ForgeAnimation {
 
     private static class TransitionObject extends FDisplayObject {
         private final FDisplayObject originalObj;
-        private final LinkedList<ForgeTransition> transitions = new LinkedList<ForgeTransition>();
+        private final LinkedList<ForgeTransition> transitions = new LinkedList<>();
 
         private TransitionObject(final FDisplayObject originalObj0) {
             originalObj = originalObj0;
diff --git a/forge-gui-mobile/src/forge/animation/GifDecoder.java b/forge-gui-mobile/src/forge/animation/GifDecoder.java
index 301bec02894..675d0018ed1 100644
--- a/forge-gui-mobile/src/forge/animation/GifDecoder.java
+++ b/forge-gui-mobile/src/forge/animation/GifDecoder.java
@@ -405,7 +405,7 @@ public class GifDecoder {
     protected void init() {
         status = STATUS_OK;
         frameCount = 0;
-        frames = new Vector<GifFrame>();
+        frames = new Vector<>();
         gct = null;
         lct = null;
     }
@@ -712,7 +712,7 @@ public class GifDecoder {
         }
 
         Texture texture = new Texture(target);
-        Array<TextureRegion> texReg = new Array<TextureRegion>();
+        Array<TextureRegion> texReg = new Array<>();
 
         for(h = 0; h < hzones; h++) {
             for(v = 0; v < vzones; v++) {
diff --git a/forge-gui-mobile/src/forge/assets/BitmapFontWriter.java b/forge-gui-mobile/src/forge/assets/BitmapFontWriter.java
index 768eb1e4efe..05234d5b1d6 100644
--- a/forge-gui-mobile/src/forge/assets/BitmapFontWriter.java
+++ b/forge-gui-mobile/src/forge/assets/BitmapFontWriter.java
@@ -237,7 +237,7 @@ import com.badlogic.gdx.utils.Array;
             buf.append("\t</pages>\n");
         
         //CHARS
-        Array<Glyph> glyphs = new Array<Glyph>(256);
+        Array<Glyph> glyphs = new Array<>(256);
         for (int i=0; i<fontData.glyphs.length; i++) {
             if (fontData.glyphs[i]==null)
                 continue;
diff --git a/forge-gui-mobile/src/forge/assets/FLanguage.java b/forge-gui-mobile/src/forge/assets/FLanguage.java
index 728ca8cf0be..1fbd146f352 100644
--- a/forge-gui-mobile/src/forge/assets/FLanguage.java
+++ b/forge-gui-mobile/src/forge/assets/FLanguage.java
@@ -27,7 +27,7 @@ public class FLanguage {
      * @return the languages
      */
     public static Iterable<String> getAllLanguages() {
-        final List<String> allLanguages = new ArrayList<String>();
+        final List<String> allLanguages = new ArrayList<>();
 
         final FileHandle dir = Gdx.files.absolute(ForgeConstants.LANG_DIR);
         for (FileHandle languageFile : dir.list()) {
diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java
index e39d143d014..4b1e202785a 100644
--- a/forge-gui-mobile/src/forge/assets/FSkin.java
+++ b/forge-gui-mobile/src/forge/assets/FSkin.java
@@ -28,8 +28,8 @@ import forge.screens.SplashScreen;
 import forge.toolbox.FProgressBar;
 
 public class FSkin {
-    private static final Map<FSkinProp, FSkinImage> images = new HashMap<FSkinProp, FSkinImage>();
-    private static final Map<Integer, TextureRegion> avatars = new HashMap<Integer, TextureRegion>();
+    private static final Map<FSkinProp, FSkinImage> images = new HashMap<>();
+    private static final Map<Integer, TextureRegion> avatars = new HashMap<>();
 
     private static List<String> allSkins;
     private static FileHandle preferredDir;
@@ -98,7 +98,7 @@ public class FSkin {
         else {
             if (splashScreen != null) {
                 if (allSkins == null) { //initialize
-                    allSkins = new ArrayList<String>();
+                    allSkins = new ArrayList<>();
                     final List<String> skinDirectoryNames = getSkinDirectoryNames();
                     for (final String skinDirectoryName : skinDirectoryNames) {
                         allSkins.add(WordUtils.capitalize(skinDirectoryName.replace('_', ' ')));
@@ -173,7 +173,7 @@ public class FSkin {
 
         avatars.clear();
 
-        final Map<String, Texture> textures = new HashMap<String, Texture>();
+        final Map<String, Texture> textures = new HashMap<>();
 
         // Grab and test various sprite files.
         final FileHandle f1 = getDefaultSkinFile(SourceFile.ICONS.getFilename());
@@ -309,7 +309,7 @@ public class FSkin {
      * @return the skins
      */
     public static List<String> getSkinDirectoryNames() {
-        final List<String> mySkins = new ArrayList<String>();
+        final List<String> mySkins = new ArrayList<>();
 
         final FileHandle dir = Gdx.files.absolute(ForgeConstants.SKINS_DIR);
         for (FileHandle skinFile : dir.list()) {
diff --git a/forge-gui-mobile/src/forge/assets/FSkinColor.java b/forge-gui-mobile/src/forge/assets/FSkinColor.java
index a5464aa8613..883088687f3 100644
--- a/forge-gui-mobile/src/forge/assets/FSkinColor.java
+++ b/forge-gui-mobile/src/forge/assets/FSkinColor.java
@@ -69,8 +69,8 @@ public class FSkinColor {
         return new FSkinColor(c0, NO_BRIGHTNESS_DELTA, NO_STEP, NO_STEP, NO_ALPHA);
     }
 
-    private static final HashMap<Colors, FSkinColor> baseColors = new HashMap<Colors, FSkinColor>();
-    private static final HashMap<String, FSkinColor> derivedColors = new HashMap<String, FSkinColor>();
+    private static final HashMap<Colors, FSkinColor> baseColors = new HashMap<>();
+    private static final HashMap<String, FSkinColor> derivedColors = new HashMap<>();
     private static final int NO_BRIGHTNESS_DELTA = 0;
     private static final int NO_STEP = -999; //needs to be large negative since small negative values are valid
     private static final int NO_ALPHA = -1;
diff --git a/forge-gui-mobile/src/forge/assets/FSkinFont.java b/forge-gui-mobile/src/forge/assets/FSkinFont.java
index 5da5896c204..646a6df6920 100644
--- a/forge-gui-mobile/src/forge/assets/FSkinFont.java
+++ b/forge-gui-mobile/src/forge/assets/FSkinFont.java
@@ -25,7 +25,7 @@ public class FSkinFont {
     private static final int MAX_FONT_SIZE = 72;
 
     private static final String TTF_FILE = "font1.ttf";
-    private static final Map<Integer, FSkinFont> fonts = new HashMap<Integer, FSkinFont>();
+    private static final Map<Integer, FSkinFont> fonts = new HashMap<>();
     private static final GlyphLayout layout = new GlyphLayout();
 
     static {
diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index 681e1dec9b3..6245e4ef2a4 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -51,7 +51,7 @@ import java.util.concurrent.TimeUnit;
 public class ImageCache {
     // short prefixes to save memory
 
-    private static final Set<String> missingIconKeys = new HashSet<String>();
+    private static final Set<String> missingIconKeys = new HashSet<>();
     private static final LoadingCache<String, Texture> cache = CacheBuilder.newBuilder()
             .maximumSize(400)
             .expireAfterAccess(15,TimeUnit.MINUTES)
diff --git a/forge-gui-mobile/src/forge/assets/TextRenderer.java b/forge-gui-mobile/src/forge/assets/TextRenderer.java
index 0b77c8341a5..d73a5b966fd 100644
--- a/forge-gui-mobile/src/forge/assets/TextRenderer.java
+++ b/forge-gui-mobile/src/forge/assets/TextRenderer.java
@@ -16,7 +16,7 @@ import forge.util.TextBounds;
 
 //Encodes text for drawing with symbols and reminder text
 public class TextRenderer {
-    private static final Map<String, FSkinImage> symbolLookup = new HashMap<String, FSkinImage>();
+    private static final Map<String, FSkinImage> symbolLookup = new HashMap<>();
     static {
         symbolLookup.put("C", FSkinImage.MANA_COLORLESS);
         symbolLookup.put("W", FSkinImage.MANA_W);
@@ -77,8 +77,8 @@ public class TextRenderer {
     private float width, height, totalHeight;
     private FSkinFont baseFont, font;
     private boolean wrap, needClip;
-    private List<Piece> pieces = new ArrayList<Piece>();
-    private List<Float> lineWidths = new ArrayList<Float>();
+    private List<Piece> pieces = new ArrayList<>();
+    private List<Float> lineWidths = new ArrayList<>();
 
     public TextRenderer() {
         this(false);
diff --git a/forge-gui-mobile/src/forge/card/CardFaceSymbols.java b/forge-gui-mobile/src/forge/card/CardFaceSymbols.java
index d48c69d4253..7a86a49966f 100644
--- a/forge-gui-mobile/src/forge/card/CardFaceSymbols.java
+++ b/forge-gui-mobile/src/forge/card/CardFaceSymbols.java
@@ -29,7 +29,7 @@ import java.util.StringTokenizer;
 
 public class CardFaceSymbols {
     public static final float FONT_SIZE_FACTOR = 0.85f;
-    private static final Map<String, FSkinImage> MANA_IMAGES = new HashMap<String, FSkinImage>();
+    private static final Map<String, FSkinImage> MANA_IMAGES = new HashMap<>();
 
     public static void loadImages() {
         for (int i = 0; i <= 20; i++) {
diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java
index f9d3a2e40ef..88d6f1b28b2 100644
--- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java
+++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java
@@ -273,7 +273,7 @@ public class CardImageRenderer {
     }
 
     private static void drawPtBox(Graphics g, CardView card, CardStateView state, Color[] colors, float x, float y, float w, float h) {
-        List<String> pieces = new ArrayList<String>();
+        List<String> pieces = new ArrayList<>();
         if (state.isCreature()) {
             pieces.add(String.valueOf(state.getPower()));
             pieces.add("/");
diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java
index e60b1faf7c7..aa898eb012f 100644
--- a/forge-gui-mobile/src/forge/card/CardRenderer.java
+++ b/forge-gui-mobile/src/forge/card/CardRenderer.java
@@ -133,7 +133,7 @@ public class CardRenderer {
         return Math.round(MANA_SYMBOL_SIZE + FSkinFont.get(12).getLineHeight() + 3 * FList.PADDING + 1);
     }
 
-    private static final Map<String, FImageComplex> cardArtCache = new HashMap<String, FImageComplex>();
+    private static final Map<String, FImageComplex> cardArtCache = new HashMap<>();
     public static final float CARD_ART_RATIO = 1.302f;
     public static final float CARD_ART_HEIGHT_PERCENTAGE = 0.43f;
 
@@ -651,7 +651,7 @@ public class CardRenderer {
     private static void drawPtBox(Graphics g, CardView card, CardStateView details, Color color, float x, float y, float w, float h) {
         //use array of strings to render separately with a tiny amount of space in between
         //instead of using actual spaces which are too wide
-        List<String> pieces = new ArrayList<String>();
+        List<String> pieces = new ArrayList<>();
         if (details.isCreature()) {
             pieces.add(String.valueOf(details.getPower()));
             pieces.add("/");
@@ -678,7 +678,7 @@ public class CardRenderer {
         FSkinFont font = FSkinFont.forHeight(h * 0.15f);
         float padding = Math.round(font.getCapHeight() / 4);
         float boxWidth = padding;
-        List<Float> pieceWidths = new ArrayList<Float>();
+        List<Float> pieceWidths = new ArrayList<>();
         for (String piece : pieces) {
             float pieceWidth = font.getBounds(piece).width + padding;
             pieceWidths.add(pieceWidth);
diff --git a/forge-gui-mobile/src/forge/card/CardZoom.java b/forge-gui-mobile/src/forge/card/CardZoom.java
index 72536fe686b..b3cdd3a599a 100644
--- a/forge-gui-mobile/src/forge/card/CardZoom.java
+++ b/forge-gui-mobile/src/forge/card/CardZoom.java
@@ -47,7 +47,7 @@ public class CardZoom extends FOverlay {
     private static boolean showAltState;
 
     public static void show(Object item) {
-        List<Object> items0 = new ArrayList<Object>();
+        List<Object> items0 = new ArrayList<>();
         items0.add(item);
         show(items0, 0, null);
     }
diff --git a/forge-gui-mobile/src/forge/card/GameEntityPicker.java b/forge-gui-mobile/src/forge/card/GameEntityPicker.java
index 6a18df6d474..d26f262d259 100644
--- a/forge-gui-mobile/src/forge/card/GameEntityPicker.java
+++ b/forge-gui-mobile/src/forge/card/GameEntityPicker.java
@@ -83,7 +83,7 @@ public class GameEntityPicker extends TabPageScreen<GameEntityPicker> {
                         list.setListData(items);
                     }
                     else {
-                        List<GameEntityView> filteredList = new ArrayList<GameEntityView>();
+                        List<GameEntityView> filteredList = new ArrayList<>();
                         for (GameEntityView option : items) {
                             if (option.toString().toLowerCase().contains(pattern)) {
                                 filteredList.add(option);
diff --git a/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java b/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java
index 54d87c54410..a6a03bf06e9 100644
--- a/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java
+++ b/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java
@@ -61,7 +61,7 @@ public class AddBasicLandsDialog extends FDialog {
     private final Callback<CardPool> callback;
 
     private final FLabel lblLandSet = add(new FLabel.Builder().text("Land Set:").font(FSkinFont.get(12)).textColor(FLabel.INLINE_LABEL_COLOR).build());
-    private final FComboBox<CardEdition> cbLandSet = add(new FComboBox<CardEdition>(Iterables.filter(StaticData.instance().getEditions(), CardEdition.Predicates.hasBasicLands)));
+    private final FComboBox<CardEdition> cbLandSet = add(new FComboBox<>(Iterables.filter(StaticData.instance().getEditions(), CardEdition.Predicates.hasBasicLands)));
 
     private final FScrollPane scroller = add(new FScrollPane() {
         @Override
@@ -312,7 +312,7 @@ public class AddBasicLandsDialog extends FDialog {
         private LandPanel(String cardName0) {
             cardName = cardName0;
             cardPanel = add(new LandCardPanel());
-            cbLandArt = add(new FComboBox<String>());
+            cbLandArt = add(new FComboBox<>());
             cbLandArt.setFont(cbLandSet.getFont());
             cbLandArt.setChangedHandler(new FEventHandler() {
                 @Override
diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java
index 0419df3c7ed..8f53bb83989 100644
--- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java
+++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java
@@ -472,7 +472,7 @@ public class FDeckChooser extends FScreen {
         selectedDeckType = defaultDeckType;
 
         if (cmbDeckTypes == null) { //initialize components with delayed initialization the first time this is populated
-            cmbDeckTypes = new FComboBox<DeckType>();
+            cmbDeckTypes = new FComboBox<>();
             switch (lstDecks.getGameType()) {
             case Constructed:
             case Gauntlet:
@@ -1015,7 +1015,7 @@ public class FDeckChooser extends FScreen {
     private List<String> getSelectedDecksFromSavedState(String savedState) {
         try {
             if (StringUtils.isBlank(savedState)) {
-                return new ArrayList<String>();
+                return new ArrayList<>();
             }
             else {
                 return Arrays.asList(savedState.split(";")[1].split(SELECTED_DECK_DELIMITER));
@@ -1023,7 +1023,7 @@ public class FDeckChooser extends FScreen {
         }
         catch (Exception ex) {
             System.err.println(ex + " [savedState=" + savedState + "]");
-            return new ArrayList<String>();
+            return new ArrayList<>();
         }
     }
 
@@ -1087,11 +1087,13 @@ public class FDeckChooser extends FScreen {
                     deckTypes.remove(DeckType.VINTAGE_CARDGEN_DECK);
                 }
 
-                ListChooser<DeckType> chooser = new ListChooser<DeckType>(
+                ListChooser<DeckType> chooser = new ListChooser<>(
                         "Choose allowed deck types for opponents", 0, deckTypes.size(), deckTypes, null, new Callback<List<DeckType>>() {
                     @Override
                     public void run(final List<DeckType> allowedDeckTypes) {
-                        if (allowedDeckTypes == null || allowedDeckTypes.isEmpty()) { return; }
+                        if (allowedDeckTypes == null || allowedDeckTypes.isEmpty()) {
+                            return;
+                        }
 
                         FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
                             @Override
@@ -1112,7 +1114,7 @@ public class FDeckChooser extends FScreen {
                                                 GauntletData gauntlet = GauntletUtil.createQuickGauntlet(userDeck, numOpponents, allowedDeckTypes, netCat);
                                                 FModel.setGauntletData(gauntlet);
 
-                                                List<RegisteredPlayer> players = new ArrayList<RegisteredPlayer>();
+                                                List<RegisteredPlayer> players = new ArrayList<>();
                                                 RegisteredPlayer humanPlayer = new RegisteredPlayer(userDeck).setPlayer(GamePlayerUtil.getGuiPlayer());
                                                 players.add(humanPlayer);
                                                 players.add(new RegisteredPlayer(gauntlet.getDecks().get(gauntlet.getCompleted())).setPlayer(GamePlayerUtil.createAiPlayer()));
@@ -1140,10 +1142,10 @@ public class FDeckChooser extends FScreen {
                 LoadingOverlay.show("Loading new game...", new Runnable() {
                     @Override
                     public void run() {
-                        Set<GameType> appliedVariants = new HashSet<GameType>();
+                        Set<GameType> appliedVariants = new HashSet<>();
                         appliedVariants.add(variant);
 
-                        List<RegisteredPlayer> players = new ArrayList<RegisteredPlayer>();
+                        List<RegisteredPlayer> players = new ArrayList<>();
                         RegisteredPlayer humanPlayer = RegisteredPlayer.forVariants(2, appliedVariants, userDeck, null, false, null, null);
                         humanPlayer.setPlayer(GamePlayerUtil.getGuiPlayer());
                         RegisteredPlayer aiPlayer = RegisteredPlayer.forVariants(2, appliedVariants, aiDeck, null, false, null, null);
@@ -1151,7 +1153,7 @@ public class FDeckChooser extends FScreen {
                         players.add(humanPlayer);
                         players.add(aiPlayer);
 
-                        final Map<RegisteredPlayer, IGuiGame> guiMap = new HashMap<RegisteredPlayer, IGuiGame>();
+                        final Map<RegisteredPlayer, IGuiGame> guiMap = new HashMap<>();
                         guiMap.put(humanPlayer, MatchController.instance);
 
                         final HostedMatch hostedMatch = GuiBase.getInterface().hostMatch();
diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java
index c3cb2a257b2..70be5c3361e 100644
--- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java
+++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java
@@ -49,79 +49,79 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
     private static final float HEADER_HEIGHT = Math.round(Utils.AVG_FINGER_HEIGHT * 0.8f);
 
     public enum EditorType {
-        Constructed(new DeckController<Deck>(FModel.getDecks().getConstructed(), new Supplier<Deck>() {
+        Constructed(new DeckController<>(FModel.getDecks().getConstructed(), new Supplier<Deck>() {
             @Override
             public Deck get() {
                 return new Deck();
             }
         }), null),
-        Draft(new DeckController<DeckGroup>(FModel.getDecks().getDraft(), new Supplier<DeckGroup>() {
+        Draft(new DeckController<>(FModel.getDecks().getDraft(), new Supplier<DeckGroup>() {
             @Override
             public DeckGroup get() {
                 return new DeckGroup("");
             }
         }), null),
-        Sealed(new DeckController<DeckGroup>(FModel.getDecks().getSealed(), new Supplier<DeckGroup>() {
+        Sealed(new DeckController<>(FModel.getDecks().getSealed(), new Supplier<DeckGroup>() {
             @Override
             public DeckGroup get() {
                 return new DeckGroup("");
             }
         }), null),
-        Winston(new DeckController<DeckGroup>(FModel.getDecks().getWinston(), new Supplier<DeckGroup>() {
+        Winston(new DeckController<>(FModel.getDecks().getWinston(), new Supplier<DeckGroup>() {
             @Override
             public DeckGroup get() {
                 return new DeckGroup("");
             }
         }), null),
-        Commander(new DeckController<Deck>(FModel.getDecks().getCommander(), new Supplier<Deck>() {
+        Commander(new DeckController<>(FModel.getDecks().getCommander(), new Supplier<Deck>() {
             @Override
             public Deck get() {
                 return new Deck();
             }
         }), null),
-        Oathbreaker(new DeckController<Deck>(FModel.getDecks().getOathbreaker(), new Supplier<Deck>() {
+        Oathbreaker(new DeckController<>(FModel.getDecks().getOathbreaker(), new Supplier<Deck>() {
             @Override
             public Deck get() {
                 return new Deck();
             }
         }), null),
-        TinyLeaders(new DeckController<Deck>(FModel.getDecks().getTinyLeaders(), new Supplier<Deck>() {
+        TinyLeaders(new DeckController<>(FModel.getDecks().getTinyLeaders(), new Supplier<Deck>() {
             @Override
             public Deck get() {
                 return new Deck();
             }
         }), DeckFormat.TinyLeaders.isLegalCardPredicate()),
-        Brawl(new DeckController<Deck>(FModel.getDecks().getBrawl(), new Supplier<Deck>() {
+        Brawl(new DeckController<>(FModel.getDecks().getBrawl(), new Supplier<Deck>() {
             @Override
             public Deck get() {
                 return new Deck();
             }
         }), DeckFormat.Brawl.isLegalCardPredicate()),
-        Archenemy(new DeckController<Deck>(FModel.getDecks().getScheme(), new Supplier<Deck>() {
+        Archenemy(new DeckController<>(FModel.getDecks().getScheme(), new Supplier<Deck>() {
             @Override
             public Deck get() {
                 return new Deck();
             }
         }), null),
-        Planechase(new DeckController<Deck>(FModel.getDecks().getPlane(), new Supplier<Deck>() {
+        Planechase(new DeckController<>(FModel.getDecks().getPlane(), new Supplier<Deck>() {
             @Override
             public Deck get() {
                 return new Deck();
             }
         }), null),
-        Quest(new DeckController<Deck>(null, new Supplier<Deck>() { //delay setting root folder until quest loaded
+        Quest(new DeckController<>(null, new Supplier<Deck>() { //delay setting root folder until quest loaded
             @Override
             public Deck get() {
                 return new Deck();
             }
         }), null),
-        QuestDraft(new DeckController<DeckGroup>(null, new Supplier<DeckGroup>() { //delay setting root folder until quest loaded
+        QuestDraft(new DeckController<>(null, new Supplier<DeckGroup>() { //delay setting root folder until quest loaded
             @Override
             public DeckGroup get() {
                 return new DeckGroup("");
             }
         }), null),
-        PlanarConquest(new DeckController<Deck>(null, new Supplier<Deck>() { //delay setting root folder until conquest loaded
+        PlanarConquest(new DeckController<>(null, new Supplier<Deck>() { //delay setting root folder until conquest loaded
             @Override
             public Deck get() {
                 return new Deck();
@@ -152,7 +152,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
                 filter = Predicates.and(filter, additionalFilter);
             }
 
-            ItemPool<PaperCard> filteredPool = new ItemPool<PaperCard>(PaperCard.class);
+            ItemPool<PaperCard> filteredPool = new ItemPool<>(PaperCard.class);
             for (Entry<PaperCard, Integer> entry : cardPool) {
                 if (filter.apply(entry.getKey())) {
                     filteredPool.add(entry.getKey(), entry.getValue());
@@ -733,7 +733,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
         protected abstract void buildMenu(final FDropDownMenu menu, final PaperCard card);
 
         private ItemPool<PaperCard> getAllowedAdditions(Iterable<Entry<PaperCard, Integer>> itemsToAdd, boolean isAddSource) {
-            ItemPool<PaperCard> additions = new ItemPool<PaperCard>(cardManager.getGenericType());
+            ItemPool<PaperCard> additions = new ItemPool<>(cardManager.getGenericType());
             CardLimit limit = parentScreen.getCardLimit();
             Deck deck = parentScreen.getDeck();
 
@@ -1026,7 +1026,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
                 cardManager.setPool(ItemPool.createFrom(FModel.getMagicDb().getVariantCards().getAllCards(Predicates.compose(CardRulesPredicates.Presets.IS_PLANE_OR_PHENOMENON, PaperCard.FN_GET_RULES)), PaperCard.class), true);
                 break;
             case Quest:
-                final ItemPool<PaperCard> questPool = new ItemPool<PaperCard>(PaperCard.class);
+                final ItemPool<PaperCard> questPool = new ItemPool<>(PaperCard.class);
                 questPool.addAll(FModel.getQuest().getCards().getCardpool());
                 // remove bottom cards that are in the deck from the card pool
                 questPool.removeAll(parentScreen.getDeck().getMain());
@@ -1175,7 +1175,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
                         @Override
                         public void handleEvent(FEvent e) {
                             //sort options so current option is on top and selected by default
-                            List<PaperCard> sortedOptions = new ArrayList<PaperCard>();
+                            List<PaperCard> sortedOptions = new ArrayList<>();
                             sortedOptions.add(card);
                             for (PaperCard option : artOptions) {
                                 if (option != card) {
diff --git a/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java b/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java
index e00e009a551..999d4568fe9 100644
--- a/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java
+++ b/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java
@@ -49,8 +49,8 @@ public class FDeckImportDialog extends FDialog {
     */
     private final FCheckBox onlyCoreExpCheck = add(new FCheckBox("Use only core and expansion sets", false));
 
-    private final FComboBox<String> monthDropdown = add(new FComboBox<String>()); //don't need wrappers since skin can't change while this dialog is open
-    private final FComboBox<Integer> yearDropdown = add(new FComboBox<Integer>());
+    private final FComboBox<String> monthDropdown = add(new FComboBox<>()); //don't need wrappers since skin can't change while this dialog is open
+    private final FComboBox<Integer> yearDropdown = add(new FComboBox<>());
 
     private final boolean showOptions;
     private final DeckImportController controller;
diff --git a/forge-gui-mobile/src/forge/itemmanager/CardManager.java b/forge-gui-mobile/src/forge/itemmanager/CardManager.java
index bb0d0168cd0..6f194a42afc 100644
--- a/forge-gui-mobile/src/forge/itemmanager/CardManager.java
+++ b/forge-gui-mobile/src/forge/itemmanager/CardManager.java
@@ -57,7 +57,7 @@ public class CardManager extends ItemManager<PaperCard> {
     }
 
     public static AdvancedSearchFilter<PaperCard> createAdvancedSearchFilter(final ItemManager<? super PaperCard> itemManager) {
-        return new AdvancedSearchFilter<PaperCard>(itemManager);
+        return new AdvancedSearchFilter<>(itemManager);
     }
 
     @Override
diff --git a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java
index f5f13203a10..d48e2a6e067 100644
--- a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java
+++ b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java
@@ -68,12 +68,12 @@ public final class DeckManager extends ItemManager<DeckProxy> implements IHasGam
 
     @Override
     protected TextSearchFilter<DeckProxy> createSearchFilter() {
-        return new TextSearchFilter<DeckProxy>(this);
+        return new TextSearchFilter<>(this);
     }
 
     @Override
     protected AdvancedSearchFilter<DeckProxy> createAdvancedSearchFilter() {
-        return new AdvancedSearchFilter<DeckProxy>(this);
+        return new AdvancedSearchFilter<>(this);
     }
 
     @Override
diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
index c8110863cb7..d2b9a769b79 100644
--- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
+++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
@@ -63,7 +63,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
     protected final ItemManagerModel<T> model;
     private Predicate<? super T> filterPredicate = null;
     private AdvancedSearchFilter<? extends T> advancedSearchFilter;
-    private final List<ItemFilter<? extends T>> filters = new ArrayList<ItemFilter<? extends T>>();
+    private final List<ItemFilter<? extends T>> filters = new ArrayList<>();
     private boolean hideFilters = false;
     private boolean wantUnique = false;
     private boolean multiSelectMode = false;
@@ -74,7 +74,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
     private ItemManagerConfig config;
     private Function<Entry<? extends InventoryItem, Integer>, Object> fnNewGet;
     private boolean viewUpdating, needSecondUpdate;
-    private List<ItemColumn> sortCols = new ArrayList<ItemColumn>();
+    private List<ItemColumn> sortCols = new ArrayList<>();
 
     private final TextSearchFilter<? extends T> searchFilter;
 
@@ -89,7 +89,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
 
     private final FComboBox<ItemColumn> cbxSortOptions;
 
-    private final List<ItemView<T>> views = new ArrayList<ItemView<T>>();
+    private final List<ItemView<T>> views = new ArrayList<>();
     private final ItemListView<T> listView;
     private final ImageView<T> imageView;
     private ItemView<T> currentView;
@@ -106,11 +106,11 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
     protected ItemManager(final Class<T> genericType0, final boolean wantUnique0) {
         genericType = genericType0;
         wantUnique = wantUnique0;
-        model = new ItemManagerModel<T>(genericType0);
+        model = new ItemManagerModel<>(genericType0);
 
         searchFilter = createSearchFilter();
 
-        listView = new ItemListView<T>(this, model);
+        listView = new ItemListView<>(this, model);
         imageView = createImageView(model);
 
         views.add(listView);
@@ -125,7 +125,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
         add(btnAdvancedSearchOptions);
         btnAdvancedSearchOptions.setSelected(!hideFilters);
         if (allowSortChange()) {
-            cbxSortOptions = add(new FComboBox<ItemColumn>("Sort: "));
+            cbxSortOptions = add(new FComboBox<>("Sort: "));
             cbxSortOptions.setFont(FSkinFont.get(12));
         }
         else {
@@ -205,7 +205,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
     }
 
     protected ImageView<T> createImageView(final ItemManagerModel<T> model0) {
-        return new ImageView<T>(this, model0);
+        return new ImageView<>(this, model0);
     }
 
     public ItemManagerConfig getConfig() {
@@ -220,7 +220,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
         setWantUnique(config0.getUniqueCardsOnly());
 
         //ensure sort cols ordered properly
-        final List<ItemColumn> cols = new LinkedList<ItemColumn>();
+        final List<ItemColumn> cols = new LinkedList<>();
         for (ItemColumnConfig colConfig : config.getCols().values()) {
             if (colOverrides == null || !colOverrides.containsKey(colConfig.getDef())) {
                 cols.add(new ItemColumn(colConfig));
@@ -437,7 +437,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
     }
 
     public ItemPool<T> getSelectedItemPool() {
-        ItemPool<T> selectedItemPool = new ItemPool<T>(genericType);
+        ItemPool<T> selectedItemPool = new ItemPool<>(genericType);
         if (currentView == listView) {
             for (T item : getSelectedItems()) {
                 selectedItemPool.add(item, getItemCount(item));
@@ -475,7 +475,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
     }
 
     public boolean setSelectedStrings(Iterable<String> strings) {
-        List<T> items = new ArrayList<T>();
+        List<T> items = new ArrayList<>();
         for (String str : strings) {
             T item = stringToItem(str);
             if (item != null) {
@@ -486,7 +486,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
     }
 
     public boolean selectItemEntrys(Iterable<Entry<T, Integer>> itemEntrys) {
-        List<T> items = new ArrayList<T>();
+        List<T> items = new ArrayList<>();
         for (Entry<T, Integer> itemEntry : itemEntrys) {
             items.add(itemEntry.getKey());
         }
@@ -521,7 +521,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
         if (isUnfiltered()) {
             model.addItem(item, qty);
         }
-        List<T> items = new ArrayList<T>();
+        List<T> items = new ArrayList<>();
         items.add(item);
         updateView(false, items);
     }
@@ -532,7 +532,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
             model.addItems(itemsToAdd);
         }
 
-        List<T> items = new ArrayList<T>();
+        List<T> items = new ArrayList<>();
         for (Map.Entry<T, Integer> item : itemsToAdd) {
             items.add(item.getKey());
         }
@@ -695,7 +695,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
     public boolean applyFilters() {
         if (lockFiltering || !initialized) { return false; }
 
-        List<Predicate<? super T>> predicates = new ArrayList<Predicate<? super T>>();
+        List<Predicate<? super T>> predicates = new ArrayList<>();
         for (ItemFilter<? extends T> filter : filters) {
             if (!filter.isEmpty()) {
                 predicates.add(filter.buildPredicate(genericType));
diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java
index b01dfcc9a9a..58327e7245c 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java
@@ -35,12 +35,12 @@ public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T>
 
     public AdvancedSearchFilter(ItemManager<? super T> itemManager0) {
         super(itemManager0);
-        model = new AdvancedSearch.Model<T>();
+        model = new AdvancedSearch.Model<>();
     }
 
     @Override
     public ItemFilter<T> createCopy() {
-        AdvancedSearchFilter<T> copy = new AdvancedSearchFilter<T>(itemManager);
+        AdvancedSearchFilter<T> copy = new AdvancedSearchFilter<>(itemManager);
         return copy;
     }
 
diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java
index c4e657e1ca0..7fac6999178 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java
@@ -38,7 +38,7 @@ public class CardTypeFilter extends StatTypeFilter<PaperCard> {
 
     @Override
     protected final Predicate<PaperCard> buildPredicate() {
-        final List<Predicate<CardRules>> types = new ArrayList<Predicate<CardRules>>();
+        final List<Predicate<CardRules>> types = new ArrayList<>();
 
         for (StatTypes s : buttonMap.keySet()) {
             if (s.predicate != null && buttonMap.get(s).isSelected()) {
diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/DeckFolderFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/DeckFolderFilter.java
index d83ff7dd814..3d4001e3818 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/DeckFolderFilter.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/DeckFolderFilter.java
@@ -10,7 +10,7 @@ import java.util.Set;
 
 
 public class DeckFolderFilter extends ListLabelFilter<DeckProxy> {
-    protected final Set<String> folders = new HashSet<String>();
+    protected final Set<String> folders = new HashSet<>();
 
     public DeckFolderFilter(ItemManager<? super DeckProxy> itemManager0) {
         super(itemManager0);
diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
index fbd78453c3b..b1e89e6c20d 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
@@ -31,7 +31,7 @@ public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T
     protected GameFormat format;
     private String selectedFormat;
     private boolean preventHandling = false;
-    private FComboBox<Object> cbxFormats = new FComboBox<Object>();
+    private FComboBox<Object> cbxFormats = new FComboBox<>();
 
     public FormatFilter(ItemManager<? super T> itemManager0) {
         super(itemManager0);
@@ -122,8 +122,8 @@ public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T
     }
 
     private class MultiSetSelect extends FScreen {
-        private final Set<CardEdition> selectedSets = new HashSet<CardEdition>();
-        private final FGroupList<CardEdition> lstSets = add(new FGroupList<CardEdition>());
+        private final Set<CardEdition> selectedSets = new HashSet<>();
+        private final FGroupList<CardEdition> lstSets = add(new FGroupList<>());
 
         private MultiSetSelect() {
             super("Choose Sets");
@@ -177,8 +177,8 @@ public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T
         @Override
         public void onClose(Callback<Boolean> canCloseCallback) {
             if (selectedSets.size() > 0) {
-                List<String> setCodes = new ArrayList<String>();
-                List<CardEdition> sortedSets = new ArrayList<CardEdition>(selectedSets);
+                List<String> setCodes = new ArrayList<>();
+                List<CardEdition> sortedSets = new ArrayList<>(selectedSets);
                 Collections.sort(sortedSets);
                 for (CardEdition set : sortedSets) {
                     setCodes.add(set.getCode());
diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/HistoricFormatSelect.java b/forge-gui-mobile/src/forge/itemmanager/filters/HistoricFormatSelect.java
index 10e27b27a48..ad7831603fa 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/HistoricFormatSelect.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/HistoricFormatSelect.java
@@ -24,7 +24,7 @@ import java.util.Set;
 public class HistoricFormatSelect extends FScreen {
 
     private GameFormat selectedFormat;
-    private final FGroupList<GameFormat> lstFormats = add(new FGroupList<GameFormat>());
+    private final FGroupList<GameFormat> lstFormats = add(new FGroupList<>());
     private final Set<GameFormat.FormatSubType> historicSubTypes = new HashSet<>(Arrays.asList(GameFormat.FormatSubType.Block,
             GameFormat.FormatSubType.Standard,GameFormat.FormatSubType.Extended,GameFormat.FormatSubType.Modern,
             GameFormat.FormatSubType.Legacy, GameFormat.FormatSubType.Vintage));
diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/StatTypeFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/StatTypeFilter.java
index c93f419b0b5..b2d4ac67f60 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/StatTypeFilter.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/StatTypeFilter.java
@@ -18,7 +18,7 @@ public abstract class StatTypeFilter<T extends InventoryItem> extends ToggleButt
 
     public StatTypeFilter(ItemManager<? super T> itemManager0) {
         super(itemManager0);
-        buttonMap = new HashMap<SItemManagerUtil.StatTypes, FLabel>();
+        buttonMap = new HashMap<>();
     }
 
     protected void addToggleButton(Widget widget, final StatTypes st) {
diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java
index f1237a7ca37..c2cac6fdcdf 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java
@@ -25,7 +25,7 @@ public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
 
     @Override
     public ItemFilter<T> createCopy() {
-        TextSearchFilter<T> copy = new TextSearchFilter<T>(itemManager);
+        TextSearchFilter<T> copy = new TextSearchFilter<>(itemManager);
         copy.getWidget(); //initialize widget
         copy.txtSearch.setText(this.txtSearch.getText());
         return copy;
diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java
index dc78154a668..61f986c9c38 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java
@@ -16,7 +16,7 @@ import forge.toolbox.FLabel;
 
 public abstract class ToggleButtonsFilter<T extends InventoryItem> extends ItemFilter<T> {
     protected boolean lockFiltering;
-    private final List<FLabel> buttons = new ArrayList<FLabel>();
+    private final List<FLabel> buttons = new ArrayList<>();
 
     protected ToggleButtonsFilter(ItemManager<? super T> itemManager0) {
         super(itemManager0);
diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
index 9c5d81b57c4..199d7bc3280 100644
--- a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
+++ b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
@@ -55,7 +55,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
     private static final int MIN_COLUMN_COUNT = 1;
     private static final int MAX_COLUMN_COUNT = 10;
 
-    private final List<Integer> selectedIndices = new ArrayList<Integer>();
+    private final List<Integer> selectedIndices = new ArrayList<>();
     private int columnCount = 4;
     private float scrollHeight = 0;
     private ColumnDef pileBy = null;
@@ -63,8 +63,8 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
     private ItemInfo focalItem;
     private boolean updatingLayout;
     private float totalZoomAmount;
-    private final List<ItemInfo> orderedItems = new ArrayList<ItemInfo>();
-    private final List<Group> groups = new ArrayList<Group>();
+    private final List<ItemInfo> orderedItems = new ArrayList<>();
+    private final List<Group> groups = new ArrayList<>();
 
     private class ExpandCollapseButton extends FLabel {
         private boolean isAllCollapsed;
@@ -135,8 +135,8 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
         }
     }
     private final ExpandCollapseButton btnExpandCollapseAll = new ExpandCollapseButton();
-    private final FComboBox<Object> cbGroupByOptions = new FComboBox<Object>("Groups: ");
-    private final FComboBox<Object> cbPileByOptions = new FComboBox<Object>("Piles: ");
+    private final FComboBox<Object> cbGroupByOptions = new FComboBox<>("Groups: ");
+    private final FComboBox<Object> cbPileByOptions = new FComboBox<>("Piles: ");
 
     public ImageView(ItemManager<T> itemManager0, ItemManagerModel<T> model0) {
         super(itemManager0, model0);
@@ -424,7 +424,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
             if (forRefresh && pileBy != null) { //refresh piles if needed
                 //use TreeMap to build pile set so iterating below sorts on key
                 ColumnDef groupPileBy = groupBy == null ? pileBy : groupBy.getGroupPileBy(i, pileBy);
-                Map<Comparable<?>, Pile> piles = new TreeMap<Comparable<?>, Pile>();
+                Map<Comparable<?>, Pile> piles = new TreeMap<>();
                 for (ItemInfo itemInfo : group.items) {
                     Comparable<?> key = groupPileBy.fnSort.apply(itemInfo);
                     if (!piles.containsKey(key)) {
@@ -761,8 +761,8 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
     }
 
     private class Group extends FScrollPane {
-        private final List<ItemInfo> items = new ArrayList<ItemInfo>();
-        private final List<Pile> piles = new ArrayList<Pile>();
+        private final List<ItemInfo> items = new ArrayList<>();
+        private final List<Pile> piles = new ArrayList<>();
         private final String name;
         private boolean isCollapsed;
         private float scrollWidth;
@@ -879,7 +879,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
         }
     }
     private class Pile extends FDisplayObject {
-        private final List<ItemInfo> items = new ArrayList<ItemInfo>();
+        private final List<ItemInfo> items = new ArrayList<>();
 
         @Override
         public void draw(Graphics g) {
diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java b/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
index 6caade0e233..0b7b2f5d076 100644
--- a/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
+++ b/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
@@ -46,7 +46,7 @@ public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
 
     private final ItemList list = new ItemList();
     private final ItemListModel listModel;
-    private List<Integer> selectedIndices = new ArrayList<Integer>();
+    private List<Integer> selectedIndices = new ArrayList<>();
 
     public ItemListModel getListModel() {
         return listModel;
diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ItemView.java b/forge-gui-mobile/src/forge/itemmanager/views/ItemView.java
index dd8ce179d02..ed20f675273 100644
--- a/forge-gui-mobile/src/forge/itemmanager/views/ItemView.java
+++ b/forge-gui-mobile/src/forge/itemmanager/views/ItemView.java
@@ -144,7 +144,7 @@ public abstract class ItemView<T extends InventoryItem> {
     }
 
     public final Collection<T> getSelectedItems() {
-        List<T> items = new ArrayList<T>();
+        List<T> items = new ArrayList<>();
         for (Integer i : getSelectedIndices()) {
             T item = getItemAtIndex(i);
             if (item != null) {
@@ -170,7 +170,7 @@ public abstract class ItemView<T extends InventoryItem> {
         return setSelectedItems(items, true);
     }
     public final boolean setSelectedItems(Iterable<T> items, boolean scrollIntoView) {
-        List<Integer> indices = new ArrayList<Integer>();
+        List<Integer> indices = new ArrayList<>();
         for (T item : items) {
             int index = getIndexOfItem(item);
             if (index != -1) {
@@ -199,7 +199,7 @@ public abstract class ItemView<T extends InventoryItem> {
         if (index < 0) {
             if (index == -1 && minSelections == 0) { //allow passing -1 to clear selection if no selection allowed
                 if (getSelectionCount() > 0) {
-                    onSetSelectedIndices(new ArrayList<Integer>());
+                    onSetSelectedIndices(new ArrayList<>());
                     onSelectionChange();
                 }
                 return;
@@ -225,7 +225,7 @@ public abstract class ItemView<T extends InventoryItem> {
         int count = getCount();
         if (count == 0) { return; }
 
-        List<Integer> indexList = new ArrayList<Integer>();
+        List<Integer> indexList = new ArrayList<>();
         for (Integer index : indices) {
             if (index >= 0 && index < count) {
                 indexList.add(index);
diff --git a/forge-gui-mobile/src/forge/menu/FDropDownMenu.java b/forge-gui-mobile/src/forge/menu/FDropDownMenu.java
index 7385252fb5d..62a9946557a 100644
--- a/forge-gui-mobile/src/forge/menu/FDropDownMenu.java
+++ b/forge-gui-mobile/src/forge/menu/FDropDownMenu.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public abstract class FDropDownMenu extends FDropDown {
-    protected final List<FMenuItem> items = new ArrayList<FMenuItem>();
+    protected final List<FMenuItem> items = new ArrayList<>();
 
     public FDropDownMenu() {
     }
diff --git a/forge-gui-mobile/src/forge/menu/FMenuBar.java b/forge-gui-mobile/src/forge/menu/FMenuBar.java
index bafe533c0ef..7b9f8f05b58 100644
--- a/forge-gui-mobile/src/forge/menu/FMenuBar.java
+++ b/forge-gui-mobile/src/forge/menu/FMenuBar.java
@@ -7,7 +7,7 @@ import forge.Graphics;
 import forge.screens.FScreen.Header;
 
 public class FMenuBar extends Header {
-    private final List<FMenuTab> tabs = new ArrayList<FMenuTab>();
+    private final List<FMenuTab> tabs = new ArrayList<>();
 
     public void addTab(String text0, FDropDown dropDown0) {
         FMenuTab tab = new FMenuTab(text0, this, dropDown0, tabs.size());
diff --git a/forge-gui-mobile/src/forge/screens/TabPageScreen.java b/forge-gui-mobile/src/forge/screens/TabPageScreen.java
index dfc82512daf..64ab47cdb69 100644
--- a/forge-gui-mobile/src/forge/screens/TabPageScreen.java
+++ b/forge-gui-mobile/src/forge/screens/TabPageScreen.java
@@ -32,7 +32,7 @@ public class TabPageScreen<T extends TabPageScreen<T>> extends FScreen {
     }
 
     public TabPageScreen(TabPage<T>[] tabPages0, boolean showBackButton) {
-        this(new TabHeader<T>(tabPages0, showBackButton));
+        this(new TabHeader<>(tabPages0, showBackButton));
     }
 
     public TabPageScreen(TabHeader<T> tabHeader0) {
@@ -44,7 +44,7 @@ public class TabPageScreen<T extends TabPageScreen<T>> extends FScreen {
 
     public TabPageScreen(String headerCaption, FPopupMenu menu, TabPage<T>[] tabPages0) {
         super(headerCaption, menu);
-        tabHeader = add(new TabHeader<T>(tabPages0, false));
+        tabHeader = add(new TabHeader<>(tabPages0, false));
         tabHeader.showBottomBorder = false;
         tabPages = tabHeader.tabPages;
         initialize();
@@ -52,7 +52,7 @@ public class TabPageScreen<T extends TabPageScreen<T>> extends FScreen {
 
     public TabPageScreen(String headerCaption, FPopupMenu menu, TabPage<T>[] tabPages0, boolean alwaysRenderHorizontal) {
         super(headerCaption, menu);
-        tabHeader = add(new TabHeader<T>(tabPages0, false));
+        tabHeader = add(new TabHeader<>(tabPages0, false));
         tabHeader.showBottomBorder = false;
         tabHeader.alwaysRenderHorizontal = alwaysRenderHorizontal;
         tabPages = tabHeader.tabPages;
diff --git a/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java b/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java
index 990090d343d..509bb367179 100644
--- a/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java
+++ b/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java
@@ -45,7 +45,7 @@ public class AchievementsScreen extends FScreen {
         Forge.openScreen(achievementsScreen);
     }
 
-    private final FComboBox<AchievementCollection> cbCollections = add(new FComboBox<AchievementCollection>());
+    private final FComboBox<AchievementCollection> cbCollections = add(new FComboBox<>());
     private final TrophyCase trophyCase = add(new TrophyCase());
 
     private AchievementsScreen() {
diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
index c985b091fa4..79109f1343d 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
@@ -55,9 +55,9 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
 
     // Variants frame and variables
     private final FLabel lblVariants = new FLabel.Builder().text("Variants:").font(VARIANTS_FONT).build();
-    private final FComboBox<Object> cbVariants = new FComboBox<Object>();
+    private final FComboBox<Object> cbVariants = new FComboBox<>();
 
-    private final List<PlayerPanel> playerPanels = new ArrayList<PlayerPanel>(MAX_PLAYERS);
+    private final List<PlayerPanel> playerPanels = new ArrayList<>(MAX_PLAYERS);
     private final FScrollPane playersScroll = new FScrollPane() {
         @Override
         protected ScrollBounds layoutAndGetScrollBounds(float visibleWidth, float visibleHeight) {
@@ -87,7 +87,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
         btnStart.setEnabled(false); //disable start button until decks loaded
 
         add(lblPlayers);
-        cbPlayerCount = add(new FComboBox<Integer>());
+        cbPlayerCount = add(new FComboBox<>());
         cbPlayerCount.setFont(VARIANTS_FONT);
         for (int i = 2; i <= MAX_PLAYERS; i++) {
             cbPlayerCount.addItem(i);
@@ -322,7 +322,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
     }
 
     List<String> getPlayerNames() {
-        List<String> names = new ArrayList<String>();
+        List<String> names = new ArrayList<>();
         for (PlayerPanel pp : playerPanels) {
             names.add(pp.getPlayerName());
         }
@@ -341,7 +341,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
     //========== Various listeners in build order
     
     private class MultiVariantSelect extends FScreen {
-        private final FList<Variant> lstVariants = add(new FList<Variant>());
+        private final FList<Variant> lstVariants = add(new FList<>());
 
         private MultiVariantSelect() {
             super("Select Variants");
diff --git a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
index b1f2c67e1e9..22a48093b2e 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
@@ -64,8 +64,8 @@ public class PlayerPanel extends FContainer {
     private final FToggleSwitch humanAiSwitch;
     private final FToggleSwitch devModeSwitch;
 
-    private FComboBox<Object> cbTeam = new FComboBox<Object>();
-    private FComboBox<Object> cbArchenemyTeam = new FComboBox<Object>();
+    private FComboBox<Object> cbTeam = new FComboBox<>();
+    private FComboBox<Object> cbArchenemyTeam = new FComboBox<>();
 
     private final FLabel btnDeck            = new FLabel.ButtonBuilder().text("Loading Deck...").build();
     private final FLabel btnSchemeDeck      = new FLabel.ButtonBuilder().text("Scheme Deck: Random Generated Deck").build();
diff --git a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java
index 5df4b89ef06..59cc9a377f5 100644
--- a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java
+++ b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java
@@ -74,7 +74,7 @@ public class LoadGauntletScreen extends LaunchScreen {
 
     public void onActivate() {
         final File[] files = GauntletIO.getGauntletFilesUnlocked(null);
-        final List<GauntletData> data = new ArrayList<GauntletData>();
+        final List<GauntletData> data = new ArrayList<>();
 
         for (final File f : files) {
             GauntletData gd = GauntletIO.loadGauntlet(f);
@@ -137,7 +137,7 @@ public class LoadGauntletScreen extends LaunchScreen {
             @Override
             public void run() {
                 final GauntletData gauntlet = FModel.getGauntletData();
-                List<RegisteredPlayer> players = new ArrayList<RegisteredPlayer>();
+                List<RegisteredPlayer> players = new ArrayList<>();
                 RegisteredPlayer humanPlayer = new RegisteredPlayer(gauntlet.getUserDeck()).setPlayer(GamePlayerUtil.getGuiPlayer());
                 players.add(humanPlayer);
                 players.add(new RegisteredPlayer(gauntlet.getDecks().get(gauntlet.getCompleted())).setPlayer(GamePlayerUtil.createAiPlayer()));
@@ -294,7 +294,7 @@ public class LoadGauntletScreen extends LaunchScreen {
         }
 
         public void refresh() {
-            List<GauntletData> sorted = new ArrayList<GauntletData>();
+            List<GauntletData> sorted = new ArrayList<>();
             for (GauntletData gauntlet : gauntlets) {
                 sorted.add(gauntlet);
             }
diff --git a/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java b/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java
index 58b5b19c993..ad7b5de1967 100644
--- a/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java
+++ b/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java
@@ -81,7 +81,7 @@ public class NewGauntletScreen extends LaunchScreen {
             public void run(final Integer numOpponents) {
                 if (numOpponents == null) { return; }
 
-                ListChooser<DeckType> chooser = new ListChooser<DeckType>(
+                ListChooser<DeckType> chooser = new ListChooser<>(
                         "Choose allowed deck types for opponents", 0, 11, Arrays.asList(DeckType.CUSTOM_DECK,
                         DeckType.PRECONSTRUCTED_DECK,
                         DeckType.QUEST_OPPONENT_DECK,
@@ -95,12 +95,16 @@ public class NewGauntletScreen extends LaunchScreen {
                         DeckType.THEME_DECK), null, new Callback<List<DeckType>>() {
                     @Override
                     public void run(final List<DeckType> allowedDeckTypes) {
-                        if (allowedDeckTypes == null || allowedDeckTypes.isEmpty()) { return; }
+                        if (allowedDeckTypes == null || allowedDeckTypes.isEmpty()) {
+                            return;
+                        }
 
                         FDeckChooser.promptForDeck("Select Your Deck", GameType.Gauntlet, false, new Callback<Deck>() {
                             @Override
                             public void run(Deck userDeck) {
-                                if (userDeck == null) { return; }
+                                if (userDeck == null) {
+                                    return;
+                                }
 
                                 GauntletData gauntlet = GauntletUtil.createQuickGauntlet(userDeck, numOpponents, allowedDeckTypes, null);
                                 launchGauntlet(gauntlet);
@@ -120,7 +124,7 @@ public class NewGauntletScreen extends LaunchScreen {
                 if (numOpponents == null) { return; }
 
                 GauntletData gauntlet = new GauntletData();
-                gauntlet.setDecks(new ArrayList<Deck>());
+                gauntlet.setDecks(new ArrayList<>());
                 promptForAiDeck(gauntlet, numOpponents);
             }
         });
@@ -158,7 +162,7 @@ public class NewGauntletScreen extends LaunchScreen {
 
     private void createGauntletContest() {
         final File[] files = GauntletIO.getGauntletFilesLocked();
-        final List<GauntletData> contests = new ArrayList<GauntletData>();
+        final List<GauntletData> contests = new ArrayList<>();
         for (final File f : files) {
             GauntletData gd = GauntletIO.loadGauntlet(f);
             if (gd != null) {
@@ -178,8 +182,8 @@ public class NewGauntletScreen extends LaunchScreen {
 
                         //create copy of contest to use as gauntlet
                         GauntletData gauntlet = new GauntletData();
-                        gauntlet.setDecks(new ArrayList<Deck>(contest.getDecks()));
-                        gauntlet.setEventNames(new ArrayList<String>(contest.getEventNames()));
+                        gauntlet.setDecks(new ArrayList<>(contest.getDecks()));
+                        gauntlet.setEventNames(new ArrayList<>(contest.getEventNames()));
                         gauntlet.setUserDeck(userDeck);
                         GauntletUtil.setDefaultGauntletName(gauntlet, contest.getDisplayName() + "_");
                         launchGauntlet(gauntlet);
@@ -195,7 +199,7 @@ public class NewGauntletScreen extends LaunchScreen {
         gauntlet.reset();
 
         RegisteredPlayer humanPlayer = new RegisteredPlayer(gauntlet.getUserDeck()).setPlayer(GamePlayerUtil.getGuiPlayer());
-        List<RegisteredPlayer> players = new ArrayList<RegisteredPlayer>();
+        List<RegisteredPlayer> players = new ArrayList<>();
         players.add(humanPlayer);
         players.add(new RegisteredPlayer(gauntlet.getDecks().get(gauntlet.getCompleted())).setPlayer(GamePlayerUtil.createAiPlayer()));
         gauntlet.startRound(players, humanPlayer);
diff --git a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java
index 2c415509921..6c124ff90a7 100644
--- a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java
+++ b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java
@@ -34,7 +34,7 @@ public class HomeScreen extends FScreen {
 
     private final FLabel lblLogo = add(new FLabel.Builder().icon(FSkinImage.LOGO).iconInBackground().iconScaleFactor(1).build());
     private final ButtonScroller buttonScroller = add(new ButtonScroller());
-    private final List<MenuButton> buttons = new ArrayList<MenuButton>();
+    private final List<MenuButton> buttons = new ArrayList<>();
     private int activeButtonIndex, baseButtonCount;
     private FDeckChooser deckManager;
 
diff --git a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java
index a028396bcba..b3ee50cfb08 100644
--- a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java
+++ b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java
@@ -43,7 +43,7 @@ public class LoadDraftScreen extends LaunchScreen {
 
     private final FSkinFont GAME_MODE_FONT= FSkinFont.get(12);
     private final FLabel lblMode = add(new FLabel.Builder().text("Mode:").font(GAME_MODE_FONT).build());
-    private final FComboBox<String> cbMode = add(new FComboBox<String>());
+    private final FComboBox<String> cbMode = add(new FComboBox<>());
 
     public LoadDraftScreen() {
         super(null, LoadGameMenu.getMenu());
@@ -153,7 +153,7 @@ public class LoadDraftScreen extends LaunchScreen {
                                         return;
                                     }
 
-                                    final List<RegisteredPlayer> starter = new ArrayList<RegisteredPlayer>();
+                                    final List<RegisteredPlayer> starter = new ArrayList<>();
                                     final RegisteredPlayer human = new RegisteredPlayer(humanDeck.getDeck()).setPlayer(GamePlayerUtil.getGuiPlayer());
                                     starter.add(human);
                                     starter.add(new RegisteredPlayer(aiDeck).setPlayer(GamePlayerUtil.createAiPlayer()));
diff --git a/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java b/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java
index c954b90a6f8..421bffd268e 100644
--- a/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java
+++ b/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java
@@ -43,7 +43,7 @@ public class LoadSealedScreen extends LaunchScreen {
 
     private final FSkinFont GAME_MODE_FONT= FSkinFont.get(12);
     private final FLabel lblMode = add(new FLabel.Builder().text("Mode:").font(GAME_MODE_FONT).build());
-    private final FComboBox<String> cbMode = add(new FComboBox<String>());
+    private final FComboBox<String> cbMode = add(new FComboBox<>());
 
     public LoadSealedScreen() {
         super(null, LoadGameMenu.getMenu());
@@ -146,7 +146,7 @@ public class LoadSealedScreen extends LaunchScreen {
                             LoadingOverlay.show("Loading new game...", new Runnable() {
                                 @Override
                                 public void run() {
-                                    final List<RegisteredPlayer> starter = new ArrayList<RegisteredPlayer>();
+                                    final List<RegisteredPlayer> starter = new ArrayList<>();
                                     final RegisteredPlayer human = new RegisteredPlayer(humanDeck.getDeck()).setPlayer(GamePlayerUtil.getGuiPlayer());
                                     starter.add(human);
                                     starter.add(new RegisteredPlayer(aiDeck).setPlayer(GamePlayerUtil.createAiPlayer()));
diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java
index 83a9c1d5a65..8e3727a03e4 100644
--- a/forge-gui-mobile/src/forge/screens/match/MatchController.java
+++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java
@@ -65,7 +65,7 @@ public class MatchController extends AbstractGuiGame {
     private MatchController() { }
     public static final MatchController instance = new MatchController();
 
-    private static final Map<String, FImage> avatarImages = new HashMap<String, FImage>();
+    private static final Map<String, FImage> avatarImages = new HashMap<>();
 
     private static HostedMatch hostedMatch;
     private static MatchScreen view;
@@ -116,7 +116,7 @@ public class MatchController extends AbstractGuiGame {
         final boolean noHumans = !hasLocalPlayers();
 
         final FCollectionView<PlayerView> allPlayers = getGameView().getPlayers();
-        final List<VPlayerPanel> playerPanels = new ArrayList<VPlayerPanel>();
+        final List<VPlayerPanel> playerPanels = new ArrayList<>();
         for (final PlayerView p : allPlayers) {
             final boolean isLocal = isLocalPlayer(p);
             final VPlayerPanel playerPanel = new VPlayerPanel(p, isLocal || noHumans, allPlayers.size());
diff --git a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
index c0fdfdc67ec..3a07b5d0aca 100644
--- a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
+++ b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
@@ -330,7 +330,7 @@ public class MatchScreen extends FScreen {
         if (game == null) { return; }
 
         //draw arrows for paired cards
-        Set<CardView> pairedCards = new HashSet<CardView>();
+        Set<CardView> pairedCards = new HashSet<>();
         for (VPlayerPanel playerPanel : playerPanels.values()) {
             for (CardView card : playerPanel.getField().getRow1().getOrderedCards()) {
                 if (pairedCards.contains(card)) { continue; } //prevent arrows going both ways
@@ -616,7 +616,7 @@ public class MatchScreen extends FScreen {
             y += oldScrollTop - VAvatar.HEIGHT;
 
             //build map of all horizontal scroll panes and their current scrollWidths and adjusted X values
-            Map<FScrollPane, Pair<Float, Float>> horzScrollPanes = new HashMap<FScrollPane, Pair<Float, Float>>();
+            Map<FScrollPane, Pair<Float, Float>> horzScrollPanes = new HashMap<>();
             backupHorzScrollPanes(topPlayerPanel, x, horzScrollPanes);
             backupHorzScrollPanes(bottomPlayerPanel, x, horzScrollPanes);
 
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VAssignDamage.java b/forge-gui-mobile/src/forge/screens/match/views/VAssignDamage.java
index 9e7a089d1cb..7ea91363826 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VAssignDamage.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VAssignDamage.java
@@ -71,8 +71,8 @@ public class VAssignDamage extends FDialog {
     private final DefendersPanel pnlDefenders;
 
     // Indexes of defenders correspond to their indexes in the damage list and labels.
-    private final List<DamageTarget> defenders = new ArrayList<DamageTarget>(); // NULL in this map means defender
-    private final Map<CardView, DamageTarget> damage = new HashMap<CardView, DamageTarget>();  // NULL in this map means defender
+    private final List<DamageTarget> defenders = new ArrayList<>(); // NULL in this map means defender
+    private final Map<CardView, DamageTarget> damage = new HashMap<>();  // NULL in this map means defender
 
     private boolean canAssignTo(CardView card) {
         for (DamageTarget dt : defenders) {
@@ -456,7 +456,7 @@ public class VAssignDamage extends FDialog {
     }
 
     public Map<CardView, Integer> getDamageMap() {
-        Map<CardView, Integer> result = new HashMap<CardView, Integer>();
+        Map<CardView, Integer> result = new HashMap<>();
         for (DamageTarget dt : defenders) {
             result.put(dt.card, dt.damage);
         }
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VAutoYields.java b/forge-gui-mobile/src/forge/screens/match/views/VAutoYields.java
index 4c82e4e0698..5ce1d4adddf 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VAutoYields.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VAutoYields.java
@@ -18,7 +18,7 @@ public class VAutoYields extends FDialog {
 
     public VAutoYields() {
         super("Auto-Yields", 2);
-        List<String> autoYields = new ArrayList<String>();
+        List<String> autoYields = new ArrayList<>();
         for (String autoYield : MatchController.instance.getAutoYields()) {
             autoYields.add(autoYield);
         }
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java b/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
index 9978aec28c2..87ef2206087 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
@@ -22,8 +22,8 @@ import forge.util.ThreadUtil;
 public abstract class VCardDisplayArea extends VDisplayArea implements ActivateHandler {
     private static final float CARD_STACK_OFFSET = 0.2f;
 
-    protected final List<CardView> orderedCards = new ArrayList<CardView>();
-    protected final List<CardAreaPanel> cardPanels = new ArrayList<CardAreaPanel>();
+    protected final List<CardView> orderedCards = new ArrayList<>();
+    protected final List<CardAreaPanel> cardPanels = new ArrayList<>();
     private boolean rotateCards180;
 
     public Iterable<CardView> getOrderedCards() {
@@ -206,7 +206,7 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
     }
 
     public static class CardAreaPanel extends FCardPanel {
-        private static final Map<Integer, CardAreaPanel> allCardPanels = new HashMap<Integer, CardAreaPanel>();
+        private static final Map<Integer, CardAreaPanel> allCardPanels = new HashMap<>();
 
         public static CardAreaPanel get(CardView card0) {
             CardAreaPanel cardPanel = allCardPanels.get(card0.getId());
@@ -230,7 +230,7 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
 
         private VCardDisplayArea displayArea;
         private CardAreaPanel attachedToPanel;
-        private final List<CardAreaPanel> attachedPanels = new ArrayList<CardAreaPanel>();
+        private final List<CardAreaPanel> attachedPanels = new ArrayList<>();
         private CardAreaPanel nextPanelInStack, prevPanelInStack;
 
         //use static get(card) function instead
@@ -404,7 +404,7 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
             //on double-tap select all other cards in stack if any
             if (prevPanelInStack == null && nextPanelInStack == null) { return null; }
 
-            List<CardView> cards = new ArrayList<CardView>();
+            List<CardView> cards = new ArrayList<>();
 
             CardAreaPanel panel = nextPanelInStack;
             while (panel != null) {
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VField.java b/forge-gui-mobile/src/forge/screens/match/views/VField.java
index b4aabc6c657..583fecb2710 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VField.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VField.java
@@ -30,7 +30,7 @@ public class VField extends FContainer {
     }
 
     public Iterable<CardAreaPanel> getCardPanels() {
-        List<CardAreaPanel> cardPanels = new ArrayList<CardAreaPanel>();
+        List<CardAreaPanel> cardPanels = new ArrayList<>();
         for (CardAreaPanel cardPanel : row1.getCardPanels()) {
             cardPanels.add(cardPanel);
         }
@@ -60,9 +60,9 @@ public class VField extends FContainer {
                 cardPanel.setPrevPanelInStack(null);
             }
 
-            List<CardView> creatures = new ArrayList<CardView>();
-            List<CardView> lands = new ArrayList<CardView>();
-            List<CardView> otherPermanents = new ArrayList<CardView>();
+            List<CardView> creatures = new ArrayList<>();
+            List<CardView> lands = new ArrayList<>();
+            List<CardView> otherPermanents = new ArrayList<>();
 
             for (CardView card : model) {
                 CardAreaPanel cardPanel = CardAreaPanel.get(card);
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java b/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java
index 438aa86b37b..8cd0246b6fa 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java
@@ -23,7 +23,7 @@ public class VManaPool extends VDisplayArea {
     private static final FSkinFont FONT = FSkinFont.get(16);
 
     private final PlayerView player;
-    private final List<ManaLabel> manaLabels = new ArrayList<ManaLabel>();
+    private final List<ManaLabel> manaLabels = new ArrayList<>();
     private int totalMana;
 
     public VManaPool(PlayerView player0) {
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java b/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java
index 0194566606d..cf2724d538b 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java
@@ -21,7 +21,7 @@ public class VPhaseIndicator extends FContainer {
     public static final float PADDING_X = Utils.scale(1);
     public static final float PADDING_Y = Utils.scale(2);
 
-    private final Map<PhaseType, PhaseLabel> phaseLabels = new HashMap<PhaseType, PhaseLabel>();
+    private final Map<PhaseType, PhaseLabel> phaseLabels = new HashMap<>();
     private FSkinFont font;
 
     public VPhaseIndicator() {
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java
index 24deacce607..870e99ffdb0 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java
@@ -42,8 +42,8 @@ public class VPlayerPanel extends FContainer {
     private final VZoneDisplay commandZone;
     private final LifeLabel lblLife;
     private final InfoTab tabManaPool;
-    private final Map<ZoneType, InfoTab> zoneTabs = new HashMap<ZoneType, InfoTab>();
-    private final List<InfoTab> tabs = new ArrayList<InfoTab>();
+    private final Map<ZoneType, InfoTab> zoneTabs = new HashMap<>();
+    private final List<InfoTab> tabs = new ArrayList<>();
     private InfoTab selectedTab;
     private float avatarHeight = VAvatar.HEIGHT;
     private float displayAreaHeightFactor = 1.0f;
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VStack.java b/forge-gui-mobile/src/forge/screens/match/views/VStack.java
index 563d8d3c765..100b9cc46b2 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VStack.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VStack.java
@@ -69,8 +69,8 @@ public class VStack extends FDropDown {
     private void revealTargetZones() {
         if (activeStackInstance == null) { return; }
 
-        final Set<ZoneType> zones = new HashSet<ZoneType>();
-        playersWithValidTargets = new HashMap<PlayerView, Object>();
+        final Set<ZoneType> zones = new HashSet<>();
+        playersWithValidTargets = new HashMap<>();
         for (final CardView c : activeStackInstance.getTargetCards()) {
             if (c.getZone() != null) {
                 zones.add(c.getZone());
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java
index 034b9b10131..d314ed0bf99 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java
@@ -166,12 +166,12 @@ public class ConquestCommandersScreen extends FScreen {
 
         @Override
         protected TextSearchFilter<? extends ConquestCommander> createSearchFilter() {
-            return new TextSearchFilter<ConquestCommander>(this);
+            return new TextSearchFilter<>(this);
         }
 
         @Override
         protected AdvancedSearchFilter<? extends ConquestCommander> createAdvancedSearchFilter() {
-            return new AdvancedSearchFilter<ConquestCommander>(this);
+            return new AdvancedSearchFilter<>(this);
         }
 
         @Override
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java
index da194996ee3..892c37c9131 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java
@@ -29,7 +29,7 @@ public class ConquestRewardDialog extends FScrollPane {
     private static final float PADDING = Utils.scale(5);
 
     public static void show(String title, PaperCard card, Runnable callback0) {
-        List<ConquestReward> rewards = new ArrayList<ConquestReward>(1);
+        List<ConquestReward> rewards = new ArrayList<>(1);
         rewards.add(new ConquestReward(card, 0));
         show(title, rewards, callback0);
     }
@@ -39,7 +39,7 @@ public class ConquestRewardDialog extends FScrollPane {
     }
 
     private final RevealDialog dialog;
-    private final List<CardRevealer> cardRevealers = new ArrayList<CardRevealer>();
+    private final List<CardRevealer> cardRevealers = new ArrayList<>();
     private final CardRevealAnimation animation;
     private final Runnable callback;
 
@@ -303,7 +303,7 @@ public class ConquestRewardDialog extends FScrollPane {
 
         private boolean showCardZoom() {
             int index = -1;
-            List<PaperCard> cards = new ArrayList<PaperCard>();
+            List<PaperCard> cards = new ArrayList<>();
             for (int i = 0; i < animation.currentIndex; i++) {
                 CardRevealer revealer = cardRevealers.get(i);
                 if (revealer == this) {
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java
index abd6a461c70..6075299a5f6 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java
@@ -22,7 +22,7 @@ import forge.util.Utils;
 public class ConquestStatsScreen extends FScreen implements IVConquestStats {
     private static final float PADDING = Utils.scale(5f);
 
-    private final FComboBox<Object> cbPlanes = add(new FComboBox<Object>());
+    private final FComboBox<Object> cbPlanes = add(new FComboBox<>());
     private final FScrollPane scroller = add(new FScrollPane() {
         @Override
         protected ScrollBounds layoutAndGetScrollBounds(float visibleWidth, float visibleHeight) {
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java
index 39cc1d31d07..893f5754347 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java
@@ -92,7 +92,7 @@ public class LoadConquestScreen extends LaunchScreen {
                 final File dirConquests = new File(ForgeConstants.CONQUEST_SAVE_DIR);
                 final ConquestController qc = FModel.getConquest();
 
-                Map<String, ConquestData> arrConquests = new HashMap<String, ConquestData>();
+                Map<String, ConquestData> arrConquests = new HashMap<>();
                 if (dirConquests.listFiles() != null) {
                     for (File f : dirConquests.listFiles()) {
                         if (f.isDirectory()) {
@@ -103,7 +103,7 @@ public class LoadConquestScreen extends LaunchScreen {
                 }
 
                 // Populate list with available conquest data.
-                lstConquests.setConquests(new ArrayList<ConquestData>(arrConquests.values()));
+                lstConquests.setConquests(new ArrayList<>(arrConquests.values()));
 
                 // If there are quests available, force select.
                 if (arrConquests.size() > 0) {
@@ -332,7 +332,7 @@ public class LoadConquestScreen extends LaunchScreen {
         }
 
         public void setConquests(List<ConquestData> qd0) {
-            List<ConquestData> sorted = new ArrayList<ConquestData>();
+            List<ConquestData> sorted = new ArrayList<>();
             for (ConquestData qd : qd0) {
                 sorted.add(qd);
             }
diff --git a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java
index c80e1787702..cb9daf1b4ef 100644
--- a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java
@@ -101,7 +101,7 @@ public class LoadQuestScreen extends LaunchScreen {
                     }
                 };
                 File[] arrFiles = dirQuests.listFiles(takeDatFiles);
-                Map<String, QuestData> arrQuests = new HashMap<String, QuestData>();
+                Map<String, QuestData> arrQuests = new HashMap<>();
                 for (File f : arrFiles) {
                     try {
                         arrQuests.put(f.getName(), QuestDataIO.loadData(f));
@@ -113,7 +113,7 @@ public class LoadQuestScreen extends LaunchScreen {
                 }
 
                 // Populate list with available quest data.
-                lstQuests.setQuests(new ArrayList<QuestData>(arrQuests.values()));
+                lstQuests.setQuests(new ArrayList<>(arrQuests.values()));
 
                 // If there are quests available, force select.
                 if (arrQuests.size() > 0) {
@@ -334,7 +334,7 @@ public class LoadQuestScreen extends LaunchScreen {
         }
 
         public void setQuests(List<QuestData> qd0) {
-            List<QuestData> sorted = new ArrayList<QuestData>();
+            List<QuestData> sorted = new ArrayList<>();
             for (QuestData qd : qd0) {
                 sorted.add(qd);
             }
diff --git a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
index a93827e7edf..83293de0bb7 100644
--- a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
@@ -111,7 +111,7 @@ public class NewQuestScreen extends FScreen {
 
     @SuppressWarnings("unused")
     private final FLabel lblStartingWorld = scroller.add(new FLabel.Builder().text("Starting world:").build());
-    private final FComboBox<QuestWorld> cbxStartingWorld = scroller.add(new FComboBox<QuestWorld>());
+    private final FComboBox<QuestWorld> cbxStartingWorld = scroller.add(new FComboBox<>());
 
     @SuppressWarnings("unused")
     private final FLabel lblDifficulty = scroller.add(new FLabel.Builder().text("Difficulty:").build());
@@ -119,18 +119,18 @@ public class NewQuestScreen extends FScreen {
 
     @SuppressWarnings("unused")
     private final FLabel lblStartingPool = scroller.add(new FLabel.Builder().text("Starting pool:").build());
-    private final FComboBox<StartingPoolType> cbxStartingPool = scroller.add(new FComboBox<StartingPoolType>());
+    private final FComboBox<StartingPoolType> cbxStartingPool = scroller.add(new FComboBox<>());
 
     private final FLabel lblUnrestricted = scroller.add(new FLabel.Builder().align(Align.right).font(FSkinFont.get(12)).text("All cards will be available to play.").build());
 
     private final FLabel lblPreconDeck = scroller.add(new FLabel.Builder().text("Starter/Event deck:").build());
-    private final FComboBox<String> cbxPreconDeck = scroller.add(new FComboBox<String>());
+    private final FComboBox<String> cbxPreconDeck = scroller.add(new FComboBox<>());
 
     private final FLabel lblFormat = scroller.add(new FLabel.Builder().text("Select format:").build());
-    private final FComboBox<GameFormat> cbxFormat = scroller.add(new FComboBox<GameFormat>());
+    private final FComboBox<GameFormat> cbxFormat = scroller.add(new FComboBox<>());
 
     private final FLabel lblCustomDeck = scroller.add(new FLabel.Builder().text("Custom deck:").build());
-    private final FComboBox<Deck> cbxCustomDeck = scroller.add(new FComboBox<Deck>());
+    private final FComboBox<Deck> cbxCustomDeck = scroller.add(new FComboBox<>());
 
     private final FLabel btnSelectFormat = scroller.add(new FLabel.ButtonBuilder().text("Choose format").build());
 
@@ -159,7 +159,7 @@ public class NewQuestScreen extends FScreen {
     private final FComboBox<Object> cbxPrizedCards = scroller.add(new FComboBox<>());
 
     private final FLabel lblPrizeFormat = scroller.add(new FLabel.Builder().text("Defined format:").build());
-    private final FComboBox<GameFormat> cbxPrizeFormat = scroller.add(new FComboBox<GameFormat>());
+    private final FComboBox<GameFormat> cbxPrizeFormat = scroller.add(new FComboBox<>());
 
     private final FLabel lblPrizeUnrestricted = scroller.add(new FLabel.Builder().align(Align.right).font(FSkinFont.get(12)).text("All cards will be available to win.").build());
     private final FLabel lblPrizeSameAsStarting = scroller.add(new FLabel.Builder().align(Align.right).font(FSkinFont.get(12)).text("Only sets found in starting pool will be available.").build());
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestDeckEditor.java b/forge-gui-mobile/src/forge/screens/quest/QuestDeckEditor.java
index 6e1bad5d4e8..81fa5b1035a 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestDeckEditor.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestDeckEditor.java
@@ -27,7 +27,7 @@ public class QuestDeckEditor extends FDeckEditor {
 
     @Override
     protected Map<ColumnDef, ItemColumn> getColOverrides(ItemManagerConfig config) {
-        Map<ColumnDef, ItemColumn> colOverrides = new HashMap<ColumnDef, ItemColumn>();
+        Map<ColumnDef, ItemColumn> colOverrides = new HashMap<>();
         switch (config) {
         case QUEST_EDITOR_POOL:
             ItemColumn.addColOverride(config, colOverrides, ColumnDef.NEW, FModel.getQuest().getCards().getFnNewCompare(), FModel.getQuest().getCards().getFnNewGet());
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
index dab3d7d1892..95e14a8d26d 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
@@ -235,7 +235,7 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
                     FThreads.invokeInBackgroundThread(new Runnable() {
                         @Override
                         public void run() {
-                            ItemPool<InventoryItem> items = new ItemPool<InventoryItem>(InventoryItem.class);
+                            ItemPool<InventoryItem> items = new ItemPool<>(InventoryItem.class);
                             items.add(item, result);
                             activateItems(items);
                             FThreads.invokeInEdtLater(new Runnable() {
@@ -284,7 +284,7 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
 
         @Override
         protected void refresh() {
-            Map<ColumnDef, ItemColumn> colOverrides = new HashMap<ColumnDef, ItemColumn>();
+            Map<ColumnDef, ItemColumn> colOverrides = new HashMap<>();
             ItemColumn.addColOverride(ItemManagerConfig.SPELL_SHOP, colOverrides, ColumnDef.PRICE, QuestSpellShop.fnPriceCompare, QuestSpellShop.fnPriceGet);
             ItemColumn.addColOverride(ItemManagerConfig.SPELL_SHOP, colOverrides, ColumnDef.OWNED, FModel.getQuest().getCards().getFnOwnedCompare(), FModel.getQuest().getCards().getFnOwnedGet());
             itemManager.setup(ItemManagerConfig.SPELL_SHOP, colOverrides);
@@ -341,13 +341,13 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
 
         @Override
         protected void refresh() {
-            Map<ColumnDef, ItemColumn> colOverrides = new HashMap<ColumnDef, ItemColumn>();
+            Map<ColumnDef, ItemColumn> colOverrides = new HashMap<>();
             ItemColumn.addColOverride(ItemManagerConfig.QUEST_INVENTORY, colOverrides, ColumnDef.PRICE, QuestSpellShop.fnPriceCompare, QuestSpellShop.fnPriceSellGet);
             ItemColumn.addColOverride(ItemManagerConfig.QUEST_INVENTORY, colOverrides, ColumnDef.NEW, FModel.getQuest().getCards().getFnNewCompare(), FModel.getQuest().getCards().getFnNewGet());
             ItemColumn.addColOverride(ItemManagerConfig.QUEST_INVENTORY, colOverrides, ColumnDef.DECKS, QuestSpellShop.fnDeckCompare, QuestSpellShop.fnDeckGet);
             itemManager.setup(ItemManagerConfig.QUEST_INVENTORY, colOverrides);
 
-            final ItemPool<InventoryItem> ownedItems = new ItemPool<InventoryItem>(InventoryItem.class);
+            final ItemPool<InventoryItem> ownedItems = new ItemPool<>(InventoryItem.class);
             ownedItems.addAllOfType(FModel.getQuest().getCards().getCardpool().getView());
             itemManager.setPool(ownedItems);
         }
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestStatsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestStatsScreen.java
index 7840e135436..5538964468f 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestStatsScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestStatsScreen.java
@@ -48,8 +48,8 @@ public class QuestStatsScreen extends FScreen {
     private final FLabel lblWinStreak = scroller.add(new StatLabel(FSkinImage.QUEST_PLUSPLUS));
     private final FLabel lblLife = scroller.add(new StatLabel(FSkinImage.QUEST_LIFE));
     private final FLabel lblWorld = scroller.add(new StatLabel(FSkinImage.QUEST_MAP));
-    private final FComboBox<String> cbxPet = scroller.add(new FComboBox<String>());
-    private final FComboBox<String> cbxMatchLength  = scroller.add(new FComboBox<String>());
+    private final FComboBox<String> cbxPet = scroller.add(new FComboBox<>());
+    private final FComboBox<String> cbxMatchLength  = scroller.add(new FComboBox<>());
     private final FCheckBox cbPlant = scroller.add(new FCheckBox("Summon Plant"));
     private final FLabel lblZep = scroller.add(new FLabel.Builder().text("Launch Zeppelin").icon(FSkinImage.QUEST_ZEP).font(FSkinFont.get(16)).opaque().build());
 
diff --git a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java
index 2120288df18..4f4367b646f 100644
--- a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java
+++ b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java
@@ -19,7 +19,7 @@ import forge.toolbox.FOptionPane;
 import forge.util.Callback;
 
 public class FilesPage extends TabPage<SettingsScreen> {
-    private final FGroupList<FilesItem> lstItems = add(new FGroupList<FilesItem>());
+    private final FGroupList<FilesItem> lstItems = add(new FGroupList<>());
 
     protected FilesPage() {
         super("Files", FSkinImage.OPEN);
diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
index c558505413f..a8b95b99340 100644
--- a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
+++ b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class SettingsPage extends TabPage<SettingsScreen> {
-    private final FGroupList<Setting> lstSettings = add(new FGroupList<Setting>());
+    private final FGroupList<Setting> lstSettings = add(new FGroupList<>());
 
     public SettingsPage() {
         super("Settings", FSkinImage.SETTINGS);
@@ -397,7 +397,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
     }
 
     private class CustomSelectSetting extends Setting {
-        private final List<String> options = new ArrayList<String>();
+        private final List<String> options = new ArrayList<>();
 
         public CustomSelectSetting(FPref pref0, String label0, String description0, String[] options0) {
             super(pref0, label0 + ":", description0);
@@ -437,7 +437,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
 
             private CustomSelectScreen() {
                 super("Select " + label.substring(0, label.length() - 1));
-                lstOptions = add(new FList<String>(options));
+                lstOptions = add(new FList<>(options));
                 lstOptions.setListItemRenderer(new FList.DefaultListItemRenderer<String>() {
                     @Override
                     public boolean tap(Integer index, String value, float x, float y, int count) {
diff --git a/forge-gui-mobile/src/forge/toolbox/DualListBox.java b/forge-gui-mobile/src/forge/toolbox/DualListBox.java
index 65891c3eb47..452ae654533 100644
--- a/forge-gui-mobile/src/forge/toolbox/DualListBox.java
+++ b/forge-gui-mobile/src/forge/toolbox/DualListBox.java
@@ -206,7 +206,7 @@ public class DualListBox<T> extends FDialog {
         private final FEventHandler onActivate;
 
         private ChoiceList(Collection<T> items, final T typeItem, final FEventHandler onActivate0) {
-            super(items != null ? items : new ArrayList<T>(), typeItem); //handle null without crashing
+            super(items != null ? items : new ArrayList<>(), typeItem); //handle null without crashing
             onActivate = onActivate0;
         }
 
diff --git a/forge-gui-mobile/src/forge/toolbox/FChoiceList.java b/forge-gui-mobile/src/forge/toolbox/FChoiceList.java
index a512d0ce567..770736b177e 100644
--- a/forge-gui-mobile/src/forge/toolbox/FChoiceList.java
+++ b/forge-gui-mobile/src/forge/toolbox/FChoiceList.java
@@ -40,7 +40,7 @@ public class FChoiceList<T> extends FList<T> implements ActivateHandler {
 
     protected final int minChoices, maxChoices;
     private final CompactModeHandler compactModeHandler = new CompactModeHandler();
-    private final List<Integer> selectedIndices = new ArrayList<Integer>();
+    private final List<Integer> selectedIndices = new ArrayList<>();
 
     public FChoiceList(Iterable<? extends T> items) {
         this(items, null);
@@ -172,7 +172,7 @@ public class FChoiceList<T> extends FList<T> implements ActivateHandler {
     }
 
     public List<T> getSelectedItems() {
-        List<T> choices = new ArrayList<T>();
+        List<T> choices = new ArrayList<>();
         for (int i : selectedIndices) {
             choices.add(getItemAt(i));
         }
diff --git a/forge-gui-mobile/src/forge/toolbox/FComboBox.java b/forge-gui-mobile/src/forge/toolbox/FComboBox.java
index 019af582c63..8e22a40b9d2 100644
--- a/forge-gui-mobile/src/forge/toolbox/FComboBox.java
+++ b/forge-gui-mobile/src/forge/toolbox/FComboBox.java
@@ -12,7 +12,7 @@ import forge.menu.FMenuItem;
 import forge.toolbox.FEvent.*;
 
 public class FComboBox<T> extends FTextField implements IComboBox<T> {
-    private final List<T> items = new ArrayList<T>();
+    private final List<T> items = new ArrayList<>();
     private T selectedItem;
     private String label = "";
     private final DropDown dropDown = new DropDown();
diff --git a/forge-gui-mobile/src/forge/toolbox/FContainer.java b/forge-gui-mobile/src/forge/toolbox/FContainer.java
index 9aa5c7511d8..32fcf2ea0ab 100644
--- a/forge-gui-mobile/src/forge/toolbox/FContainer.java
+++ b/forge-gui-mobile/src/forge/toolbox/FContainer.java
@@ -10,7 +10,7 @@ import forge.Graphics;
 import forge.error.BugReporter;
 
 public abstract class FContainer extends FDisplayObject {
-    private final List<FDisplayObject> children = new ArrayList<FDisplayObject>();
+    private final List<FDisplayObject> children = new ArrayList<>();
 
     public <T extends FDisplayObject> T add(T child) {
         children.add(child);
diff --git a/forge-gui-mobile/src/forge/toolbox/FGroupList.java b/forge-gui-mobile/src/forge/toolbox/FGroupList.java
index 918413b5f82..7646c858d38 100644
--- a/forge-gui-mobile/src/forge/toolbox/FGroupList.java
+++ b/forge-gui-mobile/src/forge/toolbox/FGroupList.java
@@ -16,7 +16,7 @@ import forge.util.Utils;
 public class FGroupList<E> extends FScrollPane {
     private static final float GROUP_HEADER_HEIGHT = Math.round(Utils.AVG_FINGER_HEIGHT * 0.6f);
 
-    private final List<ListGroup> groups = new ArrayList<ListGroup>();
+    private final List<ListGroup> groups = new ArrayList<>();
     private FSkinFont font;
     private ListItemRenderer<E> renderer;
 
@@ -38,7 +38,7 @@ public class FGroupList<E> extends FScrollPane {
 
     private void initialize() {
         font = FSkinFont.get(14);
-        renderer = new DefaultListItemRenderer<E>();
+        renderer = new DefaultListItemRenderer<>();
     }
 
     public void addGroup(String groupName) {
@@ -166,7 +166,7 @@ public class FGroupList<E> extends FScrollPane {
 
     private class ListGroup extends FContainer {
         private final FLabel header;
-        private final List<ListItem> items = new ArrayList<ListItem>();
+        private final List<ListItem> items = new ArrayList<>();
 
         private boolean isCollapsed;
 
diff --git a/forge-gui-mobile/src/forge/toolbox/FList.java b/forge-gui-mobile/src/forge/toolbox/FList.java
index 4fcb3929d3f..c6c3f80cc74 100644
--- a/forge-gui-mobile/src/forge/toolbox/FList.java
+++ b/forge-gui-mobile/src/forge/toolbox/FList.java
@@ -24,7 +24,7 @@ public class FList<T> extends FScrollPane implements Iterable<T> {
     public static final FSkinColor LINE_COLOR = FORE_COLOR.alphaColor(0.5f);
     public static final float LINE_THICKNESS = Utils.scale(1);
 
-    protected final List<T> items = new ArrayList<T>();
+    protected final List<T> items = new ArrayList<>();
     private FSkinFont font;
     private ListItemRenderer<T> renderer;
     private int pressedIndex = -1;
@@ -47,7 +47,7 @@ public class FList<T> extends FScrollPane implements Iterable<T> {
 
     private void initialize() {
         font = FSkinFont.get(14);
-        renderer = new DefaultListItemRenderer<T>();
+        renderer = new DefaultListItemRenderer<>();
     }
 
     public synchronized void addItem(T item) {
@@ -65,7 +65,7 @@ public class FList<T> extends FScrollPane implements Iterable<T> {
     }
 
     public List<T> extractListData() {
-        return new ArrayList<T>(items); //create copy to avoid modifying items
+        return new ArrayList<>(items); //create copy to avoid modifying items
     }
     public synchronized void setListData(Iterable<? extends T> items0) {
         clear();
diff --git a/forge-gui-mobile/src/forge/toolbox/FOptionPane.java b/forge-gui-mobile/src/forge/toolbox/FOptionPane.java
index 9db441307c1..b93a8b04731 100644
--- a/forge-gui-mobile/src/forge/toolbox/FOptionPane.java
+++ b/forge-gui-mobile/src/forge/toolbox/FOptionPane.java
@@ -173,7 +173,7 @@ public class FOptionPane extends FDialog {
         }
         else {
             txtInput = null;
-            cbInput = new FComboBox<T>(inputOptions);
+            cbInput = new FComboBox<>(inputOptions);
             cbInput.setSelectedItem(initialInput);
             inputField = cbInput;
         }
diff --git a/forge-gui-mobile/src/forge/toolbox/FOverlay.java b/forge-gui-mobile/src/forge/toolbox/FOverlay.java
index 3905b488c9e..dca477d87a8 100644
--- a/forge-gui-mobile/src/forge/toolbox/FOverlay.java
+++ b/forge-gui-mobile/src/forge/toolbox/FOverlay.java
@@ -18,7 +18,7 @@ import forge.screens.match.MatchController;
 
 public abstract class FOverlay extends FContainer {
     public static final float ALPHA_COMPOSITE = 0.5f;
-    private static final Stack<FOverlay> overlays = new Stack<FOverlay>();
+    private static final Stack<FOverlay> overlays = new Stack<>();
     private static boolean hidingAll = false;
     private static FOverlay tempOverlay;
 
@@ -49,7 +49,7 @@ public abstract class FOverlay extends FContainer {
         if (overlays.size() < 2) {
             return overlays; //don't need to create new list if one or fewer overlay
         }
-        List<FOverlay> reversedList = new ArrayList<FOverlay>();
+        List<FOverlay> reversedList = new ArrayList<>();
         for (int i = overlays.size() - 1; i >= 0; i--) {
             reversedList.add(overlays.get(i));
         }
diff --git a/forge-gui-mobile/src/forge/toolbox/FProgressBar.java b/forge-gui-mobile/src/forge/toolbox/FProgressBar.java
index 06eb7233d45..160cf0bcd89 100644
--- a/forge-gui-mobile/src/forge/toolbox/FProgressBar.java
+++ b/forge-gui-mobile/src/forge/toolbox/FProgressBar.java
@@ -119,7 +119,7 @@ public class FProgressBar extends FDisplayObject implements IProgressBar {
         float h = getHeight();
 
         //draw background and progress
-        List<Pair<Float, Float>> selTextRegions = new ArrayList<Pair<Float, Float>>();
+        List<Pair<Float, Float>> selTextRegions = new ArrayList<>();
         if (showProgressTrail) {
             long now = new Date().getTime();
             if (progressTrailStart == -1) {
diff --git a/forge-gui-mobile/src/forge/toolbox/FRadioButton.java b/forge-gui-mobile/src/forge/toolbox/FRadioButton.java
index ed8d94490b1..7488045e387 100644
--- a/forge-gui-mobile/src/forge/toolbox/FRadioButton.java
+++ b/forge-gui-mobile/src/forge/toolbox/FRadioButton.java
@@ -94,6 +94,6 @@ public class FRadioButton extends FLabel {
     }
 
     public static class RadioButtonGroup {
-        private final List<FRadioButton> buttons = new ArrayList<FRadioButton>();
+        private final List<FRadioButton> buttons = new ArrayList<>();
     }
 }
diff --git a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java
index 0e6b5a0667d..e8f19f00ad1 100644
--- a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java
+++ b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java
@@ -110,7 +110,7 @@ public class GuiChoose {
 
     // Nothing to choose here. Code uses this to just reveal one or more items
     public static <T> void reveal(final String message, final T item) {
-        List<T> items = new ArrayList<T>();
+        List<T> items = new ArrayList<>();
         items.add(item);
         reveal(message, items);
     }
@@ -162,7 +162,7 @@ public class GuiChoose {
             return;
         }
 
-        List<Object> choices = new ArrayList<Object>();
+        List<Object> choices = new ArrayList<>();
         for (int i = min; i <= cutoff; i++) {
             choices.add(Integer.valueOf(i));
         }
@@ -229,13 +229,13 @@ public class GuiChoose {
     public static <T> void getChoices(final String message, final int min, final int max, final Collection<T> choices, final T selected, final Function<T, String> display, final Callback<List<T>> callback) {
         if (choices == null || choices.isEmpty()) {
             if (min == 0) {
-                callback.run(new ArrayList<T>());
+                callback.run(new ArrayList<>());
                 return;
             }
             throw new RuntimeException("choice required from empty list");
         }
 
-        ListChooser<T> c = new ListChooser<T>(message, min, max, choices, display, callback);
+        ListChooser<T> c = new ListChooser<>(message, min, max, choices, display, callback);
         c.show(selected, false);
     }
 
@@ -256,7 +256,7 @@ public class GuiChoose {
     public static <T> void order(final String title, final String top, final int remainingObjectsMin, final int remainingObjectsMax,
             final List<T> sourceChoices, final List<T> destChoices, final CardView referenceCard, final Callback<List<T>> callback) {
         // An input box for handling the order of choices.
-        DualListBox<T> dual = new DualListBox<T>(title, remainingObjectsMin, remainingObjectsMax, sourceChoices, destChoices, callback);
+        DualListBox<T> dual = new DualListBox<>(title, remainingObjectsMin, remainingObjectsMax, sourceChoices, destChoices, callback);
         dual.setSecondColumnLabelText(top);
         dual.show();
     }
diff --git a/forge-gui-mobile/src/forge/toolbox/ListChooser.java b/forge-gui-mobile/src/forge/toolbox/ListChooser.java
index 9fd472230ed..de20d8ab69a 100644
--- a/forge-gui-mobile/src/forge/toolbox/ListChooser.java
+++ b/forge-gui-mobile/src/forge/toolbox/ListChooser.java
@@ -151,7 +151,7 @@ public class ListChooser<T> extends FContainer {
                     show(); //show if user tries to cancel when input is mandatory
                 }
                 else {
-                    callback.run(new ArrayList<T>());
+                    callback.run(new ArrayList<>());
                 }
             }
         }) {
@@ -179,7 +179,7 @@ public class ListChooser<T> extends FContainer {
     public void applyFilters() {
         lstChoices.clearSelection();
 
-        List<Predicate<? super T>> predicates = new ArrayList<Predicate<? super T>>();
+        List<Predicate<? super T>> predicates = new ArrayList<>();
 
         final String pattern = txtSearch.getText().toLowerCase();
         if (!pattern.isEmpty()) {
diff --git a/forge-gui/src/main/java/forge/achievement/Domain.java b/forge-gui/src/main/java/forge/achievement/Domain.java
index 93b6a397889..0fba442df1c 100644
--- a/forge-gui/src/main/java/forge/achievement/Domain.java
+++ b/forge-gui/src/main/java/forge/achievement/Domain.java
@@ -37,7 +37,7 @@ public class Domain extends ProgressiveAchievement {
             return false;
         }
         if (player.getOutcome().hasWon()) {
-            Set<String> basicLands = new HashSet<String>();
+            Set<String> basicLands = new HashSet<>();
             for (Card c : player.getCardsIn(ZoneType.Battlefield)) {
                 String name = c.getName();
                 if (c.isBasicLand() && basicLandMap.containsKey(name)) {
diff --git a/forge-gui/src/main/java/forge/card/CardDetailUtil.java b/forge-gui/src/main/java/forge/card/CardDetailUtil.java
index e86d433f44e..5215450dfef 100644
--- a/forge-gui/src/main/java/forge/card/CardDetailUtil.java
+++ b/forge-gui/src/main/java/forge/card/CardDetailUtil.java
@@ -69,7 +69,7 @@ public class CardDetailUtil {
         return getBorderColors(colorSet, false, true, true);
     }
     private static List<DetailColors> getBorderColors(final ColorSet cardColors, final boolean isLand, final boolean canShow, final boolean supportMultiple) {
-        final List<DetailColors> borderColors = new ArrayList<DetailColors>();
+        final List<DetailColors> borderColors = new ArrayList<>();
 
         if (cardColors == null || !canShow) {
             borderColors.add(DetailColors.FACE_DOWN);
diff --git a/forge-gui/src/main/java/forge/card/CardPreferences.java b/forge-gui/src/main/java/forge/card/CardPreferences.java
index c271d55ac07..ffda9881370 100644
--- a/forge-gui/src/main/java/forge/card/CardPreferences.java
+++ b/forge-gui/src/main/java/forge/card/CardPreferences.java
@@ -22,7 +22,7 @@ import org.w3c.dom.NodeList;
  *
  */
 public class CardPreferences {
-    private static Map<String, CardPreferences> allPrefs = new HashMap<String, CardPreferences>();
+    private static Map<String, CardPreferences> allPrefs = new HashMap<>();
 
     public static CardPreferences getPrefs(IPaperCard card) {
         String cardName = card.getName();
diff --git a/forge-gui/src/main/java/forge/card/CardReaderExperiments.java b/forge-gui/src/main/java/forge/card/CardReaderExperiments.java
index 88caacc8442..147940c7f96 100644
--- a/forge-gui/src/main/java/forge/card/CardReaderExperiments.java
+++ b/forge-gui/src/main/java/forge/card/CardReaderExperiments.java
@@ -18,12 +18,12 @@ public class CardReaderExperiments {
         if (args.length < 2) { return; }
 
         int totalParsedCount = 0;
-        final List<List<String>> output = new ArrayList<List<String>>();
+        final List<List<String>> output = new ArrayList<>();
         for (int i = 1; i < args.length; i++) {
-            output.add(new ArrayList<String>());
+            output.add(new ArrayList<>());
         }
         
-        final List<File> allFiles = CardStorageReader.collectCardFiles(new ArrayList<File>(), new File(ForgeConstants.CARD_DATA_DIR));
+        final List<File> allFiles = CardStorageReader.collectCardFiles(new ArrayList<>(), new File(ForgeConstants.CARD_DATA_DIR));
         Charset charset = Charset.forName(CardStorageReader.DEFAULT_CHARSET_NAME);
         final CardRules.Reader rulesReader = new CardRules.Reader();
         for (File file : allFiles) {
diff --git a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java b/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java
index 264724df198..799364cff24 100644
--- a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java
+++ b/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java
@@ -32,10 +32,10 @@ import forge.util.maps.MapOfLists;
 public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
     private final PlayerControllerHuman humanController;
     private final IGuiGame matchController;
-    private final Set<CardView> cardsUpdate = new HashSet<CardView>();
-    private final Set<CardView> cardsRefreshDetails = new HashSet<CardView>();
-    private final Set<PlayerView> livesUpdate = new HashSet<PlayerView>();
-    private final Set<PlayerView> manaPoolUpdate = new HashSet<PlayerView>();
+    private final Set<CardView> cardsUpdate = new HashSet<>();
+    private final Set<CardView> cardsRefreshDetails = new HashSet<>();
+    private final Set<PlayerView> livesUpdate = new HashSet<>();
+    private final Set<PlayerView> manaPoolUpdate = new HashSet<>();
     private final PlayerZoneUpdates zonesUpdate = new PlayerZoneUpdates();
 
     private boolean processEventsQueued, needPhaseUpdate, needCombatUpdate, needStackUpdate, needPlayerControlUpdate;
@@ -301,7 +301,7 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
 
     @Override
     public Void visit(final GameEventBlockersDeclared event) {
-        final Set<Card> cards = new HashSet<Card>();
+        final Set<Card> cards = new HashSet<>();
         for (final MapOfLists<Card, Card> kv : event.blockers.values()) {
             for (final Collection<Card> blockers : kv.values()) {
                 cards.addAll(blockers);
diff --git a/forge-gui/src/main/java/forge/deck/ArchetypeDeckGenerator.java b/forge-gui/src/main/java/forge/deck/ArchetypeDeckGenerator.java
index 74aefb8da64..bc2d523de60 100644
--- a/forge-gui/src/main/java/forge/deck/ArchetypeDeckGenerator.java
+++ b/forge-gui/src/main/java/forge/deck/ArchetypeDeckGenerator.java
@@ -15,7 +15,7 @@ import java.util.List;
  */
 public class ArchetypeDeckGenerator extends DeckProxy implements Comparable<ArchetypeDeckGenerator> {
     public static List<DeckProxy> getMatrixDecks(GameFormat format, boolean isForAi){
-        final List<DeckProxy> decks = new ArrayList<DeckProxy>();
+        final List<DeckProxy> decks = new ArrayList<>();
             for(Archetype archetype: CardArchetypeLDAGenerator.ldaArchetypes.get(format.getName())) {
                 decks.add(new ArchetypeDeckGenerator(archetype, format, isForAi));
             }
diff --git a/forge-gui/src/main/java/forge/deck/CardArchetypeLDAGenerator.java b/forge-gui/src/main/java/forge/deck/CardArchetypeLDAGenerator.java
index 2cbab5ab4d1..ddcc82a3e02 100644
--- a/forge-gui/src/main/java/forge/deck/CardArchetypeLDAGenerator.java
+++ b/forge-gui/src/main/java/forge/deck/CardArchetypeLDAGenerator.java
@@ -69,7 +69,7 @@ public final class CardArchetypeLDAGenerator {
     public static Map<String,List<List<Pair<String, Double>>>> loadFormat(List<Archetype> lda) throws Exception{
 
         List<List<Pair<String, Double>>> topics = new ArrayList<>();
-        Set<String> cards = new HashSet<String>();
+        Set<String> cards = new HashSet<>();
         for (int t = 0; t < lda.size(); ++t) {
             List<Pair<String, Double>> topic = new ArrayList<>();
             Set<String> topicCards = new HashSet<>();
diff --git a/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java b/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
index 9227ae62637..6c9c7e74687 100644
--- a/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
+++ b/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
@@ -62,7 +62,7 @@ public final class CardRelationMatrixGenerator {
     }
 
     public static HashMap<String,List<Map.Entry<PaperCard,Integer>>> initializeFormat(GameFormat format){
-        IStorage<Deck> decks = new StorageImmediatelySerialized<Deck>("Generator", new DeckStorage(new File(ForgeConstants.DECK_GEN_DIR+ForgeConstants.PATH_SEPARATOR+format.getName()),
+        IStorage<Deck> decks = new StorageImmediatelySerialized<>("Generator", new DeckStorage(new File(ForgeConstants.DECK_GEN_DIR + ForgeConstants.PATH_SEPARATOR + format.getName()),
                 ForgeConstants.DECK_GEN_DIR, false),
                 true);
 
@@ -117,7 +117,7 @@ public final class CardRelationMatrixGenerator {
                     if(!cardToAdd.getRules().getMainPart().getType().isLand()){//need x non-land cards
                         ++j;
                     }
-                    deckPool.add(new AbstractMap.SimpleEntry<PaperCard, Integer>(cardToAdd,distances[indices[cardList.size()-1-k]]));
+                    deckPool.add(new AbstractMap.SimpleEntry<>(cardToAdd, distances[indices[cardList.size() - 1 - k]]));
                 }
                 if(excludeThisCard){
                     continue;
@@ -129,9 +129,9 @@ public final class CardRelationMatrixGenerator {
     }
 
     public static HashMap<String,List<Map.Entry<PaperCard,Integer>>> initializeCommanderFormat(DeckFormat format){
-        IStorage<Deck> decks = new StorageImmediatelySerialized<Deck>("Generator",
+        IStorage<Deck> decks = new StorageImmediatelySerialized<>("Generator",
                 new DeckStorage(new File(ForgeConstants.DECK_GEN_DIR, format.toString()),
-                ForgeConstants.DECK_GEN_DIR, false),
+                        ForgeConstants.DECK_GEN_DIR, false),
                 true);
 
         //get all cards
@@ -186,7 +186,7 @@ public final class CardRelationMatrixGenerator {
                 List<Map.Entry<PaperCard,Integer>> deckPool=new ArrayList<>();
                 for(int k=0;k<cardList.size(); k++){
                     if(matrix[col][k]>0){
-                        deckPool.add(new AbstractMap.SimpleEntry<PaperCard, Integer>(integerCardMap.get(k),matrix[col][k]));
+                        deckPool.add(new AbstractMap.SimpleEntry<>(integerCardMap.get(k), matrix[col][k]));
                     }
                 }
                 cardPools.put(card.getName(), deckPool);
diff --git a/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java b/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java
index f9cff56d778..dad5e42face 100644
--- a/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java
+++ b/forge-gui/src/main/java/forge/deck/CardThemedDeckGenerator.java
@@ -13,7 +13,7 @@ import java.util.List;
  */
 public class CardThemedDeckGenerator extends DeckProxy implements Comparable<CardThemedDeckGenerator> {
     public static List<DeckProxy> getMatrixDecks(GameFormat format, boolean isForAi){
-        final List<DeckProxy> decks = new ArrayList<DeckProxy>();
+        final List<DeckProxy> decks = new ArrayList<>();
             for(String card: CardArchetypeLDAGenerator.ldaPools.get(format.getName()).keySet()) {
                 //exclude non AI playables as keycards for AI decks
                 if(isForAi&&FModel.getMagicDb().getCommonCards().getUniqueByName(card).getRules().getAiHints().getRemAIDecks()){
diff --git a/forge-gui/src/main/java/forge/deck/ColorDeckGenerator.java b/forge-gui/src/main/java/forge/deck/ColorDeckGenerator.java
index 284542da98e..19d782305f9 100644
--- a/forge-gui/src/main/java/forge/deck/ColorDeckGenerator.java
+++ b/forge-gui/src/main/java/forge/deck/ColorDeckGenerator.java
@@ -13,7 +13,7 @@ public class ColorDeckGenerator extends DeckProxy implements Comparable<ColorDec
     public static List<DeckProxy> getColorDecks(final IItemManager<DeckProxy> lstDecks0, final Predicate<PaperCard> formatFilter0, final boolean isAi0) {
         final String[] colors = new String[] { "Random 1", "Random 2", "Random 3",
                 "White", "Blue", "Black", "Red", "Green" };
-        final List<DeckProxy> decks = new ArrayList<DeckProxy>();
+        final List<DeckProxy> decks = new ArrayList<>();
         for (int i = 0; i < colors.length; i++) {
             decks.add(new ColorDeckGenerator(colors[i], i, lstDecks0, formatFilter0, isAi0));
         }
@@ -56,7 +56,7 @@ public class ColorDeckGenerator extends DeckProxy implements Comparable<ColorDec
 
     @Override
     public Deck getDeck() {
-        final List<String> selection = new ArrayList<String>();
+        final List<String> selection = new ArrayList<>();
         for (final DeckProxy deck : lstDecks.getSelectedItems()) {
             selection.add(deck.getName());
         }
diff --git a/forge-gui/src/main/java/forge/deck/CommanderDeckGenerator.java b/forge-gui/src/main/java/forge/deck/CommanderDeckGenerator.java
index 88938d11d34..12c7b84d0ff 100644
--- a/forge-gui/src/main/java/forge/deck/CommanderDeckGenerator.java
+++ b/forge-gui/src/main/java/forge/deck/CommanderDeckGenerator.java
@@ -24,7 +24,7 @@ public class CommanderDeckGenerator extends DeckProxy implements Comparable<Comm
         }
         ItemPool uniqueCards;
         if (isCardGen){
-            uniqueCards = new ItemPool<PaperCard>(PaperCard.class);
+            uniqueCards = new ItemPool<>(PaperCard.class);
             String matrixKey = (format.equals(DeckFormat.TinyLeaders) ? DeckFormat.Commander : format).toString(); //use Commander for Tiny Leaders
             Iterable<String> legendNames = CardRelationMatrixGenerator.cardPools.get(matrixKey).keySet();
             for (String legendName : legendNames) {
@@ -44,7 +44,7 @@ public class CommanderDeckGenerator extends DeckProxy implements Comparable<Comm
                         }
                     },
                     canPlay), PaperCard.FN_GET_RULES));
-        final List<DeckProxy> decks = new ArrayList<DeckProxy>();
+        final List<DeckProxy> decks = new ArrayList<>();
         for (PaperCard legend: legends) {
             decks.add(new CommanderDeckGenerator(legend, format, isForAi, isCardGen));
         }
@@ -54,7 +54,7 @@ public class CommanderDeckGenerator extends DeckProxy implements Comparable<Comm
     public static List<DeckProxy> getBrawlDecks(final DeckFormat format, boolean isForAi, boolean isCardGen){
         ItemPool uniqueCards;
         if (isCardGen){
-            uniqueCards = new ItemPool<PaperCard>(PaperCard.class);
+            uniqueCards = new ItemPool<>(PaperCard.class);
             //TODO: update to actual Brawl model from real Brawl decks
             Iterable<String> legendNames=CardArchetypeLDAGenerator.ldaPools.get(FModel.getFormats().getStandard().getName()).keySet();
             for (String legendName : legendNames) {
@@ -70,7 +70,7 @@ public class CommanderDeckGenerator extends DeckProxy implements Comparable<Comm
                 Predicates.compose(Predicates.and(
                 CardRulesPredicates.Presets.CAN_BE_BRAWL_COMMANDER,
                 canPlay), PaperCard.FN_GET_RULES)));
-        final List<DeckProxy> decks = new ArrayList<DeckProxy>();
+        final List<DeckProxy> decks = new ArrayList<>();
         for (PaperCard legend: legends) {
             decks.add(new CommanderDeckGenerator(legend, format, isForAi, isCardGen));
         }
diff --git a/forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java b/forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java
index 281425fd157..3f57c84a271 100644
--- a/forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java
+++ b/forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java
@@ -72,7 +72,7 @@ public class DeckGeneratorTheme extends DeckGeneratorBase {
      * @return a {@link java.util.ArrayList} object.
      */
     public static final List<String> getThemeNames() {
-        final List<String> ltNames = new ArrayList<String>();
+        final List<String> ltNames = new ArrayList<>();
 
         final File file = new File(ForgeConstants.THEMES_DIR);
 
@@ -180,7 +180,7 @@ public class DeckGeneratorTheme extends DeckGeneratorBase {
 
     private class Grp {
         /** The Cardnames. */
-        private final List<String> cardnames = new ArrayList<String>();
+        private final List<String> cardnames = new ArrayList<>();
 
         /** The Max cnt. */
         private int maxCnt;
@@ -190,7 +190,7 @@ public class DeckGeneratorTheme extends DeckGeneratorBase {
     }
 
     private List<Grp> readGroups(List<String> lines) {
-        final List<Grp> groups = new ArrayList<Grp>();
+        final List<Grp> groups = new ArrayList<>();
 
         Grp g = null;
         for (String s : lines) {
diff --git a/forge-gui/src/main/java/forge/deck/DeckImportController.java b/forge-gui/src/main/java/forge/deck/DeckImportController.java
index d8182d211d0..e8d19779752 100644
--- a/forge-gui/src/main/java/forge/deck/DeckImportController.java
+++ b/forge-gui/src/main/java/forge/deck/DeckImportController.java
@@ -19,7 +19,7 @@ public class DeckImportController {
     private final ICheckBox newEditionCheck, dateTimeCheck, onlyCoreExpCheck;
     private final IComboBox<String> monthDropdown;
     private final IComboBox<Integer> yearDropdown;
-    private final List<DeckRecognizer.Token> tokens = new ArrayList<DeckRecognizer.Token>();
+    private final List<DeckRecognizer.Token> tokens = new ArrayList<>();
 
     public DeckImportController(boolean replacingDeck0, ICheckBox newEditionCheck0, ICheckBox dateTimeCheck0, ICheckBox onlyCoreExpCheck0, IComboBox<String> monthDropdown0, IComboBox<Integer> yearDropdown0) {
         replacingDeck = replacingDeck0;
diff --git a/forge-gui/src/main/java/forge/deck/DeckProxy.java b/forge-gui/src/main/java/forge/deck/DeckProxy.java
index 8502e9b49a5..01e46db5ecf 100644
--- a/forge-gui/src/main/java/forge/deck/DeckProxy.java
+++ b/forge-gui/src/main/java/forge/deck/DeckProxy.java
@@ -172,7 +172,7 @@ public class DeckProxy implements InventoryItem {
                                 //track phyrexian and hybrid costs separately as they won't always affect color
                                 if (shard.isPhyrexian() || shard.isOr2Generic() || !shard.isMonoColor()) {
                                     if (nonReqColors == null) {
-                                        nonReqColors = new HashSet<Byte>();
+                                        nonReqColors = new HashSet<>();
                                     }
                                     nonReqColors.add(shard.getColorMask());
                                 }
@@ -350,7 +350,7 @@ public class DeckProxy implements InventoryItem {
         return getAllConstructedDecks(null);
     }
     public static Iterable<DeckProxy> getAllConstructedDecks(final Predicate<Deck> filter) {
-        final List<DeckProxy> result = new ArrayList<DeckProxy>();
+        final List<DeckProxy> result = new ArrayList<>();
         addDecksRecursivelly("Constructed", GameType.Constructed, result, "", FModel.getDecks().getConstructed(), filter);
         return result;
     }
@@ -359,7 +359,7 @@ public class DeckProxy implements InventoryItem {
         return getAllCommanderDecks(null);
     }
     public static Iterable<DeckProxy> getAllCommanderDecks(final Predicate<Deck> filter) {
-        final List<DeckProxy> result = new ArrayList<DeckProxy>();
+        final List<DeckProxy> result = new ArrayList<>();
         addDecksRecursivelly("Commander", GameType.Commander, result, "", FModel.getDecks().getCommander(), filter);
         return result;
     }
@@ -368,7 +368,7 @@ public class DeckProxy implements InventoryItem {
         return getAllOathbreakerDecks(null);
     }
     public static Iterable<DeckProxy> getAllOathbreakerDecks(final Predicate<Deck> filter) {
-        final List<DeckProxy> result = new ArrayList<DeckProxy>();
+        final List<DeckProxy> result = new ArrayList<>();
         addDecksRecursivelly("Oathbreaker", GameType.Oathbreaker, result, "", FModel.getDecks().getOathbreaker(), filter);
         return result;
     }
@@ -377,7 +377,7 @@ public class DeckProxy implements InventoryItem {
         return getAllTinyLeadersDecks(null);
     }
     public static Iterable<DeckProxy> getAllTinyLeadersDecks(Predicate<Deck> filter) {
-        final List<DeckProxy> result = new ArrayList<DeckProxy>();
+        final List<DeckProxy> result = new ArrayList<>();
         if (filter == null) {
             filter = DeckFormat.TinyLeaders.hasLegalCardsPredicate();
         }
@@ -392,7 +392,7 @@ public class DeckProxy implements InventoryItem {
         return getAllBrawlDecks(null);
     }
     public static Iterable<DeckProxy> getAllBrawlDecks(Predicate<Deck> filter) {
-        final List<DeckProxy> result = new ArrayList<DeckProxy>();
+        final List<DeckProxy> result = new ArrayList<>();
         if (filter == null) {
             filter = DeckFormat.Brawl.hasLegalCardsPredicate();
         }
@@ -407,7 +407,7 @@ public class DeckProxy implements InventoryItem {
         return getAllSchemeDecks(null);
     }
     public static Iterable<DeckProxy> getAllSchemeDecks(final Predicate<Deck> filter) {
-        final List<DeckProxy> result = new ArrayList<DeckProxy>();
+        final List<DeckProxy> result = new ArrayList<>();
         addDecksRecursivelly("Scheme", GameType.Archenemy, result, "", FModel.getDecks().getScheme(), filter);
         return result;
     }
@@ -416,7 +416,7 @@ public class DeckProxy implements InventoryItem {
         return getAllPlanarDecks(null);
     }
     public static Iterable<DeckProxy> getAllPlanarDecks(final Predicate<Deck> filter) {
-        final List<DeckProxy> result = new ArrayList<DeckProxy>();
+        final List<DeckProxy> result = new ArrayList<>();
         addDecksRecursivelly("Plane", GameType.Planechase, result, "", FModel.getDecks().getPlane(), filter);
         return result;
     }
@@ -510,7 +510,7 @@ public class DeckProxy implements InventoryItem {
     }
 
     public static List<DeckProxy> getAllThemeDecks() {
-        final List<DeckProxy> decks = new ArrayList<DeckProxy>();
+        final List<DeckProxy> decks = new ArrayList<>();
         for (final String s : DeckGeneratorTheme.getThemeNames()) {
             decks.add(new ThemeDeckGenerator(s));
         }
@@ -519,7 +519,7 @@ public class DeckProxy implements InventoryItem {
 
     @SuppressWarnings("unchecked")
     public static List<DeckProxy> getAllPreconstructedDecks(final IStorage<PreconDeck> iStorage) {
-        final List<DeckProxy> decks = new ArrayList<DeckProxy>();
+        final List<DeckProxy> decks = new ArrayList<>();
         for (final PreconDeck preconDeck : iStorage) {
             decks.add(new DeckProxy(preconDeck, "Precon", (Function<IHasName, Deck>)(Object)PreconDeck.FN_GET_DECK, null, iStorage));
         }
@@ -527,7 +527,7 @@ public class DeckProxy implements InventoryItem {
     }
 
     public static List<DeckProxy> getAllQuestEventAndChallenges() {
-        final List<DeckProxy> decks = new ArrayList<DeckProxy>();
+        final List<DeckProxy> decks = new ArrayList<>();
         final QuestController quest = FModel.getQuest();
         for (final QuestEvent e : quest.getDuelsManager().getAllDuels()) {
             decks.add(new DeckProxy(e.getEventDeck(), "Quest Event", null, null));
@@ -540,7 +540,7 @@ public class DeckProxy implements InventoryItem {
 
     @SuppressWarnings("unchecked")
     public static List<DeckProxy> getAllSealedDecks() {
-        final List<DeckProxy> humanDecks = new ArrayList<DeckProxy>();
+        final List<DeckProxy> humanDecks = new ArrayList<>();
         final IStorage<DeckGroup> sealed = FModel.getDecks().getSealed();
 
         // Since AI decks are tied directly to the human choice,
@@ -552,7 +552,7 @@ public class DeckProxy implements InventoryItem {
     }
 
     public static List<DeckProxy> getAllQuestDecks(final IStorage<Deck> storage) {
-        final List<DeckProxy> decks = new ArrayList<DeckProxy>();
+        final List<DeckProxy> decks = new ArrayList<>();
         if (storage != null) {
             for (final Deck deck : storage) {
                 decks.add(new DeckProxy(deck, "Quest", GameType.Quest, storage));
@@ -563,7 +563,7 @@ public class DeckProxy implements InventoryItem {
 
     @SuppressWarnings("unchecked")
     public static List<DeckProxy> getAllDraftDecks() {
-        final List<DeckProxy> decks = new ArrayList<DeckProxy>();
+        final List<DeckProxy> decks = new ArrayList<>();
         final IStorage<DeckGroup> draft = FModel.getDecks().getDraft();
         for (final DeckGroup d : draft) {
             decks.add(new DeckProxy(d, "Draft", ((Function<IHasName, Deck>)(Object)DeckGroup.FN_HUMAN_DECK), GameType.Draft, draft));
@@ -573,7 +573,7 @@ public class DeckProxy implements InventoryItem {
 
     @SuppressWarnings("unchecked")
     public static List<DeckProxy> getWinstonDecks(final IStorage<DeckGroup> draft) {
-        final List<DeckProxy> decks = new ArrayList<DeckProxy>();
+        final List<DeckProxy> decks = new ArrayList<>();
         for (final DeckGroup d : draft) {
             decks.add(new DeckProxy(d, "Winston", ((Function<IHasName, Deck>)(Object)DeckGroup.FN_HUMAN_DECK), GameType.Winston, draft));
         }
@@ -581,7 +581,7 @@ public class DeckProxy implements InventoryItem {
     }
 
     public static List<DeckProxy> getNetDecks(final NetDeckCategory category) {
-        final List<DeckProxy> decks = new ArrayList<DeckProxy>();
+        final List<DeckProxy> decks = new ArrayList<>();
         if (category != null) {
             addDecksRecursivelly("Constructed", GameType.Constructed, decks, "", category, null);
         }
diff --git a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java
index 0f27b16d038..a155d4e782e 100644
--- a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java
+++ b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java
@@ -389,7 +389,7 @@ public class DeckgenUtil {
     public static Deck getRandomColorDeck(Predicate<PaperCard> formatFilter, boolean forAi) {
         final int[] colorCount = new int[] {1, 2, 3};
         final int count = colorCount[MyRandom.getRandom().nextInt(colorCount.length)];
-        final List<String> selection = new ArrayList<String>();
+        final List<String> selection = new ArrayList<>();
 
         // A simulated selection of "random 1" will trigger the AI selection process.
         for (int i = 0; i < count; i++) { selection.add("Random"); }
@@ -400,7 +400,7 @@ public class DeckgenUtil {
     public static Deck getRandomColorDeck(boolean forAi) {
         final int[] colorCount = new int[] {1, 2, 3, 5};
         final int count = colorCount[MyRandom.getRandom().nextInt(colorCount.length)];
-        final List<String> selection = new ArrayList<String>();
+        final List<String> selection = new ArrayList<>();
 
         // A simulated selection of "random 1" will trigger the AI selection process.
         for (int i = 0; i < count; i++) { selection.add("Random"); }
@@ -430,7 +430,7 @@ public class DeckgenUtil {
     }
 
     public static Deck getRandomQuestDeck() {
-        final List<Deck> allQuestDecks = new ArrayList<Deck>();
+        final List<Deck> allQuestDecks = new ArrayList<>();
         QuestController qCtrl = FModel.getQuest();
 
         for (final QuestEvent e : qCtrl.getDuelsManager().getAllDuels()) {
@@ -512,7 +512,7 @@ public class DeckgenUtil {
 
     public static CardPool generateSchemePool() {
         CardPool schemes = new CardPool();
-        List<PaperCard> allSchemes = new ArrayList<PaperCard>();
+        List<PaperCard> allSchemes = new ArrayList<>();
         for (PaperCard c : FModel.getMagicDb().getVariantCards().getAllCards()) {
             if (c.getRules().getType().isScheme()) {
                 allSchemes.add(c);
@@ -544,7 +544,7 @@ public class DeckgenUtil {
 
     public static CardPool generatePlanarPool() {
         CardPool res = new CardPool();
-        List<PaperCard> allPlanars = new ArrayList<PaperCard>();
+        List<PaperCard> allPlanars = new ArrayList<>();
         for (PaperCard c : FModel.getMagicDb().getVariantCards().getAllCards()) {
             if (c.getRules().getType().isPlane() || c.getRules().getType().isPhenomenon()) {
                 allPlanars.add(c);
diff --git a/forge-gui/src/main/java/forge/deck/NetDeckCategory.java b/forge-gui/src/main/java/forge/deck/NetDeckCategory.java
index 75fcdbec995..809d60056a1 100644
--- a/forge-gui/src/main/java/forge/deck/NetDeckCategory.java
+++ b/forge-gui/src/main/java/forge/deck/NetDeckCategory.java
@@ -24,7 +24,7 @@ public class NetDeckCategory extends StorageBase<Deck> {
     private static Map<String, NetDeckCategory> constructed, commander;
 
     private static Map<String, NetDeckCategory> loadCategories(String filename) {
-        Map<String, NetDeckCategory> categories = new TreeMap<String, NetDeckCategory>();
+        Map<String, NetDeckCategory> categories = new TreeMap<>();
         if (FileUtil.doesFileExist(filename)) {
             List<String> lines = FileUtil.readFile(filename);
             for (String line : lines) {
@@ -108,7 +108,7 @@ public class NetDeckCategory extends StorageBase<Deck> {
     private final String url;
 
     private NetDeckCategory(String name0, String url0) {
-        super(name0, ForgeConstants.DECK_NET_DIR + name0, new HashMap<String, Deck>());
+        super(name0, ForgeConstants.DECK_NET_DIR + name0, new HashMap<>());
         url = url0;
     }
 
diff --git a/forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java b/forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java
index 4c2d999abce..8837c75ad1b 100644
--- a/forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java
+++ b/forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java
@@ -20,7 +20,7 @@ public class RandomDeckGenerator extends DeckProxy implements Comparable<RandomD
     }
 
     public static List<DeckProxy> getRandomDecks(final IHasGameType lstDecks0, final boolean isAi0) {
-        final List<DeckProxy> decks = new ArrayList<DeckProxy>();
+        final List<DeckProxy> decks = new ArrayList<>();
 
         decks.add(new RandomDeckGenerator("Random Generated Deck", RandomDeckType.Generated, lstDecks0, isAi0));
         decks.add(new RandomDeckGenerator("Random User Deck", RandomDeckType.User, lstDecks0, isAi0));
@@ -96,7 +96,7 @@ public class RandomDeckGenerator extends DeckProxy implements Comparable<RandomD
                 case QUEST_OPPONENT_DECK:
                     return Aggregates.random(DeckProxy.getAllQuestEventAndChallenges()).getDeck();
                 case COLOR_DECK:
-                    List<String> colors = new ArrayList<String>();
+                    List<String> colors = new ArrayList<>();
                     int count = Aggregates.randomInt(1, 3);
                     for (int i = 1; i <= count; i++) {
                         colors.add("Random " + i);
@@ -111,14 +111,14 @@ public class RandomDeckGenerator extends DeckProxy implements Comparable<RandomD
                 case VINTAGE_CARDGEN_DECK:
                         return DeckgenUtil.buildLDACArchetypeDeck(FModel.getFormats().get("Vintage"),isAi);
                 case STANDARD_COLOR_DECK:
-                    colors = new ArrayList<String>();
+                    colors = new ArrayList<>();
                     count = Aggregates.randomInt(1, 3);
                     for (int i = 1; i <= count; i++) {
                         colors.add("Random " + i);
                     }
                     return DeckgenUtil.buildColorDeck(colors, FModel.getFormats().getStandard().getFilterPrinted(), isAi);
                 case MODERN_COLOR_DECK:
-                    colors = new ArrayList<String>();
+                    colors = new ArrayList<>();
                     count = Aggregates.randomInt(1, 3);
                     for (int i = 1; i <= count; i++) {
                         colors.add("Random " + i);
diff --git a/forge-gui/src/main/java/forge/deck/io/DeckPreferences.java b/forge-gui/src/main/java/forge/deck/io/DeckPreferences.java
index 3e2f6205b2a..cb5c58ccab5 100644
--- a/forge-gui/src/main/java/forge/deck/io/DeckPreferences.java
+++ b/forge-gui/src/main/java/forge/deck/io/DeckPreferences.java
@@ -24,7 +24,7 @@ import org.w3c.dom.NodeList;
 public class DeckPreferences {
     private static String selectedDeckType = "", currentDeck = "", draftDeck = "", sealedDeck = "", commanderDeck = "",
             oathbreakerDeck = "", tinyLeadersDeck = "", brawlDeck = "", planarDeck = "", schemeDeck = "";
-    private static Map<String, DeckPreferences> allPrefs = new HashMap<String, DeckPreferences>();
+    private static Map<String, DeckPreferences> allPrefs = new HashMap<>();
 
     public static DeckType getSelectedDeckType() {
         return selectedDeckType.isEmpty() ? DeckType.CONSTRUCTED_DECK : DeckType.valueOf(selectedDeckType);
diff --git a/forge-gui/src/main/java/forge/deck/io/DeckRecords.java b/forge-gui/src/main/java/forge/deck/io/DeckRecords.java
index 385799853cc..3588662674b 100644
--- a/forge-gui/src/main/java/forge/deck/io/DeckRecords.java
+++ b/forge-gui/src/main/java/forge/deck/io/DeckRecords.java
@@ -14,7 +14,7 @@ import forge.game.player.RegisteredPlayer;
 
 @SuppressWarnings("unused")
 public class DeckRecords {
-    private static final Map<String, DeckRecords> recordLookup = new HashMap<String, DeckRecords>();
+    private static final Map<String, DeckRecords> recordLookup = new HashMap<>();
 
     public static void recordMatchOutcome(Match match) {
         for (RegisteredPlayer p1 : match.getPlayers()) {
@@ -25,7 +25,7 @@ public class DeckRecords {
         }
     }
 
-    private final List<DeckMatch> matches = new ArrayList<DeckMatch>();
+    private final List<DeckMatch> matches = new ArrayList<>();
 
     public void addMatch(Match match, LobbyPlayer player) {
         matches.add(new DeckMatch(match, player));
diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesHQ.java b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesHQ.java
index cd97aacc017..7783f2872de 100644
--- a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesHQ.java
+++ b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesHQ.java
@@ -38,7 +38,7 @@ public class GuiDownloadPicturesHQ extends GuiDownloadService {
     @Override
     protected final Map<String, String> getNeededFiles() {
         File f = new File(ForgeConstants.CACHE_CARD_PICS_DIR);
-        existingImages = new ArrayList<String>(Arrays.asList(f.list()));
+        existingImages = new ArrayList<>(Arrays.asList(f.list()));
         existingSets = retrieveManifestDirectory();
 
         for (final PaperCard c : FModel.getMagicDb().getCommonCards().getAllCards()) {
diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java
index 6bcbee8ce0a..8faf330004f 100644
--- a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java
+++ b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java
@@ -39,7 +39,7 @@ public class GuiDownloadPicturesLQ extends GuiDownloadService {
     @Override
     protected final Map<String, String> getNeededFiles() {
         File f = new File(ForgeConstants.CACHE_CARD_PICS_DIR);
-        existingImages = new ArrayList<String>(Arrays.asList(f.list()));
+        existingImages = new ArrayList<>(Arrays.asList(f.list()));
         existingSets = retrieveManifestDirectory();
 
         for (final PaperCard c : FModel.getMagicDb().getCommonCards().getAllCards()) {
diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadZipService.java b/forge-gui/src/main/java/forge/download/GuiDownloadZipService.java
index 8e13bdca4f3..f1d1dc9b8d4 100644
--- a/forge-gui/src/main/java/forge/download/GuiDownloadZipService.java
+++ b/forge-gui/src/main/java/forge/download/GuiDownloadZipService.java
@@ -48,7 +48,7 @@ public class GuiDownloadZipService extends GuiDownloadService {
 
     @Override
     protected final Map<String, String> getNeededFiles() {
-        final Map<String, String> files = new HashMap<String, String>();
+        final Map<String, String> files = new HashMap<>();
         files.put("_", "_");
         return files; //not needed by zip service, so just return map of size 1
     }
diff --git a/forge-gui/src/main/java/forge/gauntlet/GauntletData.java b/forge-gui/src/main/java/forge/gauntlet/GauntletData.java
index c471c546da2..e9b470cf10a 100644
--- a/forge-gui/src/main/java/forge/gauntlet/GauntletData.java
+++ b/forge-gui/src/main/java/forge/gauntlet/GauntletData.java
@@ -30,8 +30,8 @@ public final class GauntletData {
 
     private int completed;
     private String timestamp;
-    private List<String> eventRecords = new ArrayList<String>();
-    private List<String> eventNames = new ArrayList<String>();
+    private List<String> eventRecords = new ArrayList<>();
+    private List<String> eventNames = new ArrayList<>();
     private Deck userDeck;
     private List<Deck> decks;
 
@@ -101,7 +101,7 @@ public final class GauntletData {
     }
 
     public List<String> getDeckNames() {
-        final List<String> names = new ArrayList<String>();
+        final List<String> names = new ArrayList<>();
         for (final Deck d : decks) { names.add(d.getName()); }
         return names;
     }
diff --git a/forge-gui/src/main/java/forge/gauntlet/GauntletUtil.java b/forge-gui/src/main/java/forge/gauntlet/GauntletUtil.java
index 46d73a1552d..65b784084a5 100644
--- a/forge-gui/src/main/java/forge/gauntlet/GauntletUtil.java
+++ b/forge-gui/src/main/java/forge/gauntlet/GauntletUtil.java
@@ -18,8 +18,8 @@ public class GauntletUtil {
 
         // Generate gauntlet decks
         Deck deck;
-        final List<String> eventNames = new ArrayList<String>();
-        final List<Deck> decks = new ArrayList<Deck>();
+        final List<String> eventNames = new ArrayList<>();
+        final List<Deck> decks = new ArrayList<>();
 
         final Object[] netDeckNames = netDecks != null ? netDecks.getItemNames().toArray() : null;
 
@@ -86,7 +86,7 @@ public class GauntletUtil {
 
     public static void setDefaultGauntletName(GauntletData gauntlet, String prefix) {
         final File[] arrFiles = GauntletIO.getGauntletFilesUnlocked(prefix);
-        final Set<String> setNames = new HashSet<String>();
+        final Set<String> setNames = new HashSet<>();
         for (File f : arrFiles) {
             setNames.add(f.getName());
         }
diff --git a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java
index d9fd40b25c5..a7a96a4837b 100644
--- a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java
+++ b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java
@@ -139,7 +139,7 @@ public class AdvancedSearch {
             @Override
             protected Set<String> getItemValues(PaperCard input) {
                 final CardType type = input.getRules().getType();
-                final Set<String> types = new HashSet<String>();
+                final Set<String> types = new HashSet<>();
                 for (Supertype t : type.getSupertypes()) {
                     types.add(t.name());
                 }
@@ -736,7 +736,7 @@ public class AdvancedSearch {
                     }
                 };
             }
-            return new Filter<T>(option, operator, caption, predicate);
+            return new Filter<>(option, operator, caption, predicate);
         }
 
         protected abstract List<V> getValues(FilterOption option, FilterOperator operator);
@@ -754,7 +754,7 @@ public class AdvancedSearch {
 
         @Override
         protected List<Boolean> getValues(FilterOption option, FilterOperator operator) {
-            List<Boolean> values = new ArrayList<Boolean>();
+            List<Boolean> values = new ArrayList<>();
             values.add(operator == FilterOperator.IS_TRUE); //just always add a single boolean value so other logic works
             return values;
         }
@@ -785,7 +785,7 @@ public class AdvancedSearch {
             Integer lowerBound = SGuiChoose.getInteger(message, min, max);
             if (lowerBound == null) { return null; }
 
-            final List<Integer> values = new ArrayList<Integer>();
+            final List<Integer> values = new ArrayList<>();
             values.add(lowerBound);
 
             if (operator.valueCount == FilterValueCount.TWO) { //prompt for upper bound if needed
@@ -825,7 +825,7 @@ public class AdvancedSearch {
 
             initialInput = value; //store value as initial input for next time
 
-            List<String> values = new ArrayList<String>();
+            List<String> values = new ArrayList<>();
             values.add(value);
             return values;
         }
@@ -934,10 +934,10 @@ public class AdvancedSearch {
                 if (amount == null) { return null; }
             }
 
-            Map<String, Integer> map = new HashMap<String, Integer>();
+            Map<String, Integer> map = new HashMap<>();
             map.put(card.getName(), amount);
 
-            List<Map<String, Integer>> values = new ArrayList<Map<String, Integer>>();
+            List<Map<String, Integer>> values = new ArrayList<>();
             values.add(map);
             return values;
         }
@@ -958,7 +958,7 @@ public class AdvancedSearch {
         final FilterOption defaultOption = editFilter == null ? null : editFilter.option;
         if (defaultOption == null || reselectOption) {
             //build list of filter options based on ItemManager type
-            List<FilterOption> options = new ArrayList<FilterOption>();
+            List<FilterOption> options = new ArrayList<>();
             if (editFilter != null) {
                 options.add(FilterOption.NONE); //provide option to clear existing filter
             }
@@ -1051,8 +1051,8 @@ public class AdvancedSearch {
     public static class Model<T extends InventoryItem> {
         private static final String EMPTY_FILTER_TEXT = "Select Filter...";
 
-        private final List<Object> expression = new ArrayList<Object>();
-        private final List<IFilterControl<T>> controls = new ArrayList<IFilterControl<T>>();
+        private final List<Object> expression = new ArrayList<>();
+        private final List<IFilterControl<T>> controls = new ArrayList<>();
         private IButton label;
 
         public Model() {
diff --git a/forge-gui/src/main/java/forge/itemmanager/GroupDef.java b/forge-gui/src/main/java/forge/itemmanager/GroupDef.java
index f39870fb687..2fc2578911e 100644
--- a/forge-gui/src/main/java/forge/itemmanager/GroupDef.java
+++ b/forge-gui/src/main/java/forge/itemmanager/GroupDef.java
@@ -282,7 +282,7 @@ public enum GroupDef {
     private static Map<String, Integer> setGroupMap;
 
     private static String[] getSetGroups() {
-        setGroupMap = new HashMap<String, Integer>(); //cache mappings to make lookup quicker later
+        setGroupMap = new HashMap<>(); //cache mappings to make lookup quicker later
 
         //build sorted list of sets
         List<CardEdition> sortedSets = Lists.newArrayList(FModel.getMagicDb().getEditions());
diff --git a/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java b/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java
index b08cb5247f2..0404e78939d 100644
--- a/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java
+++ b/forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java
@@ -121,13 +121,13 @@ public enum ItemManagerConfig {
         }
         showUniqueCardsOption = showUniqueCardsOption0;
 
-        uniqueCardsOnly = new Prop<Boolean>(uniqueCardsOnly0);
-        hideFilters = new Prop<Boolean>(hideFilters0);
-        compactListView = new Prop<Boolean>(FModel.getPreferences().getPrefBoolean(FPref.UI_COMPACT_LIST_ITEMS)); //use main setting to determine default
-        groupBy = new Prop<GroupDef>(groupBy0);
-        pileBy = new Prop<ColumnDef>(pileBy0);
-        imageColumnCount = new Prop<Integer>(imageColumnCount0);
-        viewIndex = new Prop<Integer>(viewIndex0);
+        uniqueCardsOnly = new Prop<>(uniqueCardsOnly0);
+        hideFilters = new Prop<>(hideFilters0);
+        compactListView = new Prop<>(FModel.getPreferences().getPrefBoolean(FPref.UI_COMPACT_LIST_ITEMS)); //use main setting to determine default
+        groupBy = new Prop<>(groupBy0);
+        pileBy = new Prop<>(pileBy0);
+        imageColumnCount = new Prop<>(imageColumnCount0);
+        viewIndex = new Prop<>(viewIndex0);
     }
 
     private class Prop<T> {
diff --git a/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java b/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java
index 31c8dc92d7a..cb634c6f120 100644
--- a/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java
+++ b/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java
@@ -20,7 +20,6 @@ package forge.itemmanager;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
 
 import forge.item.InventoryItem;
@@ -37,7 +36,7 @@ public final class ItemManagerModel<T extends InventoryItem> {
     private final CascadeManager cascadeManager = new CascadeManager();
 
     public ItemManagerModel(final Class<T> genericType0) {
-        data = new ItemPool<T>(genericType0);
+        data = new ItemPool<>(genericType0);
     }
 
     public void clear() {
@@ -46,7 +45,7 @@ public final class ItemManagerModel<T extends InventoryItem> {
 
     // same thing as above, it was copied to provide sorting (needed by table
     // views in deck editors)
-    private final transient List<Entry<T, Integer>> itemsOrdered = new ArrayList<Map.Entry<T, Integer>>();
+    private final transient List<Entry<T, Integer>> itemsOrdered = new ArrayList<>();
 
     protected transient boolean isListInSync = false;
 
@@ -130,7 +129,7 @@ public final class ItemManagerModel<T extends InventoryItem> {
 
     //Manages sorting orders for multiple depths of sorting
     public final class CascadeManager {
-        private final List<ItemColumn> colsToSort = new ArrayList<ItemColumn>(3);
+        private final List<ItemColumn> colsToSort = new ArrayList<>(3);
         private Sorter sorter = null;
 
         // Adds a column to sort cascade list.
@@ -184,10 +183,10 @@ public final class ItemManagerModel<T extends InventoryItem> {
         }
 
         private Sorter createSorter() {
-            final List<ItemPoolSorter<InventoryItem>> oneColSorters = new ArrayList<ItemPoolSorter<InventoryItem>>(maxSortDepth);
+            final List<ItemPoolSorter<InventoryItem>> oneColSorters = new ArrayList<>(maxSortDepth);
 
             for (final ItemColumn col : colsToSort) {
-                oneColSorters.add(new ItemPoolSorter<InventoryItem>(
+                oneColSorters.add(new ItemPoolSorter<>(
                         col.getFnSort(),
                         col.getConfig().getSortState().equals(SortState.ASC)));
             }
diff --git a/forge-gui/src/main/java/forge/itemmanager/SColumnUtil.java b/forge-gui/src/main/java/forge/itemmanager/SColumnUtil.java
index f77db9dfcec..b3c73ac443a 100644
--- a/forge-gui/src/main/java/forge/itemmanager/SColumnUtil.java
+++ b/forge-gui/src/main/java/forge/itemmanager/SColumnUtil.java
@@ -34,7 +34,7 @@ import forge.itemmanager.ItemColumnConfig.SortState;
 public final class SColumnUtil {
     public static Map<ColumnDef, ItemColumnConfig> getColumns(Iterable<ColumnDef> colDefs) {
         int i = 0;
-        final Map<ColumnDef, ItemColumnConfig> columns = new HashMap<ColumnDef, ItemColumnConfig>();
+        final Map<ColumnDef, ItemColumnConfig> columns = new HashMap<>();
         for (ColumnDef colDef : colDefs) {
             ItemColumnConfig column = new ItemColumnConfig(colDef);
             column.setIndex(i++);
@@ -44,7 +44,7 @@ public final class SColumnUtil {
     }
 
     public static Map<ColumnDef, ItemColumnConfig> getStringColumn() {
-        Map<ColumnDef, ItemColumnConfig> columns = new HashMap<ColumnDef, ItemColumnConfig>();
+        Map<ColumnDef, ItemColumnConfig> columns = new HashMap<>();
         ItemColumnConfig column = new ItemColumnConfig(ColumnDef.STRING);
         column.setSortPriority(1);
         columns.put(ColumnDef.STRING, column);
@@ -56,7 +56,7 @@ public final class SColumnUtil {
     }
     private static Map<ColumnDef, ItemColumnConfig> getCardColumns(ColumnDef quantityColDef, boolean includeFavorite,
             boolean includeOwned, boolean includePrice, boolean includeNew, boolean includeDecks) {
-        List<ColumnDef> colDefs = new ArrayList<ColumnDef>();
+        List<ColumnDef> colDefs = new ArrayList<>();
         if (includeFavorite) {
             colDefs.add(ColumnDef.FAVORITE);
         }
@@ -128,7 +128,7 @@ public final class SColumnUtil {
     }
 
     public static Map<ColumnDef, ItemColumnConfig> getSpecialCardPoolDefaultColumns() {
-        List<ColumnDef> colDefs = new ArrayList<ColumnDef>();
+        List<ColumnDef> colDefs = new ArrayList<>();
         colDefs.add(ColumnDef.FAVORITE);
         colDefs.add(ColumnDef.NAME);
         colDefs.add(ColumnDef.TYPE);
@@ -195,7 +195,7 @@ public final class SColumnUtil {
     }
 
     public static Map<ColumnDef, ItemColumnConfig> getConquestCommandersDefaultColumns() {
-        List<ColumnDef> colDefs = new ArrayList<ColumnDef>();
+        List<ColumnDef> colDefs = new ArrayList<>();
         colDefs.add(ColumnDef.NAME);
         colDefs.add(ColumnDef.COLOR);
 
@@ -206,7 +206,7 @@ public final class SColumnUtil {
     }
 
     public static Map<ColumnDef, ItemColumnConfig> getDecksDefaultColumns(boolean allowEdit, boolean includeFolder) {
-        List<ColumnDef> colDefs = new ArrayList<ColumnDef>();
+        List<ColumnDef> colDefs = new ArrayList<>();
         colDefs.add(ColumnDef.DECK_FAVORITE);
         if (allowEdit) {
             colDefs.add(ColumnDef.DECK_ACTIONS);
diff --git a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
index 2f6a7291536..241cb827008 100644
--- a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
+++ b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
@@ -71,7 +71,7 @@ public class SFilterUtil {
     private static List<String> getSplitText(String text) {
         boolean inQuotes = false;
         String entry = "";
-        List<String> splitText = new ArrayList<String>();
+        List<String> splitText = new ArrayList<>();
         for (int i = 0; i < text.length(); i++) {
             char ch = text.charAt(i);
             switch (ch) {
diff --git a/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java b/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java
index 1fb55a4f7b7..f08c8960ded 100644
--- a/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java
+++ b/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java
@@ -91,7 +91,7 @@ public final class SItemManagerUtil {
     }
 
     public static String getItemDisplayString(final InventoryItem item, final int qty, final boolean forTitle) {
-        final List<InventoryItem> items = new ArrayList<InventoryItem>();
+        final List<InventoryItem> items = new ArrayList<>();
         items.add(item);
         return getItemDisplayString(items, qty, forTitle);
     }
@@ -142,7 +142,7 @@ public final class SItemManagerUtil {
     }
 
     public static String buildDisplayList(final Iterable<Entry<InventoryItem, Integer>> items) {
-        final List<Entry<InventoryItem, Integer>> sorted = new ArrayList<Entry<InventoryItem, Integer>>();
+        final List<Entry<InventoryItem, Integer>> sorted = new ArrayList<>();
         for (final Entry<InventoryItem, Integer> itemEntry : items) {
             sorted.add(itemEntry);
         }
diff --git a/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java b/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java
index 3ac539038de..86f83429d97 100644
--- a/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java
+++ b/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java
@@ -40,8 +40,8 @@ public class BoosterDraftAI {
     protected static final int N_DECKS = 7;
 
     // holds all the cards for each of the computer's decks
-    protected final List<List<PaperCard>> decks = new ArrayList<List<PaperCard>>();
-    protected final List<DeckColors> playerColors = new ArrayList<DeckColors>();
+    protected final List<List<PaperCard>> decks = new ArrayList<>();
+    protected final List<DeckColors> playerColors = new ArrayList<>();
 
     /**
      * <p>
@@ -95,7 +95,7 @@ public class BoosterDraftAI {
     public BoosterDraftAI() {
         // Initialize deck array and playerColors list
         for (int i = 0; i < N_DECKS; i++) {
-            this.decks.add(new ArrayList<PaperCard>());
+            this.decks.add(new ArrayList<>());
             this.playerColors.add(new DeckColors());
         }
     } // BoosterDraftAI()
diff --git a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
index 1188f0e943b..a1521f88113 100644
--- a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
+++ b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
@@ -948,7 +948,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
 
 
 
-        final Map<Integer, Integer> creatureCosts = new HashMap<Integer, Integer>();
+        final Map<Integer, Integer> creatureCosts = new HashMap<>();
         for (int i = 1; i < 7; i++) {
             creatureCosts.put(i, 0);
         }
diff --git a/forge-gui/src/main/java/forge/limited/CustomLimited.java b/forge-gui/src/main/java/forge/limited/CustomLimited.java
index dda54f28604..b87b0b8bfbc 100644
--- a/forge-gui/src/main/java/forge/limited/CustomLimited.java
+++ b/forge-gui/src/main/java/forge/limited/CustomLimited.java
@@ -98,7 +98,7 @@ public class CustomLimited extends DeckBase {
     public static CustomLimited parse(final List<String> dfData, final IStorage<Deck> cubes) {
         final FileSection data = FileSection.parse(dfData, ":");
 
-        List<Pair<String, Integer>> slots = new ArrayList<Pair<String, Integer>>();
+        List<Pair<String, Integer>> slots = new ArrayList<>();
         String boosterData = data.get("Booster");
         if (StringUtils.isNotEmpty(boosterData)) {
             final String[] booster = TextUtil.splitWithParenthesis(boosterData, ',');
diff --git a/forge-gui/src/main/java/forge/limited/GauntletMini.java b/forge-gui/src/main/java/forge/limited/GauntletMini.java
index d58b865a479..2a953e318bc 100644
--- a/forge-gui/src/main/java/forge/limited/GauntletMini.java
+++ b/forge-gui/src/main/java/forge/limited/GauntletMini.java
@@ -47,7 +47,7 @@ public class GauntletMini {
     private int losses;
     private boolean gauntletDraft; // Means: Draft game is in Gauntlet-mode, not a single match
     private GameType gauntletType;
-    private final List<RegisteredPlayer> aiOpponents = new ArrayList<RegisteredPlayer>();
+    private final List<RegisteredPlayer> aiOpponents = new ArrayList<>();
 
     public GauntletMini() {
         currentRound = 1;
@@ -135,7 +135,7 @@ public class GauntletMini {
      * Starts the tournament.
      */
     private void startRound() {
-        final List<RegisteredPlayer> starter = new ArrayList<RegisteredPlayer>();
+        final List<RegisteredPlayer> starter = new ArrayList<>();
         final RegisteredPlayer human = new RegisteredPlayer(humanDeck).setPlayer(GamePlayerUtil.getGuiPlayer());
         starter.add(human);
         starter.add(aiOpponents.get(currentRound - 1).setPlayer(GamePlayerUtil.createAiPlayer()));
diff --git a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java
index 28c653301de..7f89655fb03 100644
--- a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java
+++ b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java
@@ -56,8 +56,8 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
     protected Predicate<CardRules> hasColor;
     protected final List<PaperCard> availableList;
     protected final List<PaperCard> aiPlayables;
-    protected final List<PaperCard> deckList = new ArrayList<PaperCard>();
-    protected final List<String> setsWithBasicLands = new ArrayList<String>();
+    protected final List<PaperCard> deckList = new ArrayList<>();
+    protected final List<String> setsWithBasicLands = new ArrayList<>();
     protected List<PaperCard> rankedColorList;
     protected final List<PaperCard> draftedConspiracies;
 
@@ -324,7 +324,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
      * Find the sets that have basic lands for the available cards.
      */
     private void findBasicLandSets() {
-        final Set<String> sets = new HashSet<String>();
+        final Set<String> sets = new HashSet<>();
         for (final PaperCard cp : aiPlayables) {
             final CardEdition ee = FModel.getMagicDb().getEditions().get(cp.getEdition());
             if( !sets.contains(cp.getEdition()) && CardEdition.Predicates.hasBasicLands.apply(ee)) {
@@ -348,7 +348,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
     private void addLands(final int[] clrCnts, final String landSetCode) {
         // basic lands that are available in the deck
         final Iterable<PaperCard> basicLands = Iterables.filter(aiPlayables, Predicates.compose(CardRulesPredicates.Presets.IS_BASIC_LAND, PaperCard.FN_GET_RULES));
-        final Set<PaperCard> snowLands = new HashSet<PaperCard>();
+        final Set<PaperCard> snowLands = new HashSet<>();
 
         // total of all ClrCnts
         int totalColor = 0;
@@ -598,7 +598,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
             final PaperCard card = it.next();
             final CardAiHints ai = card.getRules().getAiHints();
             if (ai.getRemRandomDecks()) {
-                final List<PaperCard> comboCards = new ArrayList<PaperCard>();
+                final List<PaperCard> comboCards = new ArrayList<>();
                 if (ai.getDeckNeeds() != null && ai.getDeckNeeds().isValid()) {
                     final DeckHints needs = ai.getDeckNeeds();
                     comboCards.addAll(needs.filter(deckList));
@@ -676,7 +676,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
      *            number to add
      */
     private void addManaCurveCreatures(final Iterable<PaperCard> creatures, int num) {
-        final Map<Integer, Integer> creatureCosts = new HashMap<Integer, Integer>();
+        final Map<Integer, Integer> creatureCosts = new HashMap<>();
         for (int i = 1; i < 7; i++) {
             creatureCosts.put(i, 0);
         }
diff --git a/forge-gui/src/main/java/forge/limited/ReadDraftRankings.java b/forge-gui/src/main/java/forge/limited/ReadDraftRankings.java
index d8556fb2aaa..81b117adb39 100644
--- a/forge-gui/src/main/java/forge/limited/ReadDraftRankings.java
+++ b/forge-gui/src/main/java/forge/limited/ReadDraftRankings.java
@@ -25,12 +25,12 @@ public class ReadDraftRankings {
      * </p>
      */
     public ReadDraftRankings() {
-        this.setSizes = new HashMap<String, Integer>();
+        this.setSizes = new HashMap<>();
         this.draftRankings = this.readFile(FileUtil.readFile(ForgeConstants.DRAFT_RANKINGS_FILE));
     } // setup()
 
     public ReadDraftRankings(String customFile) {
-        this.setSizes = new HashMap<String, Integer>();
+        this.setSizes = new HashMap<>();
         this.draftRankings = this.readFile(FileUtil.readFile(ForgeConstants.DRAFT_DIR + customFile));
     }
 
@@ -45,7 +45,7 @@ public class ReadDraftRankings {
      */
     private Map<String, Map<String, Integer>> readFile(List<String> lines) {
 
-        final Map<String, Map<String, Integer>> map = new HashMap<String, Map<String, Integer>>();
+        final Map<String, Map<String, Integer>> map = new HashMap<>();
         for (String line : lines) {
             // stop reading if end of file or blank line is read
             if (line == null || line.length() == 0) {
@@ -64,7 +64,7 @@ public class ReadDraftRankings {
             try {
                 final int rank = Integer.parseInt(rankStr);
                 if (!map.containsKey(edition)) {
-                    map.put(edition, new HashMap<String, Integer>());
+                    map.put(edition, new HashMap<>());
                 }
                 map.get(edition).put(name, rank);
                 if (setSizes.containsKey(edition)) {
diff --git a/forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java b/forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java
index d975ea30ce3..89323950028 100644
--- a/forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java
+++ b/forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java
@@ -60,7 +60,7 @@ import java.util.Stack;
 public class SealedCardPoolGenerator {
     public static final String FILE_EXT = ".sealed";
 
-    private final List<IUnOpenedProduct> product = new ArrayList<IUnOpenedProduct>();
+    private final List<IUnOpenedProduct> product = new ArrayList<>();
 
     /** The Land set code. */
     private String landSetCode = null;
@@ -168,7 +168,7 @@ public class SealedCardPoolGenerator {
 
             case Block:
             case FantasyBlock:
-                List<CardBlock> blocks = new ArrayList<CardBlock>();
+                List<CardBlock> blocks = new ArrayList<>();
                 Iterable<CardBlock> src = poolType == LimitedPoolType.Block ? FModel.getBlocks() : FModel.getFantasyBlocks();
                 for (CardBlock b : src) {
                     blocks.add(b);
@@ -178,7 +178,7 @@ public class SealedCardPoolGenerator {
                 if (block == null) { return; }
 
                 final int nPacks = block.getCntBoostersSealed();
-                final Stack<String> sets = new Stack<String>();
+                final Stack<String> sets = new Stack<>();
 
                 for (CardEdition edition : block.getSets()) {
                     sets.add(edition.getCode());
@@ -218,7 +218,7 @@ public class SealedCardPoolGenerator {
 
             case Custom:
                 String[] dList;
-                final List<CustomLimited> customs = new ArrayList<CustomLimited>();
+                final List<CustomLimited> customs = new ArrayList<>();
 
                 // get list of custom draft files
                 final File dFolder = new File(ForgeConstants.SEALED_DIR);
@@ -283,7 +283,7 @@ public class SealedCardPoolGenerator {
     private static List<String> getSetCombos(final List<String> setz, final int nPacks) {
         // TODO These permutations really should be completely generated
         String[] sets = setz.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
-        List<String> setCombos = new ArrayList<String>();
+        List<String> setCombos = new ArrayList<>();
 
         if (nPacks == 3) {
             if (sets.length >= 2) {
diff --git a/forge-gui/src/main/java/forge/limited/SealedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/SealedDeckBuilder.java
index 4a87f4ed6ab..6cde57b09b4 100644
--- a/forge-gui/src/main/java/forge/limited/SealedDeckBuilder.java
+++ b/forge-gui/src/main/java/forge/limited/SealedDeckBuilder.java
@@ -30,7 +30,7 @@ public class SealedDeckBuilder extends LimitedDeckBuilder {
      */
     private ColorSet chooseColors() {
         // choose colors based on top 33% of cards
-        final List<PaperCard> colorChooserList = new ArrayList<PaperCard>();
+        final List<PaperCard> colorChooserList = new ArrayList<>();
         // this is not exactly right, because the rankings here are taking into account deckhints
         // for the whole set of cards, when some of those cards could be in colors that won't
         // make it into the deck
@@ -54,8 +54,8 @@ public class SealedDeckBuilder extends LimitedDeckBuilder {
         int[] countsCopy = Arrays.copyOf(colorCounts, 5);
         Arrays.sort(countsCopy);
 
-        List<String> maxColors = new ArrayList<String>();
-        List<String> secondColors = new ArrayList<String>();
+        List<String> maxColors = new ArrayList<>();
+        List<String> secondColors = new ArrayList<>();
         for (int i = 0; i < 5; i++) {
             if (countsCopy[4] == colorCounts[i]) {
                 maxColors.add(MagicColor.Constant.ONLY_COLORS.get(i));
diff --git a/forge-gui/src/main/java/forge/limited/WinstonDraft.java b/forge-gui/src/main/java/forge/limited/WinstonDraft.java
index bb12c63d5b1..ff75cc5a827 100644
--- a/forge-gui/src/main/java/forge/limited/WinstonDraft.java
+++ b/forge-gui/src/main/java/forge/limited/WinstonDraft.java
@@ -38,7 +38,7 @@ public class WinstonDraft extends BoosterDraft {
     }
 
     private void initializeWinstonDraft() {
-        this.deck = new Stack<PaperCard>();
+        this.deck = new Stack<>();
         for (int i = 0; i < this.product.size(); i++) {
             final Supplier<List<PaperCard>> supply = this.product.get(i);
             for(int j = 0; j < NUM_PLAYERS; j++) {
@@ -53,7 +53,7 @@ public class WinstonDraft extends BoosterDraft {
         // Create three Winston piles, adding the top card from the Winston deck to start each pile
         this.piles = new ArrayList<>();
         for(int i = 0; i < NUM_PILES; i++) {
-            final List<PaperCard> pile = new ArrayList<PaperCard>();
+            final List<PaperCard> pile = new ArrayList<>();
             pile.add(this.deck.pop());
             this.piles.add(pile);
         }
diff --git a/forge-gui/src/main/java/forge/limited/WinstonDraftAI.java b/forge-gui/src/main/java/forge/limited/WinstonDraftAI.java
index 92cc5ebe276..edc6b7b2a87 100644
--- a/forge-gui/src/main/java/forge/limited/WinstonDraftAI.java
+++ b/forge-gui/src/main/java/forge/limited/WinstonDraftAI.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import forge.deck.CardPool;
-import forge.item.PaperCard;
 import forge.util.MyRandom;
 
 public class WinstonDraftAI extends BoosterDraftAI{
@@ -25,7 +24,7 @@ public class WinstonDraftAI extends BoosterDraftAI{
         this.decks.clear();
         this.playerColors.clear();
         for (int i = 0; i < N_DECKS; i++) {
-            this.decks.add(new ArrayList<PaperCard>());
+            this.decks.add(new ArrayList<>());
             this.playerColors.add(new DeckColors());
         }
     }
diff --git a/forge-gui/src/main/java/forge/match/GameLobby.java b/forge-gui/src/main/java/forge/match/GameLobby.java
index 797ecec2a73..6f9bfd78659 100644
--- a/forge-gui/src/main/java/forge/match/GameLobby.java
+++ b/forge-gui/src/main/java/forge/match/GameLobby.java
@@ -407,7 +407,7 @@ public abstract class GameLobby implements IHasGameType {
             }
         }
 
-        final List<RegisteredPlayer> players = new ArrayList<RegisteredPlayer>();
+        final List<RegisteredPlayer> players = new ArrayList<>();
         final Map<RegisteredPlayer, IGuiGame> guis = Maps.newHashMap();
         final Map<RegisteredPlayer, LobbySlot> playerToSlot = Maps.newHashMap();
         boolean hasNameBeenSet = false;
diff --git a/forge-gui/src/main/java/forge/match/HostedMatch.java b/forge-gui/src/main/java/forge/match/HostedMatch.java
index bfcb5ad06c7..47b8c57d93c 100644
--- a/forge-gui/src/main/java/forge/match/HostedMatch.java
+++ b/forge-gui/src/main/java/forge/match/HostedMatch.java
@@ -160,7 +160,7 @@ public class HostedMatch {
         final GameView gameView = getGameView();
 
         humanCount = 0;
-        final MapOfLists<IGuiGame, PlayerView> playersPerGui = new HashMapOfLists<IGuiGame, PlayerView>(CollectionSuppliers.arrayLists());
+        final MapOfLists<IGuiGame, PlayerView> playersPerGui = new HashMapOfLists<>(CollectionSuppliers.arrayLists());
         for (int iPlayer = 0; iPlayer < players.size(); iPlayer++) {
             final RegisteredPlayer rp = match.getPlayers().get(iPlayer);
             final Player p = players.get(iPlayer);
@@ -197,7 +197,7 @@ public class HostedMatch {
         }
 
         for (final Entry<IGuiGame, Collection<PlayerView>> e : playersPerGui.entrySet()) {
-            e.getKey().openView(new TrackableCollection<PlayerView>(e.getValue()));
+            e.getKey().openView(new TrackableCollection<>(e.getValue()));
         }
 
         if (humanCount == 0) { //watch game but do not participate
diff --git a/forge-gui/src/main/java/forge/match/input/InputPassPriority.java b/forge-gui/src/main/java/forge/match/input/InputPassPriority.java
index d793efba100..adff270db60 100644
--- a/forge-gui/src/main/java/forge/match/input/InputPassPriority.java
+++ b/forge-gui/src/main/java/forge/match/input/InputPassPriority.java
@@ -134,7 +134,7 @@ public class InputPassPriority extends InputSyncronizedBase {
 
         final SpellAbility ability = getController().getAbilityToPlay(card, abilities, triggerEvent);
         if (ability != null) {
-            chosenSa = new ArrayList<SpellAbility>();
+            chosenSa = new ArrayList<>();
             chosenSa.add(ability);
             if (otherCardsToSelect != null && ability.isManaAbility()) {
                 //if mana ability activated, activate same ability on other cards to select if possible
@@ -172,7 +172,7 @@ public class InputPassPriority extends InputSyncronizedBase {
     @Override
     public boolean selectAbility(final SpellAbility ab) {
     	if (ab != null) {
-    	    chosenSa = new ArrayList<SpellAbility>();
+    	    chosenSa = new ArrayList<>();
             chosenSa.add(ab);
             stop();
             return true;
diff --git a/forge-gui/src/main/java/forge/match/input/InputPayMana.java b/forge-gui/src/main/java/forge/match/input/InputPayMana.java
index 516fa477976..76573d288b3 100644
--- a/forge-gui/src/main/java/forge/match/input/InputPayMana.java
+++ b/forge-gui/src/main/java/forge/match/input/InputPayMana.java
@@ -43,7 +43,7 @@ public abstract class InputPayMana extends InputSyncronizedBase {
     protected ManaCostBeingPaid manaCost;
     protected final SpellAbility saPaidFor;
     private final boolean wasFloatingMana;
-    private final Queue<Card> delaySelectCards = new LinkedList<Card>();
+    private final Queue<Card> delaySelectCards = new LinkedList<>();
 
     private boolean bPaid = false;
     protected Boolean canPayManaCost = null;
@@ -141,7 +141,7 @@ public abstract class InputPayMana extends InputSyncronizedBase {
     }
 
     public List<SpellAbility> getUsefulManaAbilities(Card card) {
-        List<SpellAbility> abilities = new ArrayList<SpellAbility>();
+        List<SpellAbility> abilities = new ArrayList<>();
 
         if (card.getController() != player) {
             return abilities;
@@ -362,7 +362,7 @@ public abstract class InputPayMana extends InputSyncronizedBase {
         final Card source = am.getHostCard();
         final Player activator = am.getActivatingPlayer();
         final Game g = source.getGame();
-        final HashMap<String, Object> repParams = new HashMap<String, Object>();
+        final HashMap<String, Object> repParams = new HashMap<>();
         repParams.put("Event", "ProduceMana");
         repParams.put("Mana", m.getOrigProduced());
         repParams.put("Affected", source);
diff --git a/forge-gui/src/main/java/forge/match/input/InputProxy.java b/forge-gui/src/main/java/forge/match/input/InputProxy.java
index 15c9774310a..b503dc8ae74 100644
--- a/forge-gui/src/main/java/forge/match/input/InputProxy.java
+++ b/forge-gui/src/main/java/forge/match/input/InputProxy.java
@@ -43,7 +43,7 @@ import forge.util.ITriggerEvent;
 public class InputProxy implements Observer {
 
     /** The input. */
-    private AtomicReference<Input> input = new AtomicReference<Input>();
+    private AtomicReference<Input> input = new AtomicReference<>();
     private final PlayerControllerHuman controller;
 
 //    private static final boolean DEBUG_INPUT = true; // false;
@@ -136,7 +136,7 @@ public class InputProxy implements Observer {
                         final Card c = getCard(cv);
                         if (c != null) {
                             if (otherCardsToSelect == null) {
-                                otherCardsToSelect = new ArrayList<Card>();
+                                otherCardsToSelect = new ArrayList<>();
                             }
                             otherCardsToSelect.add(c);
                         }
diff --git a/forge-gui/src/main/java/forge/match/input/InputQueue.java b/forge-gui/src/main/java/forge/match/input/InputQueue.java
index ad64c4126a7..2b745dcd1b1 100644
--- a/forge-gui/src/main/java/forge/match/input/InputQueue.java
+++ b/forge-gui/src/main/java/forge/match/input/InputQueue.java
@@ -33,7 +33,7 @@ import forge.player.PlayerControllerHuman;
  * @version $Id: InputQueue.java 24769 2014-02-09 13:56:04Z Hellfish $
  */
 public class InputQueue extends Observable {
-    private final BlockingDeque<InputSynchronized> inputStack = new LinkedBlockingDeque<InputSynchronized>();
+    private final BlockingDeque<InputSynchronized> inputStack = new LinkedBlockingDeque<>();
     private final Game game;
 
     public InputQueue(final Game game, final InputProxy inputProxy) {
diff --git a/forge-gui/src/main/java/forge/match/input/InputSelectCardsForConvokeOrImprovise.java b/forge-gui/src/main/java/forge/match/input/InputSelectCardsForConvokeOrImprovise.java
index cfbc2826b67..bfe0d22beb8 100644
--- a/forge-gui/src/main/java/forge/match/input/InputSelectCardsForConvokeOrImprovise.java
+++ b/forge-gui/src/main/java/forge/match/input/InputSelectCardsForConvokeOrImprovise.java
@@ -26,7 +26,7 @@ import forge.util.ITriggerEvent;
 
 public final class InputSelectCardsForConvokeOrImprovise extends InputSelectManyBase<Card> {
     private static final long serialVersionUID = -1779224307654698954L;
-    private final Map<Card, ImmutablePair<Byte, ManaCostShard>> chosenCards = new HashMap<Card, ImmutablePair<Byte, ManaCostShard>>();
+    private final Map<Card, ImmutablePair<Byte, ManaCostShard>> chosenCards = new HashMap<>();
     private final ManaCostBeingPaid remainingCost;
     private final Player player;
     private final CardCollectionView availableCards;
@@ -115,7 +115,7 @@ public final class InputSelectCardsForConvokeOrImprovise extends InputSelectMany
     }
 
     public Map<Card, ManaCostShard> getConvokeMap() {
-        final Map<Card, ManaCostShard> result = new HashMap<Card, ManaCostShard>();
+        final Map<Card, ManaCostShard> result = new HashMap<>();
         if(!hasCancelled()) {
             for(final Entry<Card, ImmutablePair<Byte, ManaCostShard>> c : chosenCards.entrySet()) {
                 result.put(c.getKey(), c.getValue().right);
diff --git a/forge-gui/src/main/java/forge/match/input/InputSelectEntitiesFromList.java b/forge-gui/src/main/java/forge/match/input/InputSelectEntitiesFromList.java
index 374573b19f3..fc8b962b19c 100644
--- a/forge-gui/src/main/java/forge/match/input/InputSelectEntitiesFromList.java
+++ b/forge-gui/src/main/java/forge/match/input/InputSelectEntitiesFromList.java
@@ -23,7 +23,7 @@ public class InputSelectEntitiesFromList<T extends GameEntity> extends InputSele
     private static final long serialVersionUID = -6609493252672573139L;
 
     private final FCollectionView<T> validChoices;
-    protected final FCollection<T> selected = new FCollection<T>();
+    protected final FCollection<T> selected = new FCollection<>();
     protected Iterable<PlayerZoneUpdate> zonesShown; // want to hide these zones when input done
 
     public InputSelectEntitiesFromList(final PlayerControllerHuman controller, final int min, final int max, final FCollectionView<T> validChoices0) {
@@ -36,7 +36,7 @@ public class InputSelectEntitiesFromList<T extends GameEntity> extends InputSele
         if (min > validChoices.size()) {  // pfps does this really do anything useful??
             System.out.println(String.format("Trying to choose at least %d things from a list with only %d things!", min, validChoices.size()));
         }
-	ArrayList<CardView> vCards = new ArrayList<CardView>();
+	ArrayList<CardView> vCards = new ArrayList<>();
 	for ( T c : validChoices0 ) {
 	    if ( c instanceof Card ) {
 		vCards.add(((Card)c).getView()) ;
diff --git a/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java b/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java
index 46cdd2f2f75..d67b78b4698 100644
--- a/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java
+++ b/forge-gui/src/main/java/forge/match/input/InputSelectTargets.java
@@ -29,7 +29,7 @@ import forge.FThreads;
 public final class InputSelectTargets extends InputSyncronizedBase {
     private final List<Card> choices;
     // some cards can be targeted several times (eg: distribute damage as you choose)
-    private final Map<GameEntity, Integer> targetDepth = new HashMap<GameEntity, Integer>();
+    private final Map<GameEntity, Integer> targetDepth = new HashMap<>();
     private final TargetRestrictions tgt;
     private final SpellAbility sa;
     private Card lastTarget = null;
@@ -172,7 +172,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
 
         // If all cards must have different controllers
         if (tgt.isDifferentControllers()) {
-            final List<Player> targetedControllers = new ArrayList<Player>();
+            final List<Player> targetedControllers = new ArrayList<>();
             for (final GameObject o : targetDepth.keySet()) {
                 if (o instanceof Card) {
                     final Player p = ((Card) o).getController();
diff --git a/forge-gui/src/main/java/forge/model/CardBlock.java b/forge-gui/src/main/java/forge/model/CardBlock.java
index a3893102354..ec4f45cff3d 100644
--- a/forge-gui/src/main/java/forge/model/CardBlock.java
+++ b/forge-gui/src/main/java/forge/model/CardBlock.java
@@ -44,7 +44,7 @@ public final class CardBlock implements Comparable<CardBlock> {
     private final int orderNum;
     private final String name;
     private final List<CardEdition> sets;
-    private final Map<String, MetaSet> metaSets = new TreeMap<String, MetaSet>();
+    private final Map<String, MetaSet> metaSets = new TreeMap<>();
     private final CardEdition landSet;
     private final int cntBoostersDraft;
     private final int cntBoostersSealed;
@@ -139,7 +139,7 @@ public final class CardBlock implements Comparable<CardBlock> {
     }
 
     private Predicate<PaperCard> buildFilter() {
-        final List<String> setCodes = new ArrayList<String>();
+        final List<String> setCodes = new ArrayList<>();
         for (final CardEdition set : this.sets) {
             setCodes.add(set.getCode());
         }
@@ -246,8 +246,8 @@ public final class CardBlock implements Comparable<CardBlock> {
             int sealedBoosters = StringUtils.isNumeric(numbers[1]) ? Integer.parseInt(numbers[1]) : 0;
             CardEdition landSet = editions.getEditionByCodeOrThrow(numbers[2]);
 
-            List<CardEdition> sets = new ArrayList<CardEdition>();
-            List<MetaSet> metas = new ArrayList<MetaSet>();
+            List<CardEdition> sets = new ArrayList<>();
+            List<MetaSet> metas = new ArrayList<>();
             
             String[] setNames = TextUtil.splitWithParenthesis(sParts[2], ' ' );
             for(final String set : setNames ) {
diff --git a/forge-gui/src/main/java/forge/model/CardCollections.java b/forge-gui/src/main/java/forge/model/CardCollections.java
index 9f1e16d5598..aea26ca713d 100644
--- a/forge-gui/src/main/java/forge/model/CardCollections.java
+++ b/forge-gui/src/main/java/forge/model/CardCollections.java
@@ -50,7 +50,7 @@ public class CardCollections {
 
     public final IStorage<Deck> getConstructed() {
         if (constructed == null) {
-            constructed = new StorageImmediatelySerialized<Deck>("Constructed decks",
+            constructed = new StorageImmediatelySerialized<>("Constructed decks",
                     new DeckStorage(new File(ForgeConstants.DECK_CONSTRUCTED_DIR), ForgeConstants.DECK_BASE_DIR, true),
                     true);
         }
@@ -59,7 +59,7 @@ public class CardCollections {
 
     public final IStorage<DeckGroup> getDraft() {
         if (draft == null) {
-            draft = new StorageImmediatelySerialized<DeckGroup>("Draft deck sets",
+            draft = new StorageImmediatelySerialized<>("Draft deck sets",
                     new DeckGroupSerializer(new File(ForgeConstants.DECK_DRAFT_DIR), ForgeConstants.DECK_BASE_DIR));
         }
         return draft;
@@ -67,7 +67,7 @@ public class CardCollections {
 
     public IStorage<DeckGroup> getSealed() {
         if (sealed == null) {
-            sealed = new StorageImmediatelySerialized<DeckGroup>("Sealed deck sets",
+            sealed = new StorageImmediatelySerialized<>("Sealed deck sets",
                     new DeckGroupSerializer(new File(ForgeConstants.DECK_SEALED_DIR), ForgeConstants.DECK_BASE_DIR));
         }
         return sealed;
@@ -75,7 +75,7 @@ public class CardCollections {
 
     public final IStorage<DeckGroup> getWinston() {
         if (winston == null) {
-            winston = new StorageImmediatelySerialized<DeckGroup>("Winston draft deck sets",
+            winston = new StorageImmediatelySerialized<>("Winston draft deck sets",
                     new DeckGroupSerializer(new File(ForgeConstants.DECK_WINSTON_DIR), ForgeConstants.DECK_BASE_DIR));
         }
         return winston;
@@ -83,7 +83,7 @@ public class CardCollections {
 
     public final IStorage<Deck> getCubes() {
         if (cube == null) {
-            cube = new StorageImmediatelySerialized<Deck>("Cubes",
+            cube = new StorageImmediatelySerialized<>("Cubes",
                     new DeckStorage(new File(ForgeConstants.DECK_CUBE_DIR), ForgeConstants.RES_DIR));
         }
         return cube;
@@ -91,7 +91,7 @@ public class CardCollections {
 
     public IStorage<Deck> getScheme() {
         if (scheme == null) {
-            scheme = new StorageImmediatelySerialized<Deck>("Archenemy decks",
+            scheme = new StorageImmediatelySerialized<>("Archenemy decks",
                     new DeckStorage(new File(ForgeConstants.DECK_SCHEME_DIR), ForgeConstants.DECK_BASE_DIR));
         }
         return scheme;
@@ -99,7 +99,7 @@ public class CardCollections {
 
     public IStorage<Deck> getPlane() {
         if (plane == null) {
-            plane = new StorageImmediatelySerialized<Deck>("Planechase decks",
+            plane = new StorageImmediatelySerialized<>("Planechase decks",
                     new DeckStorage(new File(ForgeConstants.DECK_PLANE_DIR), ForgeConstants.DECK_BASE_DIR));
         }
         return plane;
@@ -107,7 +107,7 @@ public class CardCollections {
 
     public IStorage<Deck> getCommander() {
         if (commander == null) {
-            commander = new StorageImmediatelySerialized<Deck>("Commander decks",
+            commander = new StorageImmediatelySerialized<>("Commander decks",
                     new DeckStorage(new File(ForgeConstants.DECK_COMMANDER_DIR), ForgeConstants.DECK_BASE_DIR));
         }
         return commander;
@@ -115,7 +115,7 @@ public class CardCollections {
 
     public IStorage<Deck> getOathbreaker() {
         if (oathbreaker == null) {
-            oathbreaker = new StorageImmediatelySerialized<Deck>("Oathbreaker decks",
+            oathbreaker = new StorageImmediatelySerialized<>("Oathbreaker decks",
                     new DeckStorage(new File(ForgeConstants.DECK_OATHBREAKER_DIR), ForgeConstants.DECK_BASE_DIR));
         }
         return oathbreaker;
@@ -123,7 +123,7 @@ public class CardCollections {
 
     public IStorage<Deck> getTinyLeaders() {
         if (tinyLeaders == null) {
-            tinyLeaders = new StorageImmediatelySerialized<Deck>("Tiny Leaders decks",
+            tinyLeaders = new StorageImmediatelySerialized<>("Tiny Leaders decks",
                     new DeckStorage(new File(ForgeConstants.DECK_TINY_LEADERS_DIR), ForgeConstants.DECK_BASE_DIR));
         }
         return tinyLeaders;
@@ -131,7 +131,7 @@ public class CardCollections {
 
     public IStorage<Deck> getBrawl() {
         if (brawl == null) {
-            brawl = new StorageImmediatelySerialized<Deck>("Brawl decks",
+            brawl = new StorageImmediatelySerialized<>("Brawl decks",
                     new DeckStorage(new File(ForgeConstants.DECK_BRAWL_DIR), ForgeConstants.DECK_BASE_DIR));
         }
         return brawl;
diff --git a/forge-gui/src/main/java/forge/model/UnOpenedMeta.java b/forge-gui/src/main/java/forge/model/UnOpenedMeta.java
index 0a819c54d26..b704188dc4a 100644
--- a/forge-gui/src/main/java/forge/model/UnOpenedMeta.java
+++ b/forge-gui/src/main/java/forge/model/UnOpenedMeta.java
@@ -54,7 +54,7 @@ public class UnOpenedMeta implements IUnOpenedProduct {
      *            the GuiBase.getInterface().
      */
     private UnOpenedMeta(final String creationString, final JoinOperation op) {
-        metaSets = new ArrayList<MetaSet>();
+        metaSets = new ArrayList<>();
         operation = op;
 
         for (String m : TextUtil.splitWithParenthesis(creationString, ';')) {
@@ -107,7 +107,7 @@ public class UnOpenedMeta implements IUnOpenedProduct {
                 return newBooster.get();
 
             case SelectAll:
-                List<PaperCard> allCards = new ArrayList<PaperCard>();
+                List<PaperCard> allCards = new ArrayList<>();
                 for (MetaSet ms : metaSets) {
                     allCards.addAll(ms.getBooster().get());
                 }
diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestAwardPool.java b/forge-gui/src/main/java/forge/planarconquest/ConquestAwardPool.java
index c6584392c97..077981baee7 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestAwardPool.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestAwardPool.java
@@ -8,10 +8,10 @@ public class ConquestAwardPool {
     public final List<PaperCard> commons, uncommons, rares, mythics;
 
     public ConquestAwardPool(Iterable<PaperCard> cards) {
-        commons = new ArrayList<PaperCard>();
-        uncommons = new ArrayList<PaperCard>();
-        rares = new ArrayList<PaperCard>();
-        mythics = new ArrayList<PaperCard>();
+        commons = new ArrayList<>();
+        uncommons = new ArrayList<>();
+        rares = new ArrayList<>();
+        mythics = new ArrayList<>();
 
         for (PaperCard c : cards) {
             switch (c.getRarity()) {
diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java
index c0ce7625964..41dba7860ac 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java
@@ -73,7 +73,7 @@ public class ConquestController {
         File decksDir = new File(model.getDirectory(), "decks");
         FileUtil.ensureDirectoryExists(decksDir);
         DeckStorage storage = new DeckStorage(decksDir, ForgeConstants.CONQUEST_SAVE_DIR);
-        decks = new StorageImmediatelySerialized<Deck>(model.getName() + " decks", storage);
+        decks = new StorageImmediatelySerialized<>(model.getName() + " decks", storage);
     }
 
     public IStorage<Deck> getDecks() {
@@ -121,7 +121,7 @@ public class ConquestController {
             aiPlayerName += " (AI)"; //ensure player names are distinct
         }
 
-        final List<RegisteredPlayer> starter = new ArrayList<RegisteredPlayer>();
+        final List<RegisteredPlayer> starter = new ArrayList<>();
         humanPlayer = new LobbyPlayerHuman(humanPlayerName);
         humanPlayer.setAvatarCardImageKey(commander.getCard().getImageKey(false));
         starter.add(humanStart.setPlayer(humanPlayer));
@@ -151,9 +151,9 @@ public class ConquestController {
 
     private List<PaperCard> generatePlanarPool() {
         String planeName = model.getCurrentPlane().getName();
-        List<PaperCard> pool = new ArrayList<PaperCard>();
-        List<PaperCard> otherPlanes = new ArrayList<PaperCard>();
-        List<PaperCard> phenomenons = new ArrayList<PaperCard>();
+        List<PaperCard> pool = new ArrayList<>();
+        List<PaperCard> otherPlanes = new ArrayList<>();
+        List<PaperCard> phenomenons = new ArrayList<>();
 
         for (PaperCard c : FModel.getMagicDb().getVariantCards().getAllCards()) {
             CardType type = c.getRules().getType();
@@ -196,7 +196,7 @@ public class ConquestController {
 
     public List<ConquestReward> awardBooster(ConquestAwardPool pool) {
         ConquestPreferences prefs = FModel.getConquestPreferences();
-        List<PaperCard> rewards = new ArrayList<PaperCard>();
+        List<PaperCard> rewards = new ArrayList<>();
         int boostersPerMythic = prefs.getPrefInt(CQPref.BOOSTERS_PER_MYTHIC);
         int raresPerBooster = prefs.getPrefInt(CQPref.BOOSTER_RARES);
         for (int i = 0; i < raresPerBooster; i++) {
@@ -220,7 +220,7 @@ public class ConquestController {
         //also build list of all rewards including replacement shards for each duplicate card
         //build this list in reverse order so commons appear first
         int shards = 0;
-        final List<ConquestReward> allRewards = new ArrayList<ConquestReward>();
+        final List<ConquestReward> allRewards = new ArrayList<>();
         for (int i = rewards.size() - 1; i >= 0; i--) {
             int replacementShards = 0;
             PaperCard card = rewards.get(i);
diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java
index 3ce5ee53c50..b3a31a54160 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java
@@ -51,11 +51,11 @@ public final class ConquestData {
     private int planeswalkEmblems;
 
     private final ConquestRecord chaosBattleRecord;
-    private final Map<String, ConquestPlaneData> planeDataMap = new HashMap<String, ConquestPlaneData>();
-    private final HashSet<PaperCard> unlockedCards = new HashSet<PaperCard>();
-    private final List<ConquestCommander> commanders = new ArrayList<ConquestCommander>();
-    private final HashSet<PaperCard> newCards = new HashSet<PaperCard>();
-    private final HashSet<PaperCard> exiledCards = new HashSet<PaperCard>();
+    private final Map<String, ConquestPlaneData> planeDataMap = new HashMap<>();
+    private final HashSet<PaperCard> unlockedCards = new HashSet<>();
+    private final List<ConquestCommander> commanders = new ArrayList<>();
+    private final HashSet<PaperCard> newCards = new HashSet<>();
+    private final HashSet<PaperCard> exiledCards = new HashSet<>();
 
     public ConquestData(String name0, ConquestPlane startingPlane0, PaperCard startingPlaneswalker0, PaperCard startingCommander0) {
         name = name0;
@@ -153,7 +153,7 @@ public final class ConquestData {
     }
 
     public Iterable<PaperCard> getSortedPlaneswalkers() {
-        List<PaperCard> planeswalkers = new ArrayList<PaperCard>();
+        List<PaperCard> planeswalkers = new ArrayList<>();
         for (PaperCard card : unlockedCards) {
             if (card.getRules().getType().isPlaneswalker() && !isInExile(card)) {
                 planeswalkers.add(card);
@@ -285,7 +285,7 @@ public final class ConquestData {
                         return false;
                     }
                     if (commandersBeingExiled == null) {
-                        commandersBeingExiled = new ArrayList<ConquestCommander>();
+                        commandersBeingExiled = new ArrayList<>();
                     }
                     commandersBeingExiled.add(commander); //cache commander to make it easier to remove later
                 }
@@ -537,7 +537,7 @@ public final class ConquestData {
     };
 
     public static Map<ColumnDef, ItemColumn> getColOverrides(ItemManagerConfig config) {
-        Map<ColumnDef, ItemColumn> colOverrides = new HashMap<ColumnDef, ItemColumn>();
+        Map<ColumnDef, ItemColumn> colOverrides = new HashMap<>();
         ItemColumn.addColOverride(config, colOverrides, ColumnDef.NEW, fnNewCompare, fnNewGet);
         return colOverrides;
     }
@@ -548,8 +548,8 @@ public final class ConquestData {
     }
 
     private class PathFinder {
-        private final HashSet<Node> closedSet = new HashSet<Node>();
-        private final HashSet<Node> openSet = new HashSet<Node>();
+        private final HashSet<Node> closedSet = new HashSet<>();
+        private final HashSet<Node> openSet = new HashSet<>();
         private final Node[][] map;
 
         private PathFinder() {
@@ -585,7 +585,7 @@ public final class ConquestData {
 
                 //if we've reach goal, reconstruct path and return it
                 if (current == goal) {
-                    List<ConquestLocation> path = new ArrayList<ConquestLocation>();
+                    List<ConquestLocation> path = new ArrayList<>();
                     while (current != null) {
                         path.add(current.loc);
                         current = current.came_from;
diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestLocation.java b/forge-gui/src/main/java/forge/planarconquest/ConquestLocation.java
index c85a7cd9edd..a73053cf441 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestLocation.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestLocation.java
@@ -78,7 +78,7 @@ public class ConquestLocation implements IXmlWritable {
 
     public static List<ConquestLocation> getNeighbors(ConquestPlane plane0, int regionIndex0, int row0, int col0) {
         int regionCount = plane0.getRegions().size();
-        List<ConquestLocation> locations = new ArrayList<ConquestLocation>();
+        List<ConquestLocation> locations = new ArrayList<>();
 
         //add location above
         if (row0 < plane0.getRowsPerRegion() - 1) {
diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java b/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java
index 0e67a770e08..4415fec32fc 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java
@@ -136,7 +136,7 @@ public class ConquestPlane {
 
     public FCollectionView<PaperCard> getPlaneCards() {
         if (planeCards == null) {
-            planeCards = new FCollection<PaperCard>();
+            planeCards = new FCollection<>();
 
             CardDb variantCards = FModel.getMagicDb().getVariantCards();
             List<String> planeCardNames = FileUtil.readFile(directory + "plane_cards.txt");
@@ -160,7 +160,7 @@ public class ConquestPlane {
         if (regions != null) { return; }
 
         //load regions
-        regions = new FCollection<ConquestRegion>(new ConquestRegion.Reader(this));
+        regions = new FCollection<>(new ConquestRegion.Reader(this));
 
         //load events
         int eventIndex = 0;
@@ -168,7 +168,7 @@ public class ConquestPlane {
         int regionEndIndex = eventsPerRegion;
         events = new ConquestEvent[regions.size() * eventsPerRegion];
         for (ConquestRegion region : regions) {
-            FCollection<ConquestEvent> regionEvents = new FCollection<ConquestEvent>(new ConquestEvent.Reader(region));
+            FCollection<ConquestEvent> regionEvents = new FCollection<>(new ConquestEvent.Reader(region));
             for (ConquestEvent event : regionEvents) {
                 events[eventIndex++] = event;
                 if (eventIndex == regionEndIndex) {
@@ -184,11 +184,11 @@ public class ConquestPlane {
 
         //load card pool
         cardPool = new DeckGenPool();
-        commanders = new FCollection<PaperCard>();
+        commanders = new FCollection<>();
 
         CardDb commonCards = FModel.getMagicDb().getCommonCards();
         List<String> bannedCards = FileUtil.readFile(directory + "banned_cards.txt");
-        Set<String> bannedCardSet = bannedCards.isEmpty() ? null : new HashSet<String>(bannedCards);
+        Set<String> bannedCardSet = bannedCards.isEmpty() ? null : new HashSet<>(bannedCards);
 
         List<String> setCodes = FileUtil.readFile(directory + "sets.txt");
         for (String setCode : setCodes) {
@@ -292,7 +292,7 @@ public class ConquestPlane {
     }
 
     public static Set<ConquestPlane> getAllPlanesOfCard(PaperCard card) {
-        Set<ConquestPlane> planes = new HashSet<ConquestPlane>();
+        Set<ConquestPlane> planes = new HashSet<>();
         for (ConquestPlane plane : FModel.getPlanes()) {
             if (plane.cardPool.contains(card)) {
                 planes.add(plane);
diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestRegion.java b/forge-gui/src/main/java/forge/planarconquest/ConquestRegion.java
index ed1904e2136..d4278084fb8 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestRegion.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestRegion.java
@@ -73,7 +73,7 @@ public class ConquestRegion {
     }
 
     public FCollectionView<PaperCard> getCommanders() {
-        FCollection<PaperCard> commanders = new FCollection<PaperCard>();
+        FCollection<PaperCard> commanders = new FCollection<>();
         for (PaperCard commander : plane.getCommanders()) {
             if (cardPool.contains(commander)) {
                 commanders.add(commander);
@@ -172,7 +172,7 @@ public class ConquestRegion {
     }
 
     public static Set<ConquestRegion> getAllRegionsOfCard(PaperCard card) {
-        Set<ConquestRegion> regions = new HashSet<ConquestRegion>();
+        Set<ConquestRegion> regions = new HashSet<>();
         for (ConquestPlane plane : FModel.getPlanes()) {
             if (plane.getCardPool().contains(card)) {
                 for (ConquestRegion region : plane.getRegions()) {
@@ -186,7 +186,7 @@ public class ConquestRegion {
     }
 
     public static List<ConquestRegion> getAllRegions() {
-        List<ConquestRegion> regions = new ArrayList<ConquestRegion>();
+        List<ConquestRegion> regions = new ArrayList<>();
         for (ConquestPlane plane : FModel.getPlanes()) {
             for (ConquestRegion region : plane.getRegions()) {
                 regions.add(region);
diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java
index c283bf771e5..22d379ddf5b 100644
--- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java
+++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java
@@ -73,7 +73,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
 
     @Override
     public PaymentDecision visit(final CostChooseCreatureType cost) {
-        final String choice = controller.chooseSomeType("Creature", ability, new ArrayList<String>(CardType.Constant.CREATURE_TYPES), new ArrayList<String>(), true);
+        final String choice = controller.chooseSomeType("Creature", ability, new ArrayList<>(CardType.Constant.CREATURE_TYPES), new ArrayList<>(), true);
         if (null == choice) {
             return null;
         }
@@ -282,7 +282,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
         if (!cost.sameZone) { return exileFromMiscZone(cost, ability, c, list); }
 
         final FCollectionView<Player> players = game.getPlayers();
-        final List<Player> payableZone = new ArrayList<Player>();
+        final List<Player> payableZone = new ArrayList<>();
         for (final Player p : players) {
             final CardCollection enoughType = CardLists.filter(list, CardPredicates.isOwner(p));
             if (enoughType.size() < c) {
@@ -332,8 +332,8 @@ public class HumanCostDecision extends CostDecisionMakerBase {
 
         Integer c = cost.convertAmount();
         final String type = cost.getType();
-        final List<SpellAbility> saList = new ArrayList<SpellAbility>();
-        final List<String> descList = new ArrayList<String>();
+        final List<SpellAbility> saList = new ArrayList<>();
+        final List<String> descList = new ArrayList<>();
 
         for (final SpellAbilityStackInstance si : game.getStack()) {
             final Card stC = si.getSourceCard();
@@ -366,7 +366,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
             return null;
         }
 
-        final List<SpellAbility> exiled = new ArrayList<SpellAbility>();
+        final List<SpellAbility> exiled = new ArrayList<>();
         for (int i = 0; i < c; i++) {
             //Have to use the stack descriptions here because some copied spells have no description otherwise
             final String o = controller.getGui().oneOrNone("Exile from Stack", descList);
@@ -545,7 +545,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
             }
         }
 
-        final List<Player> oppsThatCanGainLife = new ArrayList<Player>();
+        final List<Player> oppsThatCanGainLife = new ArrayList<>();
         for (final Player opp : cost.getPotentialTargets(player, source)) {
             if (opp.canGainLife()) {
                 oppsThatCanGainLife.add(opp);
@@ -677,7 +677,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
 
         if (cost.sameZone){
             final FCollectionView<Player> players = player.getGame().getPlayers();
-            final List<Player> payableZone = new ArrayList<Player>();
+            final List<Player> payableZone = new ArrayList<>();
             for (final Player p : players) {
                 final CardCollectionView enoughType = CardLists.filter(list, CardPredicates.isOwner(p));
                 if (enoughType.size() < c) {
@@ -898,7 +898,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
         inp.showAndWait();
         final Card selected = inp.getFirstSelected();
         final Map<CounterType, Integer> tgtCounters = selected.getCounters();
-        final List<CounterType> typeChoices = new ArrayList<CounterType>();
+        final List<CounterType> typeChoices = new ArrayList<>();
         for (final CounterType key : tgtCounters.keySet()) {
             if (tgtCounters.get(key) > 0) {
                 typeChoices.add(key);
@@ -922,7 +922,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
             super(controller, cntCounters, cntCounters, sa);
             this.validChoices = validCards;
             counterType = cType;
-            cardsChosen = cntCounters > 0 ? new HashMap<Card, Integer>() : null;
+            cardsChosen = cntCounters > 0 ? new HashMap<>() : null;
         }
 
         @Override
diff --git a/forge-gui/src/main/java/forge/player/HumanPlay.java b/forge-gui/src/main/java/forge/player/HumanPlay.java
index fec7ac0844a..40d69e11f79 100644
--- a/forge-gui/src/main/java/forge/player/HumanPlay.java
+++ b/forge-gui/src/main/java/forge/player/HumanPlay.java
@@ -274,7 +274,7 @@ public class HumanPlay {
         }
 
         final List<CostPart> parts = CostAdjustment.adjust(cost, sourceAbility).getCostParts();
-        final List<CostPart> remainingParts = new ArrayList<CostPart>(parts);
+        final List<CostPart> remainingParts = new ArrayList<>(parts);
         CostPart costPart = null;
         if (!parts.isEmpty()) {
             costPart = parts.get(0);
@@ -319,7 +319,7 @@ public class HumanPlay {
             }
             else if (part instanceof CostDraw) {
                 final int amount = getAmountFromPart(part, source, sourceAbility);
-                List<Player> res = new ArrayList<Player>();
+                List<Player> res = new ArrayList<>();
                 String type = part.getType();
                 for (Player player : p.getGame().getPlayers()) {
                     if (player.isValid(type, p, source, sourceAbility) && player.canDraw()) {
@@ -455,7 +455,7 @@ public class HumanPlay {
                     }
                     Card selected = inp.getFirstSelected();
                     final Map<CounterType, Integer> tgtCounters = selected.getCounters();
-                    final List<CounterType> typeChoices = new ArrayList<CounterType>();
+                    final List<CounterType> typeChoices = new ArrayList<>();
                     for (CounterType key : tgtCounters.keySet()) {
                         if (tgtCounters.get(key) > 0) {
                             typeChoices.add(key);
@@ -528,7 +528,7 @@ public class HumanPlay {
 
                 if (sameZone) { // Jotun Grunt
                     FCollectionView<Player> players = p.getGame().getPlayers();
-                    List<Player> payableZone = new ArrayList<Player>();
+                    List<Player> payableZone = new ArrayList<>();
                     for (Player player : players) {
                         CardCollectionView enoughType = CardLists.filter(list, CardPredicates.isOwner(player));
                         if (enoughType.size() < amount) {
diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
index b3afc07f7df..4631c33e04a 100644
--- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
+++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
@@ -136,7 +136,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
         return mayLookAtAllCards;
     }
 
-    private final ArrayList<Card> tempShownCards = new ArrayList<Card>();
+    private final ArrayList<Card> tempShownCards = new ArrayList<>();
 
     public <T> void tempShow(final Iterable<T> objects) {
         for (final T t : objects) {
@@ -446,7 +446,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
             tempShow(delayedReveal.getCards());
         }
         if (useSelectCardsInput(optionList)) {
-            final InputSelectEntitiesFromList<T> input = new InputSelectEntitiesFromList<T>(this, isOptional ? 0 : 1, 1,
+            final InputSelectEntitiesFromList<T> input = new InputSelectEntitiesFromList<>(this, isOptional ? 0 : 1, 1,
                     optionList, sa);
             input.setCancelAllowed(isOptional);
             input.setMessage(MessageUtil.formatMessage(title, player, targetedPlayer));
@@ -485,7 +485,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
 
         tempShow(optionList);
         if (useSelectCardsInput(optionList)) {
-            final InputSelectEntitiesFromList<T> input = new InputSelectEntitiesFromList<T>(this, min, max,
+            final InputSelectEntitiesFromList<T> input = new InputSelectEntitiesFromList<>(this, min, max,
                     optionList, sa);
             input.setCancelAllowed(true);
             input.setMessage(MessageUtil.formatMessage(title, player, targetedPlayer));
@@ -661,8 +661,8 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
             final String prompt = String.format(
                     "%s, you %s\n\nWho would you like to start this game? (Click on the portrait.)", player.getName(),
                     isFirstGame ? " have won the coin toss." : " lost the last game.");
-            final InputSelectEntitiesFromList<Player> input = new InputSelectEntitiesFromList<Player>(this, 1, 1,
-                    new FCollection<Player>(game.getPlayersInTurnOrder()));
+            final InputSelectEntitiesFromList<Player> input = new InputSelectEntitiesFromList<>(this, 1, 1,
+                    new FCollection<>(game.getPlayersInTurnOrder()));
             input.setMessage(prompt);
             input.showAndWait();
             return input.getFirstSelected();
@@ -684,9 +684,9 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
             mapCVtoC.put(card.getView(), card);
         }
         List<CardView> chosen;
-        List<CardView> choices = new ArrayList<CardView>(mapCVtoC.keySet());
+        List<CardView> choices = new ArrayList<>(mapCVtoC.keySet());
         chosen = getGui().order("Exert Attackers?", "Exerted", 0, choices.size(), choices, null, null, false);
-        List<Card> chosenCards = new ArrayList<Card>();
+        List<Card> chosenCards = new ArrayList<>();
         for (CardView cardView : chosen) {
             chosenCards.add(mapCVtoC.get(cardView));
         }
@@ -2858,7 +2858,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
         for (Card card : cards) {
             mapCVtoC.put(card.getView(), card);
         }
-        List<CardView> choices = new ArrayList<CardView>(mapCVtoC.keySet());
+        List<CardView> choices = new ArrayList<>(mapCVtoC.keySet());
         List<CardView> chosen;
         chosen = getGui().many(
                 "Choose cards to Splice onto",
@@ -2868,7 +2868,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
                 choices,
                 sa.getHostCard().getView()
         );
-        List<Card> chosenCards = new ArrayList<Card>();
+        List<Card> chosenCards = new ArrayList<>();
         for (CardView cardView : chosen) {
             chosenCards.add(mapCVtoC.get(cardView));
         }
diff --git a/forge-gui/src/main/java/forge/player/TargetSelection.java b/forge-gui/src/main/java/forge/player/TargetSelection.java
index 70fd7b72cfc..deced7b9fb8 100644
--- a/forge-gui/src/main/java/forge/player/TargetSelection.java
+++ b/forge-gui/src/main/java/forge/player/TargetSelection.java
@@ -194,7 +194,7 @@ public class TargetSelection {
             else if (zz.is(ZoneType.Stack))     crdsStack.add(cardView);
             else if (zz.is(ZoneType.Ante))      crdsAnte.add(cardView);
         }
-        List<Object> choicesFiltered = new ArrayList<Object>();
+        List<Object> choicesFiltered = new ArrayList<>();
         if (!crdsBattle.isEmpty()) {
             choicesFiltered.add("--CARDS ON BATTLEFIELD:--");
             choicesFiltered.addAll(crdsBattle);
@@ -251,7 +251,7 @@ public class TargetSelection {
         final TargetRestrictions tgt = this.getTgt();
         final String message = tgt.getVTSelection();
         // Find what's targetable, then allow human to choose
-        final List<Object> selectOptions = new ArrayList<Object>();
+        final List<Object> selectOptions = new ArrayList<>();
         HashMap<StackItemView, SpellAbilityStackInstance> stackItemViewCache = new HashMap<>();
 
         final Game game = ability.getActivatingPlayer().getGame();
diff --git a/forge-gui/src/main/java/forge/properties/PreferencesStore.java b/forge-gui/src/main/java/forge/properties/PreferencesStore.java
index 9fd0a15d116..39da97b9e99 100644
--- a/forge-gui/src/main/java/forge/properties/PreferencesStore.java
+++ b/forge-gui/src/main/java/forge/properties/PreferencesStore.java
@@ -36,7 +36,7 @@ public abstract class PreferencesStore<T extends Enum<T>> {
     private final String filename;
 
     public PreferencesStore(final String filename0, final Class<T> clasz) {
-        preferenceValues = new EnumMap<T, String>(clasz);
+        preferenceValues = new EnumMap<>(clasz);
         filename = filename0;
 
         final List<String> lines = FileUtil.readFile(filename);
diff --git a/forge-gui/src/main/java/forge/quest/QuestController.java b/forge-gui/src/main/java/forge/quest/QuestController.java
index 3828cdc77d4..86fc937f89a 100644
--- a/forge-gui/src/main/java/forge/quest/QuestController.java
+++ b/forge-gui/src/main/java/forge/quest/QuestController.java
@@ -161,7 +161,7 @@ public class QuestController {
 
     public IStorage<DeckGroup> getDraftDecks() {
         if (draftDecks == null) {
-            draftDecks = new QuestDeckGroupMap(new HashMap<String, DeckGroup>());
+            draftDecks = new QuestDeckGroupMap(new HashMap<>());
         }
         final QuestAchievements achievements = this.getAchievements();
         if (achievements != null && (achievements.getCurrentDraftIndex() == -1 || achievements.getCurrentDraft() == null)) {
@@ -208,9 +208,9 @@ public class QuestController {
     public static IStorage<PreconDeck> getPrecons() {
         if (null == preconManager) {
             // read with a special class, that will fill sell rules as it processes each PreconDeck
-            preconManager = new StorageBase<PreconDeck>("Quest shop decks", new PreconDeck.Reader(new File(ForgeConstants.QUEST_PRECON_DIR)){
+            preconManager = new StorageBase<>("Quest shop decks", new PreconDeck.Reader(new File(ForgeConstants.QUEST_PRECON_DIR)) {
                 @Override
-                protected PreconDeck getPreconDeckFromSections(java.util.Map<String,java.util.List<String>> sections) {
+                protected PreconDeck getPreconDeckFromSections(java.util.Map<String, java.util.List<String>> sections) {
                     PreconDeck result = super.getPreconDeckFromSections(sections);
                     preconDeals.put(result.getName(), new SellRules(sections.get("shop")));
                     return result;
@@ -219,7 +219,7 @@ public class QuestController {
         }
         return QuestController.preconManager;
     }
-    private final static Map<String, SellRules> preconDeals = new TreeMap<String, SellRules>();
+    private final static Map<String, SellRules> preconDeals = new TreeMap<>();
     public static SellRules getPreconDeals(PreconDeck deck) {
         return preconDeals.get(deck.getName());
     }
@@ -558,11 +558,11 @@ public class QuestController {
 
     public final void regenerateChallenges() {
         final QuestAchievements achievements = model.getAchievements();
-        final List<String> unlockedChallengeIds = new ArrayList<String>();
+        final List<String> unlockedChallengeIds = new ArrayList<>();
         final List<String> availableChallengeIds = achievements.getCurrentChallenges();
 
         // clean up challenges potentially coming over from a different quest world
-        List<String> nonExistentIds = new ArrayList<String>();
+        List<String> nonExistentIds = new ArrayList<>();
         for (String cid : availableChallengeIds) {
             if (this.getChallenges().get(cid) == null) {
                 System.out.println("Warning: removing a challenge that does not exist in the current quest world: " + cid);
diff --git a/forge-gui/src/main/java/forge/quest/QuestDeckGroupMap.java b/forge-gui/src/main/java/forge/quest/QuestDeckGroupMap.java
index c6a78556d2b..4ef703fc1b5 100644
--- a/forge-gui/src/main/java/forge/quest/QuestDeckGroupMap.java
+++ b/forge-gui/src/main/java/forge/quest/QuestDeckGroupMap.java
@@ -32,7 +32,7 @@ public class QuestDeckGroupMap extends StorageBase<DeckGroup> {
      * Instantiates a new quest deck map.
      */
     public QuestDeckGroupMap(Map<String, DeckGroup> in) {
-        super("Quest draft decks", null, in == null ? new HashMap<String, DeckGroup>() : in);
+        super("Quest draft decks", null, in == null ? new HashMap<>() : in);
     }
 
 
diff --git a/forge-gui/src/main/java/forge/quest/QuestEventChallenge.java b/forge-gui/src/main/java/forge/quest/QuestEventChallenge.java
index 2f1b1fbd1cc..9009b97c441 100644
--- a/forge-gui/src/main/java/forge/quest/QuestEventChallenge.java
+++ b/forge-gui/src/main/java/forge/quest/QuestEventChallenge.java
@@ -61,10 +61,10 @@ public class QuestEventChallenge extends QuestEvent {
 
     // Other cards used in assignment: starting, and reward.
     /** The human extra cards. */
-    private List<String> humanExtraCards = new ArrayList<String>();
+    private List<String> humanExtraCards = new ArrayList<>();
 
     /** The ai extra cards. */
-    private List<String> aiExtraCards = new ArrayList<String>();
+    private List<String> aiExtraCards = new ArrayList<>();
 
     /** If persistent, the challenge does not disappear if the player fails it. */
     private boolean persistent = false;
diff --git a/forge-gui/src/main/java/forge/quest/QuestEventDuelManager.java b/forge-gui/src/main/java/forge/quest/QuestEventDuelManager.java
index e92c0be583b..138176ed248 100644
--- a/forge-gui/src/main/java/forge/quest/QuestEventDuelManager.java
+++ b/forge-gui/src/main/java/forge/quest/QuestEventDuelManager.java
@@ -218,10 +218,10 @@ public class QuestEventDuelManager implements QuestEventDuelManagerInterface {
     private void assembleDuelDifficultyLists() {
 
         sortedDuels.clear();
-        sortedDuels.put(QuestEventDifficulty.EASY, new ArrayList<QuestEventDuel>());
-        sortedDuels.put(QuestEventDifficulty.MEDIUM, new ArrayList<QuestEventDuel>());
-        sortedDuels.put(QuestEventDifficulty.HARD, new ArrayList<QuestEventDuel>());
-        sortedDuels.put(QuestEventDifficulty.EXPERT, new ArrayList<QuestEventDuel>());
+        sortedDuels.put(QuestEventDifficulty.EASY, new ArrayList<>());
+        sortedDuels.put(QuestEventDifficulty.MEDIUM, new ArrayList<>());
+        sortedDuels.put(QuestEventDifficulty.HARD, new ArrayList<>());
+        sortedDuels.put(QuestEventDifficulty.EXPERT, new ArrayList<>());
 
         for (final QuestEventDuel qd : allDuels) {
             sortedDuels.add(qd.getDifficulty(), qd);
diff --git a/forge-gui/src/main/java/forge/quest/QuestEventLDADuelManager.java b/forge-gui/src/main/java/forge/quest/QuestEventLDADuelManager.java
index eadd2ed28d4..424701015de 100644
--- a/forge-gui/src/main/java/forge/quest/QuestEventLDADuelManager.java
+++ b/forge-gui/src/main/java/forge/quest/QuestEventLDADuelManager.java
@@ -54,10 +54,10 @@ public class QuestEventLDADuelManager implements QuestEventDuelManagerInterface
     private void assembleDuelDifficultyLists() {
 
         sortedDuels.clear();
-        sortedDuels.put(QuestEventDifficulty.EASY, new ArrayList<QuestEventDuel>());
-        sortedDuels.put(QuestEventDifficulty.MEDIUM, new ArrayList<QuestEventDuel>());
-        sortedDuels.put(QuestEventDifficulty.HARD, new ArrayList<QuestEventDuel>());
-        sortedDuels.put(QuestEventDifficulty.EXPERT, new ArrayList<QuestEventDuel>());
+        sortedDuels.put(QuestEventDifficulty.EASY, new ArrayList<>());
+        sortedDuels.put(QuestEventDifficulty.MEDIUM, new ArrayList<>());
+        sortedDuels.put(QuestEventDifficulty.HARD, new ArrayList<>());
+        sortedDuels.put(QuestEventDifficulty.EXPERT, new ArrayList<>());
 
         int i=0;
         for(Archetype archetype : archetypes){
@@ -223,7 +223,7 @@ public class QuestEventLDADuelManager implements QuestEventDuelManagerInterface
 
     @Override
     public Iterable<QuestEventDuel> getAllDuels() {
-        return new ArrayList<QuestEventDuel>();
+        return new ArrayList<>();
     }
 
     public Iterable<QuestEventDuel> getDuels(QuestEventDifficulty difficulty) {
diff --git a/forge-gui/src/main/java/forge/quest/QuestRewardCard.java b/forge-gui/src/main/java/forge/quest/QuestRewardCard.java
index 91b008abbd4..26c2c6de0c7 100644
--- a/forge-gui/src/main/java/forge/quest/QuestRewardCard.java
+++ b/forge-gui/src/main/java/forge/quest/QuestRewardCard.java
@@ -59,7 +59,7 @@ public abstract class QuestRewardCard implements IQuestRewardCard {
                 if (tmp.length > 1) {
                     final String [] setcodes = tmp[1].split(",");
                     if (setcodes.length > 0) {
-                        final List<String> sets = new ArrayList<String>();
+                        final List<String> sets = new ArrayList<>();
                         for (final String code : setcodes) {
                             if (FModel.getMagicDb().getEditions().contains(code)) {
                                 // System.out.println("Set " + code + " was found!");
diff --git a/forge-gui/src/main/java/forge/quest/QuestRewardCardChooser.java b/forge-gui/src/main/java/forge/quest/QuestRewardCardChooser.java
index 8441b22ac9b..9850681e4e1 100644
--- a/forge-gui/src/main/java/forge/quest/QuestRewardCardChooser.java
+++ b/forge-gui/src/main/java/forge/quest/QuestRewardCardChooser.java
@@ -98,7 +98,7 @@ public class QuestRewardCardChooser extends QuestRewardCard {
             final ItemPool<PaperCard> playerCards = FModel.getQuest().getAssets().getCardPool();
             if (!playerCards.isEmpty()) { // Maybe a redundant check since it's hard to win a duel without any cards...
 
-                List<PaperCard> cardChoices = new ArrayList<PaperCard>();
+                List<PaperCard> cardChoices = new ArrayList<>();
                 for (final Map.Entry<PaperCard, Integer> card : playerCards) {
                     cardChoices.add(card.getKey());
                 }
@@ -108,7 +108,7 @@ public class QuestRewardCardChooser extends QuestRewardCard {
             }
 
         } else if (type == poolType.predicateFilter) {
-            List<PaperCard> cardChoices = new ArrayList<PaperCard>();
+            List<PaperCard> cardChoices = new ArrayList<>();
 
             for (final PaperCard card : Iterables.filter(FModel.getMagicDb().getCommonCards().getAllCards(), predicates)) {
                 cardChoices.add(card);
diff --git a/forge-gui/src/main/java/forge/quest/QuestRewardCardDuplicate.java b/forge-gui/src/main/java/forge/quest/QuestRewardCardDuplicate.java
index 4c6014e1cb0..4b6a0e66df9 100644
--- a/forge-gui/src/main/java/forge/quest/QuestRewardCardDuplicate.java
+++ b/forge-gui/src/main/java/forge/quest/QuestRewardCardDuplicate.java
@@ -60,7 +60,7 @@ public class QuestRewardCardDuplicate implements IQuestRewardCard {
         final ItemPool<PaperCard> playerCards = FModel.getQuest().getAssets().getCardPool();
         if (!playerCards.isEmpty()) { // Maybe a redundant check since it's hard to win a duel without any cards...
 
-            final List<PaperCard> cardChoices = new ArrayList<PaperCard>();
+            final List<PaperCard> cardChoices = new ArrayList<>();
             for (final Map.Entry<PaperCard, Integer> card : playerCards) {
                 cardChoices.add(card.getKey());
             }
diff --git a/forge-gui/src/main/java/forge/quest/QuestRewardCardFiltered.java b/forge-gui/src/main/java/forge/quest/QuestRewardCardFiltered.java
index 3e05da19c27..ba565e9b774 100644
--- a/forge-gui/src/main/java/forge/quest/QuestRewardCardFiltered.java
+++ b/forge-gui/src/main/java/forge/quest/QuestRewardCardFiltered.java
@@ -60,7 +60,7 @@ public class QuestRewardCardFiltered extends QuestRewardCard {
      */
     @Override
     public final List<PaperCard> getChoices() {
-        List<PaperCard> cardChoices = new ArrayList<PaperCard>();
+        List<PaperCard> cardChoices = new ArrayList<>();
         for (final PaperCard card : Iterables.filter(FModel.getMagicDb().getCommonCards().getAllCards(), predicates)) {
             cardChoices.add(card);
         }
diff --git a/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java b/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java
index 598afcbb667..ffbad1ca8f3 100644
--- a/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java
+++ b/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java
@@ -67,7 +67,7 @@ public class QuestUtilUnlockSets {
 
         final ReadPriceList prices = new ReadPriceList();
         final Map<String, Integer> mapPrices = prices.getPriceList();
-        final List<ImmutablePair<CardEdition, Integer>> setPrices = new ArrayList<ImmutablePair<CardEdition, Integer>>();
+        final List<ImmutablePair<CardEdition, Integer>> setPrices = new ArrayList<>();
 
         Double multiplier = 1d;
         int j = 0;
@@ -90,7 +90,7 @@ public class QuestUtilUnlockSets {
         }
 
         final String setPrompt = "You have " + qData.getAssets().getCredits() + " credits. Unlock:";
-        List<String> options = new ArrayList<String>();
+        List<String> options = new ArrayList<>();
         for (ImmutablePair<CardEdition, Integer> ee : setPrices) {
             options.add(TextUtil.concatNoSpace(ee.left.getName()," [PRICE: ", String.valueOf(ee.right), " credits]"));
         }
@@ -142,7 +142,7 @@ public class QuestUtilUnlockSets {
         if (qData.getUnlocksTokens() < 1) { // Should never happen if we made it this far but better safe than sorry...
             throw new RuntimeException("BUG? Could not find unlockable sets even though we should.");
         }
-        List<CardEdition> options = new ArrayList<CardEdition>();
+        List<CardEdition> options = new ArrayList<>();
 
         // Sort current sets by date
         List<CardEdition> allowedSets = Lists.newArrayList(Iterables.transform(qData.getFormat().getAllowedSetCodes(), FModel.getMagicDb().getEditions().FN_EDITION_BY_CODE));
@@ -153,7 +153,7 @@ public class QuestUtilUnlockSets {
         Collections.sort(excludedSets);
         
         // get a number of sets between an excluded and any included set
-        List<ImmutablePair<CardEdition, Long>> excludedWithDistances = new ArrayList<ImmutablePair<CardEdition, Long>>();
+        List<ImmutablePair<CardEdition, Long>> excludedWithDistances = new ArrayList<>();
         for (CardEdition ex : excludedSets) {
             if (!unlockableSetTypes.contains(ex.getType())) // don't add non-traditional sets
                 continue;
@@ -205,7 +205,7 @@ public class QuestUtilUnlockSets {
             qData.getFormat().unlockSet(additionalSet);
         }
 
-        List<PaperCard> cardsWon = new ArrayList<PaperCard>();
+        List<PaperCard> cardsWon = new ArrayList<>();
 
         if (starters.contains(unlockedSet.getCode())) {
             UnOpenedProduct starter = new UnOpenedProduct(starters.get(unlockedSet.getCode()));
diff --git a/forge-gui/src/main/java/forge/quest/QuestWorld.java b/forge-gui/src/main/java/forge/quest/QuestWorld.java
index cc44ae603c7..b5a27b5b04c 100644
--- a/forge-gui/src/main/java/forge/quest/QuestWorld.java
+++ b/forge-gui/src/main/java/forge/quest/QuestWorld.java
@@ -145,8 +145,8 @@ public class QuestWorld implements Comparable<QuestWorld>{
             String useDir = null;
             GameFormatQuest useFormat = null;
 
-            final List<String> sets = new ArrayList<String>();
-            final List<String> bannedCards = new ArrayList<String>(); // if both empty, no format
+            final List<String> sets = new ArrayList<>();
+            final List<String> bannedCards = new ArrayList<>(); // if both empty, no format
 
             String key, value;
             String[] pieces = line.split("\\|");
@@ -234,7 +234,7 @@ public class QuestWorld implements Comparable<QuestWorld>{
     }
 
     public static Set<QuestWorld> getAllQuestWorldsOfCard(PaperCard card) {
-        Set<QuestWorld> result = new HashSet<QuestWorld>();
+        Set<QuestWorld> result = new HashSet<>();
         for (QuestWorld qw : FModel.getWorlds()) {
             GameFormat format = qw.getFormat();
             if (format == null) {
@@ -248,7 +248,7 @@ public class QuestWorld implements Comparable<QuestWorld>{
     }
 
     public static Set<QuestWorld> getAllQuestWorldsOfDeck(Deck deck) {
-        Set<QuestWorld> result = new HashSet<QuestWorld>();
+        Set<QuestWorld> result = new HashSet<>();
         for (QuestWorld qw : FModel.getWorlds()) {
             GameFormat format = qw.getFormat();
             if (format == null) {
diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestBazaarManager.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestBazaarManager.java
index de2905fb8ed..6e3db328e7a 100644
--- a/forge-gui/src/main/java/forge/quest/bazaar/QuestBazaarManager.java
+++ b/forge-gui/src/main/java/forge/quest/bazaar/QuestBazaarManager.java
@@ -122,10 +122,10 @@ public class QuestBazaarManager {
     }
 
     /** Constant <code>stalls</code>. */
-    private final Map<String, QuestStallDefinition> stalls = new TreeMap<String, QuestStallDefinition>();
+    private final Map<String, QuestStallDefinition> stalls = new TreeMap<>();
     /** Constant <code>items</code>. */
-    private final Map<String, SortedSet<IQuestBazaarItem>> itemsOnStalls = new TreeMap<String, SortedSet<IQuestBazaarItem>>(String.CASE_INSENSITIVE_ORDER);
-    private final Map<String, IQuestBazaarItem> items = new TreeMap<String, IQuestBazaarItem>();
+    private final Map<String, SortedSet<IQuestBazaarItem>> itemsOnStalls = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+    private final Map<String, IQuestBazaarItem> items = new TreeMap<>();
 
     /**
      * <p>
@@ -149,7 +149,7 @@ public class QuestBazaarManager {
      * and maps to appropriate merchant.
      */
     public void buildItems(final QuestController qCtrl) {
-        final Map<String, IQuestBazaarItem> itemSet = new HashMap<String, IQuestBazaarItem>();
+        final Map<String, IQuestBazaarItem> itemSet = new HashMap<>();
 
         for (int iSlot = 0; iSlot < QuestController.MAX_PET_SLOTS; iSlot++) {
 
@@ -164,7 +164,7 @@ public class QuestBazaarManager {
         itemsOnStalls.clear();
 
         for (final QuestStallDefinition thisStall : stalls.values()) {
-            final SortedSet<IQuestBazaarItem> set = new TreeSet<IQuestBazaarItem>();
+            final SortedSet<IQuestBazaarItem> set = new TreeSet<>();
 
             for (final String itemName : thisStall.getItems()) {
                 final IQuestBazaarItem item = itemSet.get(itemName);
@@ -184,7 +184,7 @@ public class QuestBazaarManager {
     public List<IQuestBazaarItem> getItems(final QuestController qCtrl, final String stallName) {
         buildItems(qCtrl);
 
-        final List<IQuestBazaarItem> ret = new ArrayList<IQuestBazaarItem>();
+        final List<IQuestBazaarItem> ret = new ArrayList<>();
 
         final QuestAssets qA = FModel.getQuest().getAssets();
         for (final IQuestBazaarItem purchasable : itemsOnStalls.get(stallName)) {
diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java
index 455b4b114aa..0b84a69e5b0 100644
--- a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java
+++ b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java
@@ -49,7 +49,7 @@ public class QuestPetController implements IQuestBazaarItem {
     @XStreamAsAttribute()
     private final int maxLevel;
 
-    private final List<QuestPetStats> levels = new ArrayList<QuestPetStats>();
+    private final List<QuestPetStats> levels = new ArrayList<>();
 
     @XStreamAsAttribute()
     private final String name;
diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStorage.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStorage.java
index 5c49b541f26..8c30919f90e 100644
--- a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStorage.java
+++ b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStorage.java
@@ -29,9 +29,9 @@ import java.util.Map;
  */
 public class QuestPetStorage {
 
-    private Map<Integer, List<QuestPetController>> petsBySlot = new HashMap<Integer, List<QuestPetController>>();
+    private Map<Integer, List<QuestPetController>> petsBySlot = new HashMap<>();
 
-    private Map<String, QuestPetController> petsByName = new HashMap<String, QuestPetController>();
+    private Map<String, QuestPetController> petsByName = new HashMap<>();
 
     /**
      * TODO: Write javadoc for Constructor.
@@ -95,7 +95,7 @@ public class QuestPetStorage {
         * */
         List<QuestPetController> list = this.petsBySlot.get(Integer.valueOf(iSlot));
         if (null == list) {
-            list = new ArrayList<QuestPetController>();
+            list = new ArrayList<>();
             this.petsBySlot.put(Integer.valueOf(iSlot), list);
         }
         this.petsByName.put(petCtrl.getName(), petCtrl);
@@ -120,7 +120,7 @@ public class QuestPetStorage {
      * @return List
      */
     public List<QuestPetController> getAvaliablePets(final int iSlot, final QuestAssets qA) {
-        final List<QuestPetController> result = new ArrayList<QuestPetController>();
+        final List<QuestPetController> result = new ArrayList<>();
         final List<QuestPetController> allPossible = this.petsBySlot.get(Integer.valueOf(iSlot));
         if (null != allPossible) {
             for (final QuestPetController c : allPossible) {
@@ -139,7 +139,7 @@ public class QuestPetStorage {
      * @return List<QuestPetController>
      */
     public List<QuestPetController> getAllPets(final int iSlot) {
-        final List<QuestPetController> result = new ArrayList<QuestPetController>();
+        final List<QuestPetController> result = new ArrayList<>();
         final List<QuestPetController> allPossible = this.petsBySlot.get(Integer.valueOf(iSlot));
         if (null != allPossible) {
             for (final QuestPetController c : allPossible) {
diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestStallDefinition.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestStallDefinition.java
index 64420a85b9f..af107ee7355 100644
--- a/forge-gui/src/main/java/forge/quest/bazaar/QuestStallDefinition.java
+++ b/forge-gui/src/main/java/forge/quest/bazaar/QuestStallDefinition.java
@@ -69,7 +69,7 @@ public class QuestStallDefinition {
         name = null;
         displayName = null;
         description = null;
-        items = new ArrayList<String>();
+        items = new ArrayList<>();
         icon = null;
     }
 
diff --git a/forge-gui/src/main/java/forge/quest/data/GameFormatQuest.java b/forge-gui/src/main/java/forge/quest/data/GameFormatQuest.java
index 6b6876dff77..b7da238eb3e 100644
--- a/forge-gui/src/main/java/forge/quest/data/GameFormatQuest.java
+++ b/forge-gui/src/main/java/forge/quest/data/GameFormatQuest.java
@@ -75,7 +75,7 @@ public final class GameFormatQuest extends GameFormat {
 	 */
 	public List<String> getLockedSets() {
 
-		List<String> exSets = new ArrayList<String>();
+		List<String> exSets = new ArrayList<>();
 		if (this.allowedSetCodes.isEmpty()) {
 			return exSets;
 		}
diff --git a/forge-gui/src/main/java/forge/quest/data/QuestAssets.java b/forge-gui/src/main/java/forge/quest/data/QuestAssets.java
index 6140c1d5b64..98e03b13394 100644
--- a/forge-gui/src/main/java/forge/quest/data/QuestAssets.java
+++ b/forge-gui/src/main/java/forge/quest/data/QuestAssets.java
@@ -41,7 +41,7 @@ public class QuestAssets {
 
     // Cards associated with quest
     /** The card pool. */
-    private final ItemPool<PaperCard> cardPool = new ItemPool<PaperCard>(PaperCard.class); // player's
+    private final ItemPool<PaperCard> cardPool = new ItemPool<>(PaperCard.class); // player's
     /** The credits. */
     private long credits; // this money is good for all modes
     // game
@@ -49,25 +49,25 @@ public class QuestAssets {
 
     // Decks collected by player
     /** The my decks. */
-    private final HashMap<String, Deck> myDecks = new HashMap<String, Deck>();
+    private final HashMap<String, Deck> myDecks = new HashMap<>();
     // current
     // shop
     // list
     /** The new card list. */
-    private final ItemPool<InventoryItem> newCardList = new ItemPool<InventoryItem>(InventoryItem.class); // cards
+    private final ItemPool<InventoryItem> newCardList = new ItemPool<>(InventoryItem.class); // cards
     // belonging
     /** The shop list. */
-    private final ItemPool<InventoryItem> shopList = new ItemPool<InventoryItem>(InventoryItem.class); // the
+    private final ItemPool<InventoryItem> shopList = new ItemPool<>(InventoryItem.class); // the
     // gadgets
 
     /** The inventory items. */
-    private final Map<QuestItemType, QuestItemCondition> inventoryItems = new EnumMap<QuestItemType, QuestItemCondition>(
+    private final Map<QuestItemType, QuestItemCondition> inventoryItems = new EnumMap<>(
             QuestItemType.class);
 
     // Much the same like other map, but keyed by string (to support a lot of custom pets)
-    private final Map<String, QuestItemCondition> combatPets = new HashMap<String, QuestItemCondition>();
+    private final Map<String, QuestItemCondition> combatPets = new HashMap<>();
     
-    private final HashMap<String, DeckGroup> draftDecks = new HashMap<String, DeckGroup>();
+    private final HashMap<String, DeckGroup> draftDecks = new HashMap<>();
     /**
      * Checks for item.
      *
diff --git a/forge-gui/src/main/java/forge/quest/data/QuestData.java b/forge-gui/src/main/java/forge/quest/data/QuestData.java
index 41574634113..1d41cc4b013 100644
--- a/forge-gui/src/main/java/forge/quest/data/QuestData.java
+++ b/forge-gui/src/main/java/forge/quest/data/QuestData.java
@@ -66,7 +66,7 @@ public final class QuestData {
     private final Map<Integer, String> petSlots = new HashMap<>();
     private int matchLength = 3;
 
-    public HashSet<StarRating> Ratings = new HashSet<StarRating>();
+    public HashSet<StarRating> Ratings = new HashSet<>();
 
     public String currentDeck = "DEFAULT";
 
diff --git a/forge-gui/src/main/java/forge/sound/SoundSystem.java b/forge-gui/src/main/java/forge/sound/SoundSystem.java
index a7e23a1d176..8e69ef87e0b 100644
--- a/forge-gui/src/main/java/forge/sound/SoundSystem.java
+++ b/forge-gui/src/main/java/forge/sound/SoundSystem.java
@@ -23,8 +23,8 @@ public class SoundSystem {
     public static final int DELAY = 30;
 
     private static final IAudioClip emptySound = new NoSoundClip();
-    private static final Map<SoundEffectType, IAudioClip> loadedClips = new EnumMap<SoundEffectType, IAudioClip>(SoundEffectType.class);
-    private static final Map<String, IAudioClip> loadedScriptClips = new HashMap<String, IAudioClip>();
+    private static final Map<SoundEffectType, IAudioClip> loadedClips = new EnumMap<>(SoundEffectType.class);
+    private static final Map<String, IAudioClip> loadedScriptClips = new HashMap<>();
 
     private final EventVisualizer visualizer;
 
diff --git a/forge-gui/src/main/java/forge/tournament/TournamentData.java b/forge-gui/src/main/java/forge/tournament/TournamentData.java
index c045179161f..7064ce4b024 100644
--- a/forge-gui/src/main/java/forge/tournament/TournamentData.java
+++ b/forge-gui/src/main/java/forge/tournament/TournamentData.java
@@ -23,8 +23,8 @@ public class TournamentData {
 
     private int completed;
     private String timestamp;
-    private List<String> eventRecords = new ArrayList<String>();
-    private List<String> eventNames = new ArrayList<String>();
+    private List<String> eventRecords = new ArrayList<>();
+    private List<String> eventNames = new ArrayList<>();
     private Deck userDeck;
     private List<Deck> decks;
 
@@ -94,7 +94,7 @@ public class TournamentData {
     }
 
     public List<String> getDeckNames() {
-        final List<String> names = new ArrayList<String>();
+        final List<String> names = new ArrayList<>();
         for (final Deck d : decks) { names.add(d.getName()); }
         return names;
     }
diff --git a/forge-gui/src/main/java/forge/tournament/TournamentUtil.java b/forge-gui/src/main/java/forge/tournament/TournamentUtil.java
index 5176fb8856b..ebf1c426e60 100644
--- a/forge-gui/src/main/java/forge/tournament/TournamentUtil.java
+++ b/forge-gui/src/main/java/forge/tournament/TournamentUtil.java
@@ -20,8 +20,8 @@ public class TournamentUtil {
 
         // Generate tournament decks
         Deck deck;
-        final List<String> eventNames = new ArrayList<String>();
-        final List<Deck> decks = new ArrayList<Deck>();
+        final List<String> eventNames = new ArrayList<>();
+        final List<Deck> decks = new ArrayList<>();
 
         for (int i = 0; i < numOpponents; i++) {
             int randType = (int)Math.floor(MyRandom.getRandom().nextDouble() * allowedDeckTypes.size());
@@ -81,7 +81,7 @@ public class TournamentUtil {
 
     public static void setDefaultTournamentName(TournamentData tournament, String prefix) {
         final File[] arrFiles = TournamentIO.getTournamentFilesUnlocked(prefix);
-        final Set<String> setNames = new HashSet<String>();
+        final Set<String> setNames = new HashSet<>();
         for (File f : arrFiles) {
             setNames.add(f.getName());
         }
diff --git a/forge-gui/src/main/java/forge/util/IgnoringXStream.java b/forge-gui/src/main/java/forge/util/IgnoringXStream.java
index bb4c0a12ce6..e8b5e997818 100644
--- a/forge-gui/src/main/java/forge/util/IgnoringXStream.java
+++ b/forge-gui/src/main/java/forge/util/IgnoringXStream.java
@@ -16,7 +16,7 @@ import java.util.List;
  * (but are there any fields?)
  */
 public class IgnoringXStream extends XStream {
-    private final List<String> ignoredFields = new ArrayList<String>();
+    private final List<String> ignoredFields = new ArrayList<>();
 
     @Override
     protected MapperWrapper wrapMapper(final MapperWrapper next) {
diff --git a/forge-gui/src/main/java/forge/util/LineReader.java b/forge-gui/src/main/java/forge/util/LineReader.java
index b89057a0214..7657bd949b3 100644
--- a/forge-gui/src/main/java/forge/util/LineReader.java
+++ b/forge-gui/src/main/java/forge/util/LineReader.java
@@ -118,7 +118,7 @@ public class LineReader implements Iterable<String>, Closeable {
      * @return The lines read from the stream.
      */
     public Collection<String> readLines() {
-        final Collection<String> lines = new ArrayList<String>();
+        final Collection<String> lines = new ArrayList<>();
         for (final String line : this) {
             lines.add(line);
         }
diff --git a/forge-gui/src/main/java/forge/util/XmlReader.java b/forge-gui/src/main/java/forge/util/XmlReader.java
index 9b2c3eeabae..5af330e66a4 100644
--- a/forge-gui/src/main/java/forge/util/XmlReader.java
+++ b/forge-gui/src/main/java/forge/util/XmlReader.java
@@ -69,19 +69,19 @@ public class XmlReader {
         return parseChildElements(key, null, collectionType, paperCardBuilder);
     }
     public <T extends IXmlWritable> T read(String key, Class<T> type) {
-        return parseChildElements(key, new GenericBuilder<T>(type));
+        return parseChildElements(key, new GenericBuilder<>(type));
     }
     public <V extends IXmlWritable, T extends Collection<V>> void read(String key, T collectionToLoad, Class<V> elementType) {
-        parseChildElements(key, collectionToLoad, null, new GenericBuilder<V>(elementType));
+        parseChildElements(key, collectionToLoad, null, new GenericBuilder<>(elementType));
     }
     public <V extends IXmlWritable, T extends Collection<V>> T read(String key, Class<T> collectionType, Class<V> elementType) {
-        return parseChildElements(key, null, collectionType, new GenericBuilder<V>(elementType));
+        return parseChildElements(key, null, collectionType, new GenericBuilder<>(elementType));
     }
     public <V extends IXmlWritable> void read(final String key, final V[] array, final Class<V> elementType) {
         parseChildElements(key, new Evaluator<Void>() {
             @Override
             public Void evaluate() {
-                final GenericBuilder<V> builder = new GenericBuilder<V>(elementType);
+                final GenericBuilder<V> builder = new GenericBuilder<>(elementType);
                 return parseChildElements(null, new Evaluator<Void>() {
                     @Override
                     public Void evaluate() {
@@ -107,7 +107,7 @@ public class XmlReader {
         parseChildElements(key, new Evaluator<Void>() {
             @Override
             public Void evaluate() {
-                final GenericBuilder<V> builder = new GenericBuilder<V>(valueType);
+                final GenericBuilder<V> builder = new GenericBuilder<>(valueType);
                 return parseChildElements(null, new Evaluator<Void>() {
                     @Override
                     public Void evaluate() {
@@ -131,7 +131,7 @@ public class XmlReader {
         parseChildElements(key, new Evaluator<Void>() {
             @Override
             public Void evaluate() {
-                final GenericBuilder<V> builder = new GenericBuilder<V>(valueType);
+                final GenericBuilder<V> builder = new GenericBuilder<>(valueType);
                 return parseChildElements(null, new Evaluator<Void>() {
                     @Override
                     public Void evaluate() {
diff --git a/forge-gui/src/main/java/forge/util/XmlWriter.java b/forge-gui/src/main/java/forge/util/XmlWriter.java
index 09b406f50c2..3c6cddcaaf6 100644
--- a/forge-gui/src/main/java/forge/util/XmlWriter.java
+++ b/forge-gui/src/main/java/forge/util/XmlWriter.java
@@ -17,7 +17,7 @@ import forge.item.PaperCard;
 public class XmlWriter {
     private final Document document;
     private final String filename;
-    private final Stack<Element> parentElements = new Stack<Element>();
+    private final Stack<Element> parentElements = new Stack<>();
 
     private Element currentElement;
 
diff --git a/forge-gui/src/main/java/forge/util/gui/SGuiChoose.java b/forge-gui/src/main/java/forge/util/gui/SGuiChoose.java
index 0575d80adb6..4b8fcb3d860 100644
--- a/forge-gui/src/main/java/forge/util/gui/SGuiChoose.java
+++ b/forge-gui/src/main/java/forge/util/gui/SGuiChoose.java
@@ -105,7 +105,7 @@ public class SGuiChoose {
             return getInteger(message, min, max);
         }
 
-        final List<Object> choices = new ArrayList<Object>();
+        final List<Object> choices = new ArrayList<>();
         for (int i = min; i <= cutoff; i++) {
             choices.add(Integer.valueOf(i));
         }