diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveBlock.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveBlock.java index 64d4fd90bb6..5cd139add2c 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveBlock.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveBlock.java @@ -3,10 +3,7 @@ package forge.deck; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; import forge.GuiBase; import forge.deck.io.DeckSerializer; @@ -73,7 +70,10 @@ public class NetDeckArchiveBlock extends StorageBase { return category; } - final NetDeckArchiveBlock c = SGuiChoose.oneOrNone("Select a Net Deck Archive Block category", categories.values()); + List category = new ArrayList<>(categories.values()); + Collections.reverse(category); + + final NetDeckArchiveBlock c = SGuiChoose.oneOrNone("Select a Net Deck Archive Block category", category); if (c == null) { return null; } if (c.map.isEmpty()) { //only download decks once per session diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java index bf2eeecba6b..c55b9053f0b 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveLegacy.java @@ -3,10 +3,7 @@ package forge.deck; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; import forge.GuiBase; import forge.deck.io.DeckSerializer; @@ -73,7 +70,10 @@ public class NetDeckArchiveLegacy extends StorageBase { return category; } - final NetDeckArchiveLegacy c = SGuiChoose.oneOrNone("Select a Net Deck Archive Legacy category", categories.values()); + List category = new ArrayList<>(categories.values()); + Collections.reverse(category); + + final NetDeckArchiveLegacy c = SGuiChoose.oneOrNone("Select a Net Deck Archive Legacy category", category); if (c == null) { return null; } if (c.map.isEmpty()) { //only download decks once per session diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java index eff1b65a6fa..05a599cf966 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveModern.java @@ -3,10 +3,7 @@ package forge.deck; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; import forge.GuiBase; import forge.deck.io.DeckSerializer; @@ -73,7 +70,10 @@ public class NetDeckArchiveModern extends StorageBase { return category; } - final NetDeckArchiveModern c = SGuiChoose.oneOrNone("Select a Net Deck Archive Modern category", categories.values()); + List category = new ArrayList<>(categories.values()); + Collections.reverse(category); + + final NetDeckArchiveModern c = SGuiChoose.oneOrNone("Select a Net Deck Archive Modern category", category); if (c == null) { return null; } if (c.map.isEmpty()) { //only download decks once per session diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java b/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java index 896382e54ae..335ce095849 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchivePioneer.java @@ -3,10 +3,7 @@ package forge.deck; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; import forge.GuiBase; import forge.deck.io.DeckSerializer; @@ -73,7 +70,10 @@ public class NetDeckArchivePioneer extends StorageBase { return category; } - final NetDeckArchivePioneer c = SGuiChoose.oneOrNone("Select a Net Deck Archive Pioneer category", categories.values()); + List category = new ArrayList<>(categories.values()); + Collections.reverse(category); + + final NetDeckArchivePioneer c = SGuiChoose.oneOrNone("Select a Net Deck Archive Pioneer category", category); if (c == null) { return null; } if (c.map.isEmpty()) { //only download decks once per session diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java index 5485abe92fc..e9ecd622765 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveStandard.java @@ -3,10 +3,7 @@ package forge.deck; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; import forge.GuiBase; import forge.deck.io.DeckSerializer; @@ -73,7 +70,10 @@ public class NetDeckArchiveStandard extends StorageBase { return category; } - final NetDeckArchiveStandard c = SGuiChoose.oneOrNone("Select a Net Deck Archive Standard category", categories.values()); + List category = new ArrayList<>(categories.values()); + Collections.reverse(category); + + final NetDeckArchiveStandard c = SGuiChoose.oneOrNone("Select a Net Deck Archive Standard category",category); if (c == null) { return null; } if (c.map.isEmpty()) { //only download decks once per session diff --git a/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java b/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java index b472943e815..5554925a960 100644 --- a/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java +++ b/forge-gui/src/main/java/forge/deck/NetDeckArchiveVintage.java @@ -3,10 +3,7 @@ package forge.deck; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; import forge.GuiBase; import forge.deck.io.DeckSerializer; @@ -73,7 +70,10 @@ public class NetDeckArchiveVintage extends StorageBase { return category; } - final NetDeckArchiveVintage c = SGuiChoose.oneOrNone("Select a Net Deck Archive Vintage category", categories.values()); + List category = new ArrayList<>(categories.values()); + Collections.reverse(category); + + final NetDeckArchiveVintage c = SGuiChoose.oneOrNone("Select a Net Deck Archive Vintage category", category); if (c == null) { return null; } if (c.map.isEmpty()) { //only download decks once per session