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

Get rid of an unnecessary CardDb of allCards which was taking 256kb of memory.

Browse Source
This commit is contained in:
Myrd
2016-12-25 06:22:26 +00:00
parent 328922029a
commit 3faf1946fa
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
forge-core/src/main/java/forge/StaticData.java
View File

@@ -30,7 +30,6 @@ public class StaticData {
private final String blockDataFolder; private final String blockDataFolder;
private final CardDb commonCards; private final CardDb commonCards;
private final CardDb variantCards; private final CardDb variantCards;
private final CardDb allCards;
private final CardEdition.Collection editions; private final CardEdition.Collection editions;
// Loaded lazily: // Loaded lazily:
@@ -51,29 +50,24 @@ public class StaticData {
final Map<String, CardRules> regularCards = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); final Map<String, CardRules> regularCards = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
final Map<String, CardRules> variantsCards = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); final Map<String, CardRules> variantsCards = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
final Map<String, CardRules> fullCards = new TreeMap<String, CardRules>(String.CASE_INSENSITIVE_ORDER);
for (CardRules card : reader.loadCards()) { for (CardRules card : reader.loadCards()) {
if (null == card) continue; if (null == card) continue;
final String cardName = card.getName(); final String cardName = card.getName();
if ( card.isVariant() ) { if (card.isVariant()) {
variantsCards.put(cardName, card); variantsCards.put(cardName, card);
} } else {
else {
regularCards.put(cardName, card); regularCards.put(cardName, card);
} }
fullCards.put(cardName, card);
} }
commonCards = new CardDb(regularCards, editions); commonCards = new CardDb(regularCards, editions);
variantCards = new CardDb(variantsCards, editions); variantCards = new CardDb(variantsCards, editions);
allCards = new CardDb(fullCards, editions);
//muse initialize after establish field values for the sake of card image logic //muse initialize after establish field values for the sake of card image logic
commonCards.initialize(false, false); commonCards.initialize(false, false);
variantCards.initialize(false, false); variantCards.initialize(false, false);
allCards.initialize( false, false);
} }
public static StaticData instance() { public static StaticData instance() {
@@ -117,9 +111,11 @@ public class StaticData {
String cardName = r.cardName; String cardName = r.cardName;
CardRules rules = reader.attemptToLoadCard(cardName, setCode); CardRules rules = reader.attemptToLoadCard(cardName, setCode);
if (rules != null) { if (rules != null) {
commonCards.loadCard(cardName, rules); if (rules.isVariant()) {
variantCards.loadCard(cardName, rules); variantCards.loadCard(cardName, rules);
allCards.loadCard(cardName, rules); } else {
commonCards.loadCard(cardName, rules);
}
} }
} }
@@ -169,9 +165,4 @@ public class StaticData {
public CardDb getVariantCards() { public CardDb getVariantCards() {
return variantCards; return variantCards;
} }
public CardDb getAllCards() {
return allCards;
}
} }

5
forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java
View File

@@ -161,7 +161,10 @@ public class GuiChoose {
return; return;
} else if (sel instanceof ICardFace) { } else if (sel instanceof ICardFace) {
final ICardFace face = (ICardFace)sel; final ICardFace face = (ICardFace)sel;
final PaperCard paper = FModel.getMagicDb().getAllCards().getUniqueByName(face.getName()); PaperCard paper = FModel.getMagicDb().getCommonCards().getUniqueByName(face.getName());
if (paper == null) {
paper = FModel.getMagicDb().getVariantCards().getUniqueByName(face.getName());
}
matchUI.setCard(paper); matchUI.setCard(paper);
return; return;
} }