diff --git a/forge-core/src/main/java/forge/util/ItemPool.java b/forge-core/src/main/java/forge/util/ItemPool.java index 35f062ec72f..78668f9709d 100644 --- a/forge-core/src/main/java/forge/util/ItemPool.java +++ b/forge-core/src/main/java/forge/util/ItemPool.java @@ -105,8 +105,6 @@ public class ItemPool implements Iterable myClass; //class does not keep this in runtime by itself - private boolean allowZero; //whether to allow items with 0 count to remain in pool - @Override public final Iterator> iterator() { return items.entrySet().iterator(); @@ -184,13 +182,6 @@ public class ItemPool implements Iterable getView() { return new ItemPool(Collections.unmodifiableMap(items), getMyClass()); } @@ -200,16 +191,8 @@ public class ItemPool implements Iterable implements Iterable extends FContainer im public void setPool(final ItemPool pool0, boolean infinite) { pool = pool0; model.clear(); - model.setAllowZero(pool.allowZero()); model.addItems(pool); model.setInfinite(infinite); updateView(true, null); @@ -763,17 +762,7 @@ public abstract class ItemManager extends FContainer im //update ratio of # in filtered pool / # in total pool ItemPool filteredItems = getFilteredItems(); int filteredCount = filteredItems.countAll(); - - int totalCount; - if (pool.allowZero() && isInfinite()) { //use count distinct if pool is infinite to account for zeros and save performance - totalCount = filteredItems.countDistinct(); - } - else if (useFilter) { - totalCount = pool.countAll(); - } - else { - totalCount = filteredCount; - } + int totalCount = useFilter ? pool.countAll() : filteredCount; searchFilter.setRatio("(" + filteredCount + " / " + totalCount + ")"); } diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java index 8c7de54f0ed..d45ff9861b2 100644 --- a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java +++ b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java @@ -366,13 +366,8 @@ public class ImageView extends ItemView { group = otherItems; } - if (qty > 0) { - for (int i = 0; i < qty; i++) { - group.add(new ItemInfo(item, group, false)); - } - } - else { //add single item for unowned item - group.add(new ItemInfo(item, group, true)); + for (int i = 0; i < qty; i++) { + group.add(new ItemInfo(item, group)); } } @@ -771,7 +766,6 @@ public class ImageView extends ItemView { private final String name; private boolean isCollapsed; private float scrollWidth; - private int owned; public Group(String name0) { name = name0; @@ -779,9 +773,6 @@ public class ImageView extends ItemView { public void add(ItemInfo item) { items.add(item); - if (!item.unowned) { - owned++; - } } @Override @@ -797,13 +788,7 @@ public class ImageView extends ItemView { //draw group name and horizontal line float x = GROUP_HEADER_GLYPH_WIDTH + PADDING + 1; float y = 0; - String caption; - if (itemManager.getPool().allowZero() && itemManager.isInfinite()) { - caption = name + " (" + owned + " / " + items.size() + ")"; //show ratio of owned / total when zero allowed - } - else { - caption = name + " (" + owned + ")"; - } + String caption = name + " (" + items.size() + ")"; g.drawText(caption, GROUP_HEADER_FONT, GROUP_HEADER_FORE_COLOR, x, y, getWidth(), GROUP_HEADER_HEIGHT, false, HAlignment.LEFT, true); x += GROUP_HEADER_FONT.getBounds(caption).width + PADDING; y += GROUP_HEADER_HEIGHT / 2; @@ -922,15 +907,13 @@ public class ImageView extends ItemView { private class ItemInfo extends FDisplayObject implements Entry { private final T item; private final Group group; - private final boolean unowned; private int index; private CardStackPosition pos; private boolean selected; - private ItemInfo(T item0, Group group0, boolean unowned0) { + private ItemInfo(T item0, Group group0) { item = item0; group = group0; - unowned = unowned0; } @Override @@ -961,18 +944,8 @@ public class ImageView extends ItemView { final float h = getHeight(); if (selected) { - if (unowned) { //use drawRect for unowned to prevent green showing through card - g.drawRect(SEL_BORDER_SIZE, Color.GREEN, x - SEL_BORDER_SIZE, y - SEL_BORDER_SIZE, - w + 2 * SEL_BORDER_SIZE, h + 2 * SEL_BORDER_SIZE); - } - else { - g.fillRect(Color.GREEN, x - SEL_BORDER_SIZE, y - SEL_BORDER_SIZE, - w + 2 * SEL_BORDER_SIZE, h + 2 * SEL_BORDER_SIZE); - } - } - - if (unowned) { - g.setAlphaComposite(UNOWNED_ALPHA_COMPOSITE); + g.fillRect(Color.GREEN, x - SEL_BORDER_SIZE, y - SEL_BORDER_SIZE, + w + 2 * SEL_BORDER_SIZE, h + 2 * SEL_BORDER_SIZE); } if (item instanceof PaperCard) { @@ -988,10 +961,6 @@ public class ImageView extends ItemView { g.drawText(item.getName(), GROUP_HEADER_FONT, Color.WHITE, x + PADDING, y + PADDING, w - 2 * PADDING, h - 2 * PADDING, true, HAlignment.CENTER, false); } } - - if (unowned) { - g.resetAlphaComposite(); - } } } } diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java b/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java index 8e574efe99d..271d6e4de0b 100644 --- a/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java +++ b/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java @@ -239,10 +239,6 @@ public final class ItemListView extends ItemView { @Override public void drawValue(Graphics g, Integer index, Entry value, FSkinFont font, FSkinColor foreColor, FSkinColor backColor, boolean pressed, float x, float y, float w, float h) { - boolean unowned = (value.getValue() == 0); //fade out item if item isn't owned - if (unowned) { - g.setAlphaComposite(UNOWNED_ALPHA_COMPOSITE); - } if (maxSelections > 1) { if (pressed) { //if multi-select mode, draw SEL_COLOR when pressed g.fillRect(SEL_COLOR, x - FList.PADDING, y - FList.PADDING, w + 2 * FList.PADDING, h + 2 * FList.PADDING); @@ -255,9 +251,6 @@ public final class ItemListView extends ItemView { w -= padding; } renderer.drawValue(g, value, font, foreColor, backColor, pressed, x + 1, y, w - 2, h); //x + 1 and w - 2 to account for left and right borders - if (unowned) { - g.resetAlphaComposite(); - } } }); setFont(FSkinFont.get(14)); diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java index 8fc0aa1447a..434ea99685e 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java @@ -2,6 +2,7 @@ package forge.screens.planarconquest; import com.google.common.base.Predicate; +import forge.deck.CardPool; import forge.item.PaperCard; import forge.itemmanager.CardManager; import forge.itemmanager.ItemManager; @@ -33,7 +34,9 @@ public class ConquestCollectionScreen extends FScreen { } public void refreshCards() { - FModel.getConquest().getModel().populateCollectionManager(lstCollection); + CardPool pool = new CardPool(); + pool.add(FModel.getConquest().getModel().getUnlockedCards()); + lstCollection.setPool(pool, true); } @Override diff --git a/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java b/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java index fe1fb161c1c..c11aaddc9b8 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java +++ b/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java @@ -117,13 +117,6 @@ public final class ItemManagerModel { return infiniteSupply; } - public boolean allowZero() { - return data.allowZero(); - } - public void setAllowZero(boolean allowZero0) { - data.setAllowZero(allowZero0); - } - public CascadeManager getCascadeManager() { return cascadeManager; } diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java index d4b4bdb00aa..08a92a78d55 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java @@ -23,7 +23,6 @@ import forge.card.CardDb; import forge.item.InventoryItem; import forge.item.PaperCard; import forge.itemmanager.ColumnDef; -import forge.itemmanager.IItemManager; import forge.itemmanager.ItemColumn; import forge.itemmanager.ItemManagerConfig; import forge.model.FModel; @@ -31,7 +30,6 @@ import forge.planarconquest.ConquestPlane.Region; import forge.planarconquest.ConquestPreferences.CQPref; import forge.properties.ForgeConstants; import forge.util.FileUtil; -import forge.util.ItemPool; import forge.util.XmlReader; import forge.util.XmlWriter; @@ -55,7 +53,6 @@ public final class ConquestData { private ISkinImage planeswalkerToken; private ConquestLocation currentLocation; private int aetherShards; - private ConquestCollection collection; private final File directory; private final String xmlFilename; @@ -145,13 +142,6 @@ public final class ConquestData { return getOrCreatePlaneData(getCurrentPlane()); } - public void populateCollectionManager(IItemManager manager) { - if (collection == null) { - collection = new ConquestCollection(); - } - manager.setPool(collection, true); - } - public Iterable getUnlockedCards() { return unlockedCards; } @@ -163,9 +153,6 @@ public final class ConquestData { public void unlockCard(PaperCard card) { if (unlockedCards.add(card)) { newCards.add(card); - if (collection != null) { - collection.add(card); - } } } public void unlockCards(Iterable cards) { @@ -404,20 +391,4 @@ public final class ConquestData { } } } - - @SuppressWarnings("serial") - private class ConquestCollection extends ItemPool { - private ConquestCollection() { - super(PaperCard.class); - setAllowZero(true); - - //initialize to contain all available cards, with unlocked - //having a count of 1 and the rest having a count of 0 - for (ConquestPlane plane : ConquestPlane.values()) { - for (PaperCard card : plane.getCardPool().getAllCards()) { - items.put(card, hasUnlockedCard(card) ? 1 : 0); - } - } - } - } }