external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Net Deck Archive Categories (Android implementation)

Browse Source
This commit is contained in:
Churrufli
2021-03-02 10:08:15 +01:00
parent 9952e0ff88
commit 0219991703
2 changed files with 128 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
forge-gui-mobile/src/forge/deck/FDeckChooser.java
View File

@@ -63,7 +63,10 @@ public class FDeckChooser extends FScreen {
private Callback<Deck> callback; private Callback<Deck> callback;
private NetDeckCategory netDeckCategory; private NetDeckCategory netDeckCategory;
private NetDeckArchiveStandard NetDeckArchiveStandard; private NetDeckArchiveStandard NetDeckArchiveStandard;
private NetDeckArchivePioneer NetDeckArchivePioneer;
private NetDeckArchiveModern NetDeckArchiveModern; private NetDeckArchiveModern NetDeckArchiveModern;
private NetDeckArchiveLegacy NetDeckArchiveLegacy;
private NetDeckArchiveVintage NetDeckArchiveVintage;
private boolean refreshingDeckType; private boolean refreshingDeckType;
private boolean firstactivation = true; private boolean firstactivation = true;
@@ -532,7 +535,10 @@ public class FDeckChooser extends FScreen {
cmbDeckTypes.addItem(DeckType.RANDOM_DECK); cmbDeckTypes.addItem(DeckType.RANDOM_DECK);
cmbDeckTypes.addItem(DeckType.NET_DECK); cmbDeckTypes.addItem(DeckType.NET_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_STANDARD_DECK); cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_STANDARD_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_PIONEER_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_MODERN_DECK); cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_MODERN_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_LEGACY_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_VINTAGE_DECK);
break; break;
case Commander: case Commander:
case Oathbreaker: case Oathbreaker:
@@ -546,8 +552,6 @@ public class FDeckChooser extends FScreen {
} }
cmbDeckTypes.addItem(DeckType.RANDOM_COMMANDER_DECK); cmbDeckTypes.addItem(DeckType.RANDOM_COMMANDER_DECK);
cmbDeckTypes.addItem(DeckType.NET_DECK); cmbDeckTypes.addItem(DeckType.NET_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_STANDARD_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_MODERN_DECK);
break; break;
case DeckManager: case DeckManager:
cmbDeckTypes.addItem(DeckType.CONSTRUCTED_DECK); cmbDeckTypes.addItem(DeckType.CONSTRUCTED_DECK);
@@ -565,7 +569,10 @@ public class FDeckChooser extends FScreen {
cmbDeckTypes.addItem(DeckType.NET_DECK); cmbDeckTypes.addItem(DeckType.NET_DECK);
cmbDeckTypes.addItem(DeckType.NET_COMMANDER_DECK); cmbDeckTypes.addItem(DeckType.NET_COMMANDER_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_STANDARD_DECK); cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_STANDARD_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_PIONEER_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_MODERN_DECK); cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_MODERN_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_LEGACY_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_VINTAGE_DECK);
break; break;
default: default:
cmbDeckTypes.addItem(DeckType.CUSTOM_DECK); cmbDeckTypes.addItem(DeckType.CUSTOM_DECK);
@@ -607,7 +614,7 @@ public class FDeckChooser extends FScreen {
}); });
return; return;
} }
///
if ((deckType == DeckType.NET_ARCHIVE_STANDARD_DECK&& !refreshingDeckType)) { if ((deckType == DeckType.NET_ARCHIVE_STANDARD_DECK&& !refreshingDeckType)) {
FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
@Override @Override
@@ -634,6 +641,34 @@ public class FDeckChooser extends FScreen {
}); });
return; return;
} }
if ((deckType == DeckType.NET_ARCHIVE_PIONEER_DECK&& !refreshingDeckType)) {
FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
@Override
public void run() {
GameType gameType = lstDecks.getGameType();
final NetDeckArchivePioneer category = NetDeckArchivePioneer.selectAndLoad(gameType);
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
if (category == null) {
cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
if (selectedDeckType == deckType && NetDeckArchivePioneer != null) {
cmbDeckTypes.setText(NetDeckArchivePioneer.getDeckType());
}
return;
}
NetDeckArchivePioneer = category;
refreshDecksList(deckType, true, e);
}
});
}
});
return;
}
if ((deckType == DeckType.NET_ARCHIVE_MODERN_DECK&& !refreshingDeckType)) { if ((deckType == DeckType.NET_ARCHIVE_MODERN_DECK&& !refreshingDeckType)) {
FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
@Override @Override
@@ -660,7 +695,64 @@ public class FDeckChooser extends FScreen {
}); });
return; return;
} }
///
if ((deckType == DeckType.NET_ARCHIVE_LEGACY_DECK&& !refreshingDeckType)) {
FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
@Override
public void run() {
GameType gameType = lstDecks.getGameType();
final NetDeckArchiveLegacy category = NetDeckArchiveLegacy.selectAndLoad(gameType);
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
if (category == null) {
cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
if (selectedDeckType == deckType && NetDeckArchiveLegacy != null) {
cmbDeckTypes.setText(NetDeckArchiveLegacy.getDeckType());
}
return;
}
NetDeckArchiveLegacy = category;
refreshDecksList(deckType, true, e);
}
});
}
});
return;
}
if ((deckType == DeckType.NET_ARCHIVE_VINTAGE_DECK&& !refreshingDeckType)) {
FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
@Override
public void run() {
GameType gameType = lstDecks.getGameType();
final NetDeckArchiveVintage category = NetDeckArchiveVintage.selectAndLoad(gameType);
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
if (category == null) {
cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
if (selectedDeckType == deckType && NetDeckArchiveVintage != null) {
cmbDeckTypes.setText(NetDeckArchiveVintage.getDeckType());
}
return;
}
NetDeckArchiveVintage = category;
refreshDecksList(deckType, true, e);
}
});
}
});
return;
}
refreshDecksList(deckType, false, e); refreshDecksList(deckType, false, e);
} }
}); });
@@ -858,10 +950,23 @@ public class FDeckChooser extends FScreen {
pool = DeckProxy.getNetArchiveStandardDecks(NetDeckArchiveStandard); pool = DeckProxy.getNetArchiveStandardDecks(NetDeckArchiveStandard);
config = ItemManagerConfig.NET_ARCHIVE_STANDARD_DECKS; config = ItemManagerConfig.NET_ARCHIVE_STANDARD_DECKS;
break; break;
case NET_ARCHIVE_PIONEER_DECK:
pool = DeckProxy.getNetArchivePioneerDecks(NetDeckArchivePioneer);
config = ItemManagerConfig.NET_ARCHIVE_PIONEER_DECKS;
break;
case NET_ARCHIVE_MODERN_DECK: case NET_ARCHIVE_MODERN_DECK:
pool = DeckProxy.getNetArchiveModernDecks(NetDeckArchiveModern); pool = DeckProxy.getNetArchiveModernDecks(NetDeckArchiveModern);
config = ItemManagerConfig.NET_ARCHIVE_STANDARD_DECKS; config = ItemManagerConfig.NET_ARCHIVE_MODERN_DECKS;
break; break;
case NET_ARCHIVE_LEGACY_DECK:
pool = DeckProxy.getNetArchiveLegacyDecks(NetDeckArchiveLegacy);
config = ItemManagerConfig.NET_ARCHIVE_LEGACY_DECKS;
break;
case NET_ARCHIVE_VINTAGE_DECK:
pool = DeckProxy.getNetArchiveVintageDecks(NetDeckArchiveVintage);
config = ItemManagerConfig.NET_ARCHIVE_VINTAGE_DECKS;
break;
case NET_DECK: case NET_DECK:
case NET_COMMANDER_DECK: case NET_COMMANDER_DECK:
if (netDeckCategory != null) { if (netDeckCategory != null) {
@@ -1129,10 +1234,22 @@ public class FDeckChooser extends FScreen {
NetDeckArchiveStandard = NetDeckArchiveStandard.selectAndLoad(lstDecks.getGameType(), deckType.substring(NetDeckArchiveStandard.PREFIX.length())); NetDeckArchiveStandard = NetDeckArchiveStandard.selectAndLoad(lstDecks.getGameType(), deckType.substring(NetDeckArchiveStandard.PREFIX.length()));
return DeckType.NET_ARCHIVE_STANDARD_DECK; return DeckType.NET_ARCHIVE_STANDARD_DECK;
} }
if (deckType.startsWith(NetDeckArchivePioneer.PREFIX)) {
NetDeckArchivePioneer = NetDeckArchivePioneer.selectAndLoad(lstDecks.getGameType(), deckType.substring(NetDeckArchivePioneer.PREFIX.length()));
return DeckType.NET_ARCHIVE_PIONEER_DECK;
}
if (deckType.startsWith(NetDeckArchiveModern.PREFIX)) { if (deckType.startsWith(NetDeckArchiveModern.PREFIX)) {
NetDeckArchiveModern = NetDeckArchiveModern.selectAndLoad(lstDecks.getGameType(), deckType.substring(NetDeckArchiveModern.PREFIX.length())); NetDeckArchiveModern = NetDeckArchiveModern.selectAndLoad(lstDecks.getGameType(), deckType.substring(NetDeckArchiveModern.PREFIX.length()));
return DeckType.NET_ARCHIVE_MODERN_DECK; return DeckType.NET_ARCHIVE_MODERN_DECK;
} }
if (deckType.startsWith(NetDeckArchiveLegacy.PREFIX)) {
NetDeckArchiveLegacy = NetDeckArchiveLegacy.selectAndLoad(lstDecks.getGameType(), deckType.substring(NetDeckArchiveLegacy.PREFIX.length()));
return DeckType.NET_ARCHIVE_LEGACY_DECK;
}
if (deckType.startsWith(NetDeckArchiveVintage.PREFIX)) {
NetDeckArchiveVintage = NetDeckArchiveVintage.selectAndLoad(lstDecks.getGameType(), deckType.substring(NetDeckArchiveVintage.PREFIX.length()));
return DeckType.NET_ARCHIVE_VINTAGE_DECK;
}
return DeckType.valueOf(deckType); return DeckType.valueOf(deckType);
} }
} }
@@ -1211,7 +1328,10 @@ public class FDeckChooser extends FScreen {
DeckType.THEME_DECK, DeckType.THEME_DECK,
DeckType.NET_DECK, DeckType.NET_DECK,
DeckType.NET_ARCHIVE_STANDARD_DECK, DeckType.NET_ARCHIVE_STANDARD_DECK,
DeckType.NET_ARCHIVE_MODERN_DECK DeckType.NET_ARCHIVE_PIONEER_DECK,
DeckType.NET_ARCHIVE_MODERN_DECK,
DeckType.NET_ARCHIVE_VINTAGE_DECK,
DeckType.NET_ARCHIVE_LEGACY_DECK
); );
if (!FModel.isdeckGenMatrixLoaded()) { if (!FModel.isdeckGenMatrixLoaded()) {

2
forge-gui/src/main/java/forge/itemmanager/ItemManagerConfig.java
View File

@@ -108,6 +108,8 @@ public enum ItemManagerConfig {
null, null, 3, 0), null, null, 3, 0),
NET_ARCHIVE_LEGACY_DECKS(SColumnUtil.getDecksDefaultColumns(false, false), false, false, false, NET_ARCHIVE_LEGACY_DECKS(SColumnUtil.getDecksDefaultColumns(false, false), false, false, false,
null, null, 3, 0), null, null, 3, 0),
NET_ARCHIVE_VINTAGE_DECKS(SColumnUtil.getDecksDefaultColumns(false, false), false, false, false,
null, null, 3, 0),
SIDEBOARD(SColumnUtil.getDeckEditorDefaultColumns(), false, false, true, SIDEBOARD(SColumnUtil.getDeckEditorDefaultColumns(), false, false, true,
GroupDef.DEFAULT, ColumnDef.CMC, 3, 0); GroupDef.DEFAULT, ColumnDef.CMC, 3, 0);