#13 - Some more Set -> List; also using EnumSet for enums.

Author: bytekeeper

src/main/java/bwapi/TechType.java

@@ -1,8 +1,7 @@
 package bwapi;
 
 import java.util.Arrays;
-import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.List;
 
 import static bwapi.Order.*;
 
@@ -223,8 +222,8 @@ public boolean targetsPosition() {
         return (techTypeFlags[id] & TARG_POS) != 0;
     }
 
-    public Set<UnitType> whatsUses() {
-        return Arrays.stream(techWhatUses[id]).collect(Collectors.toSet());
+    public List<UnitType> whatsUses() {
+        return Arrays.asList(techWhatUses[id]);
     }
 
     public Order getOrder() {

src/main/java/bwapi/Unit.java

@@ -13,10 +13,10 @@
 import static bwapi.UnitType.*;
 
 public class Unit {
-    private static Set<Order> gatheringGasOrders = new HashSet<>(Arrays.asList(
-            Harvest1, Harvest2, MoveToGas, WaitForGas, HarvestGas, ReturnGas, ResetCollision));
-    private static Set<Order> gatheringMineralOrders = new HashSet<>(Arrays.asList(
-            Harvest1, Harvest2, MoveToMinerals, WaitForMinerals, MiningMinerals, ReturnMinerals, ResetCollision));
+    private static Set<Order> gatheringGasOrders = EnumSet.of(
+            Harvest1, Harvest2, MoveToGas, WaitForGas, HarvestGas, ReturnGas, ResetCollision);
+    private static Set<Order> gatheringMineralOrders = EnumSet.of(
+            Harvest1, Harvest2, MoveToMinerals, WaitForMinerals, MiningMinerals, ReturnMinerals, ResetCollision);
     private final UnitData unitData;
     private final Game game;
     // static

src/main/java/bwapi/UnitCommand.java

@@ -1,16 +1,13 @@
 package bwapi;
 
 
-import java.util.Arrays;
-import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Set;
 
 import static bwapi.UnitCommandType.*;
 
 public class UnitCommand {
-    private static Set<UnitCommandType> posComs = new HashSet<>(
-            Arrays.asList(Build, Land, Place_COP)
-    );
+    private static Set<UnitCommandType> posComs = EnumSet.of(Build, Land, Place_COP);
     final UnitCommandType type;
     final Unit target;
     final int x;

src/main/java/bwapi/UpgradeType.java

@@ -1,8 +1,7 @@
 package bwapi;
 
 import java.util.Arrays;
-import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.List;
 
 public enum UpgradeType {
     Terran_Infantry_Armor(0),
@@ -252,8 +251,8 @@ public UnitType whatUpgrades() {
         return whatUpgrades[id];
     }
 
-    public Set<UnitType> whatUses() {
-        return Arrays.stream(upgradeWhatUses[id]).collect(Collectors.toSet());
+    public List<UnitType> whatUses() {
+        return Arrays.asList(upgradeWhatUses[id]);
     }
 
     public int maxRepeats() {