improve 'by station' potion order sorting (hex-agon#80)

src/main/java/work/fking/masteringmixology/PotionComparators.java

@@ -0,0 +1,24 @@
+package work.fking.masteringmixology;
+
+import java.util.Comparator;
+
+public class PotionComparators {
+
+    // Sort by modifier, in the order CRYSTALISED > HOMOGENOUS > CONCENTRATED
+    // And then by PotionType name alphabetically
+    public static Comparator<PotionOrder> byStation() {
+        return Comparator.comparingInt((PotionOrder order) -> {
+                    switch (order.potionModifier()) {
+                        case CRYSTALISED:
+                            return 0;
+                        case HOMOGENOUS:
+                            return 1;
+                        case CONCENTRATED:
+                            return 2;
+                        default:
+                            return Integer.MAX_VALUE;
+                    }
+                })
+                .thenComparing(order -> order.potionType().name());
+    }
+}

src/main/java/work/fking/masteringmixology/PotionOrderSorting.java

@@ -4,7 +4,7 @@
 
 public enum PotionOrderSorting {
     VANILLA("Vanilla (random)", null),
-    BY_STATION("By station", Comparator.comparing(order -> order.potionModifier().ordinal()));
+    BY_STATION("By station", PotionComparators.byStation());
 
     private final String name;
     private final Comparator<PotionOrder> comparator;