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

Updates to UI to separate out format filters

Browse Source
This commit is contained in:
austinio7116
2018-04-03 17:27:42 +01:00
committed by maustin
parent e01eab131f
commit def7ba5faf
5 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-game/src/main/java/forge/game/GameFormat.java
View File

@@ -309,6 +309,16 @@ public class GameFormat implements Comparable<GameFormat> {
return coreList;
}
public Iterable<GameFormat> getHistoricList() {
List<GameFormat> coreList = new ArrayList<>();
for(GameFormat format: naturallyOrdered){
if(format.getFormatType().equals(FormatType.Historic)){
coreList.add(format);
}
}
return coreList;
}
public GameFormat getStandard() {
return this.map.get("Standard");
}

11
forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
View File

@@ -92,6 +92,17 @@ public class CardManager extends ItemManager<PaperCard> {
}
menu.add(fmt);
JMenu fmthist = GuiUtils.createMenu("Historic Format");
for (final GameFormat f : FModel.getFormats().getHistoricList()) {
GuiUtils.addMenuItem(fmthist, f.getName(), null, new Runnable() {
@Override
public void run() {
itemManager.addFilter(new CardFormatFilter(itemManager, f));
}
}, FormatFilter.canAddFormat(f, itemManager.getFilter(CardFormatFilter.class)));
}
menu.add(fmthist);
GuiUtils.addMenuItem(menu, "Sets...", null, new Runnable() {
@Override
public void run() {

11
forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
View File

@@ -186,6 +186,17 @@ public final class DeckManager extends ItemManager<DeckProxy> implements IHasGam
}
menu.add(fmt);
final JMenu fmtall = GuiUtils.createMenu("Historic Format");
for (final GameFormat f : FModel.getFormats().getHistoricList()) {
GuiUtils.addMenuItem(fmtall, f.getName(), null, new Runnable() {
@Override
public void run() {
addFilter(new DeckFormatFilter(DeckManager.this, f));
}
}, FormatFilter.canAddFormat(f, getFilter(DeckFormatFilter.class)));
}
menu.add(fmtall);
GuiUtils.addMenuItem(menu, "Sets...", null, new Runnable() {
@Override public void run() {
final DeckSetFilter existingFilter = getFilter(DeckSetFilter.class);

1
forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
View File

@@ -166,6 +166,7 @@ public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T
@Override
public boolean tap(Integer index, GameFormat value, float x, float y, int count) {
selectedFormat=value;
Forge.back();
return true;
}

5
forge-gui/res/formats/Kaladesh_Block.txt
View File

@@ -1,5 +0,0 @@
[format]
Name:Kaladesh Block
Type:Historic
Order:109
Sets:KLD, AER