external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 09:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring

Browse Source
This commit is contained in:
leriomaggio
2021-07-23 22:38:23 +01:00
parent b3ce4bf9ff ef917a91b9
commit 01d117b07e
299 changed files with 3647 additions and 1286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,6 +65,7 @@ public class FDeckChooser extends FScreen {
private NetDeckArchiveStandard NetDeckArchiveStandard;
private NetDeckArchivePioneer NetDeckArchivePioneer;
private NetDeckArchiveModern NetDeckArchiveModern;
private NetDeckArchivePauper NetDeckArchivePauper;
private NetDeckArchiveLegacy NetDeckArchiveLegacy;
private NetDeckArchiveVintage NetDeckArchiveVintage;
private NetDeckArchiveBlock NetDeckArchiveBlock;
@@ -542,6 +543,7 @@ public class FDeckChooser extends FScreen {
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_PAUPER_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_LEGACY_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_VINTAGE_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_BLOCK_DECK);
@@ -578,6 +580,7 @@ public class FDeckChooser extends FScreen {
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_PAUPER_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_LEGACY_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_VINTAGE_DECK);
cmbDeckTypes.addItem(DeckType.NET_ARCHIVE_BLOCK_DECK);
@@ -703,6 +706,32 @@ public class FDeckChooser extends FScreen {
});
return;
}
if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_PAUPER_DECK)) {
FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
@Override
public void run() {
GameType gameType = lstDecks.getGameType();
final NetDeckArchivePauper category = NetDeckArchivePauper.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 && NetDeckArchivePauper != null) {
cmbDeckTypes.setText(NetDeckArchivePauper.getDeckType());
}
return;
}
NetDeckArchivePauper = category;
refreshDecksList(deckType, true, e);
}
});
}
});
return;
}
if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_LEGACY_DECK)) {
FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
@Override
@@ -755,9 +784,6 @@ public class FDeckChooser extends FScreen {
});
return;
}
if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_BLOCK_DECK)) {
FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
@Override
@@ -787,7 +813,6 @@ public class FDeckChooser extends FScreen {
refreshDecksList(deckType, false, e);
}
});
@@ -1010,6 +1035,13 @@ public class FDeckChooser extends FScreen {
pool = DeckProxy.getNetArchiveModernDecks(NetDeckArchiveModern);
config = ItemManagerConfig.NET_ARCHIVE_MODERN_DECKS;
break;
case NET_ARCHIVE_PAUPER_DECK:
if (NetDeckArchivePauper!= null) {
cmbDeckTypes.setText(NetDeckArchivePauper.getDeckType());
}
pool = DeckProxy.getNetArchivePauperDecks(NetDeckArchivePauper);
config = ItemManagerConfig.NET_ARCHIVE_PAUPER_DECKS;
break;
case NET_ARCHIVE_LEGACY_DECK:
if (NetDeckArchiveLegacy != null) {
cmbDeckTypes.setText(NetDeckArchiveLegacy.getDeckType());
@@ -1028,7 +1060,7 @@ public class FDeckChooser extends FScreen {
if (NetDeckArchiveBlock!= null) {
cmbDeckTypes.setText(NetDeckArchiveBlock.getDeckType());
}
pool = DeckProxy.getNetArchiveBlockecks(NetDeckArchiveBlock);
pool = DeckProxy.getNetArchiveBlockDecks(NetDeckArchiveBlock);
config = ItemManagerConfig.NET_ARCHIVE_BLOCK_DECKS;
break;
case NET_DECK:
@@ -1306,6 +1338,10 @@ public class FDeckChooser extends FScreen {
NetDeckArchiveModern = NetDeckArchiveModern.selectAndLoad(lstDecks.getGameType(), deckType.substring(NetDeckArchiveModern.PREFIX.length()));
return DeckType.NET_ARCHIVE_MODERN_DECK;
}
if (deckType.startsWith(NetDeckArchivePauper.PREFIX)) {
NetDeckArchivePauper = NetDeckArchivePauper.selectAndLoad(lstDecks.getGameType(), deckType.substring(NetDeckArchivePauper.PREFIX.length()));
return DeckType.NET_ARCHIVE_PAUPER_DECK;
}
if (deckType.startsWith(NetDeckArchiveLegacy.PREFIX)) {
NetDeckArchiveLegacy = NetDeckArchiveLegacy.selectAndLoad(lstDecks.getGameType(), deckType.substring(NetDeckArchiveLegacy.PREFIX.length()));
return DeckType.NET_ARCHIVE_LEGACY_DECK;
@@ -1399,8 +1435,10 @@ public class FDeckChooser extends FScreen {
DeckType.NET_ARCHIVE_STANDARD_DECK,
DeckType.NET_ARCHIVE_PIONEER_DECK,
DeckType.NET_ARCHIVE_MODERN_DECK,
DeckType.NET_ARCHIVE_PAUPER_DECK,
DeckType.NET_ARCHIVE_VINTAGE_DECK,
DeckType.NET_ARCHIVE_LEGACY_DECK
DeckType.NET_ARCHIVE_LEGACY_DECK,
DeckType.NET_ARCHIVE_BLOCK_DECK
);
if (!FModel.isdeckGenMatrixLoaded()) {