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

Merge branch 'master' into 'master'

Browse Source 
Net Deck Archive Categories fix

See merge request core-developers/forge!4071
This commit is contained in:
Michael Kamensky
2021-03-02 20:36:33 +00:00
parent a12fd1d34a 12ff52e051
commit fb0f245b34
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -581,11 +581,14 @@ public class FDeckChooser extends FScreen {
} }
cmbDeckTypes.setAlignment(Align.center); cmbDeckTypes.setAlignment(Align.center);
restoreSavedState(); restoreSavedState();
cmbDeckTypes.setChangedHandler(new FEventHandler() { cmbDeckTypes.setChangedHandler(new FEventHandler() {
@Override @Override
public void handleEvent(final FEvent e) { public void handleEvent(final FEvent e) {
final DeckType deckType = cmbDeckTypes.getSelectedItem(); final DeckType deckType = cmbDeckTypes.getSelectedItem();
if (!refreshingDeckType && (deckType == DeckType.NET_DECK || deckType == DeckType.NET_COMMANDER_DECK)) {
if (!refreshingDeckType&&(deckType == DeckType.NET_DECK || deckType == DeckType.NET_COMMANDER_DECK)) {
FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
@Override @Override
public void run() { public void run() {
@@ -614,8 +617,7 @@ public class FDeckChooser extends FScreen {
}); });
return; return;
} }
if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_STANDARD_DECK)) {
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
public void run() { public void run() {
@@ -639,10 +641,9 @@ public class FDeckChooser extends FScreen {
}); });
} }
}); });
return; return;
} }
if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_PIONEER_DECK)) {
if ((deckType == DeckType.NET_ARCHIVE_PIONEER_DECK&& !refreshingDeckType)) {
FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
@Override @Override
public void run() { public void run() {
@@ -668,8 +669,7 @@ public class FDeckChooser extends FScreen {
}); });
return; return;
} }
if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_MODERN_DECK)) {
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
public void run() { public void run() {
@@ -695,8 +695,7 @@ public class FDeckChooser extends FScreen {
}); });
return; return;
} }
if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_LEGACY_DECK)) {
if ((deckType == DeckType.NET_ARCHIVE_LEGACY_DECK&& !refreshingDeckType)) {
FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
@Override @Override
public void run() { public void run() {
@@ -722,8 +721,7 @@ public class FDeckChooser extends FScreen {
}); });
return; return;
} }
if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_VINTAGE_DECK)) {
if ((deckType == DeckType.NET_ARCHIVE_VINTAGE_DECK&& !refreshingDeckType)) {
FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
@Override @Override
public void run() { public void run() {
@@ -747,12 +745,8 @@ public class FDeckChooser extends FScreen {
}); });
} }
}); });
return; return;
} }
refreshDecksList(deckType, false, e); refreshDecksList(deckType, false, e);
} }
}); });
@@ -947,22 +941,37 @@ public class FDeckChooser extends FScreen {
config = ItemManagerConfig.STRING_ONLY; config = ItemManagerConfig.STRING_ONLY;
break; break;
case NET_ARCHIVE_STANDARD_DECK: case NET_ARCHIVE_STANDARD_DECK:
if (NetDeckArchiveStandard != null) {
cmbDeckTypes.setText(NetDeckArchiveStandard.getDeckType());
}
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: case NET_ARCHIVE_PIONEER_DECK:
if (NetDeckArchivePioneer != null) {
cmbDeckTypes.setText(NetDeckArchivePioneer.getDeckType());
}
pool = DeckProxy.getNetArchivePioneerDecks(NetDeckArchivePioneer); pool = DeckProxy.getNetArchivePioneerDecks(NetDeckArchivePioneer);
config = ItemManagerConfig.NET_ARCHIVE_PIONEER_DECKS; config = ItemManagerConfig.NET_ARCHIVE_PIONEER_DECKS;
break; break;
case NET_ARCHIVE_MODERN_DECK: case NET_ARCHIVE_MODERN_DECK:
if (NetDeckArchiveModern != null) {
cmbDeckTypes.setText(NetDeckArchiveModern.getDeckType());
}
pool = DeckProxy.getNetArchiveModernDecks(NetDeckArchiveModern); pool = DeckProxy.getNetArchiveModernDecks(NetDeckArchiveModern);
config = ItemManagerConfig.NET_ARCHIVE_MODERN_DECKS; config = ItemManagerConfig.NET_ARCHIVE_MODERN_DECKS;
break; break;
case NET_ARCHIVE_LEGACY_DECK: case NET_ARCHIVE_LEGACY_DECK:
if (NetDeckArchiveLegacy != null) {
cmbDeckTypes.setText(NetDeckArchiveLegacy.getDeckType());
}
pool = DeckProxy.getNetArchiveLegacyDecks(NetDeckArchiveLegacy); pool = DeckProxy.getNetArchiveLegacyDecks(NetDeckArchiveLegacy);
config = ItemManagerConfig.NET_ARCHIVE_LEGACY_DECKS; config = ItemManagerConfig.NET_ARCHIVE_LEGACY_DECKS;
break; break;
case NET_ARCHIVE_VINTAGE_DECK: case NET_ARCHIVE_VINTAGE_DECK:
if (NetDeckArchiveVintage!= null) {
cmbDeckTypes.setText(NetDeckArchiveVintage.getDeckType());
}
pool = DeckProxy.getNetArchiveVintageDecks(NetDeckArchiveVintage); pool = DeckProxy.getNetArchiveVintageDecks(NetDeckArchiveVintage);
config = ItemManagerConfig.NET_ARCHIVE_VINTAGE_DECKS; config = ItemManagerConfig.NET_ARCHIVE_VINTAGE_DECKS;
break; break;