External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
ninthworld 2018-07-16 21:16:20 -07:00
parent f31bfa829e
commit 86107de54e
620 changed files with 5627 additions and 2239 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage.Client/src/main/java/mage/client/util/CardViewEDHPowerLevelComparator.java
View file

@ -11,7 +11,7 @@ import mage.view.CardView;
*/
public class CardViewEDHPowerLevelComparator implements Comparator<CardView> {
public int getPowerLevel(CardView card) {
private int getPowerLevel(CardView card) {
int thisMaxPower = 0;
@ -306,7 +306,7 @@ public class CardViewEDHPowerLevelComparator implements Comparator<CardView> {
thisMaxPower = Math.max(thisMaxPower, 1);
}
if (card.getCardTypes().contains("Plainswalker")) {
if (card.isPlanesWalker()) {
if (card.getName().toLowerCase(Locale.ENGLISH).equals("jace, the mind sculptor")) {
thisMaxPower = Math.max(thisMaxPower, 6);
}
@ -509,7 +509,7 @@ public class CardViewEDHPowerLevelComparator implements Comparator<CardView> {
@Override
public int compare(CardView o1, CardView o2) {
return Integer.valueOf(getPowerLevel(o1)).compareTo(getPowerLevel(o2));
return Integer.compare(getPowerLevel(o1), getPowerLevel(o2));
}
}

22
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java
View file

@ -1,13 +1,6 @@
package org.mage.plugins.card.dl.sources;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@ -19,18 +12,12 @@ import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.prefs.Preferences;
import mage.cards.Sets;
import mage.cards.repository.CardCriteria;
import mage.cards.repository.CardInfo;
import mage.cards.repository.CardRepository;
import mage.client.MageFrame;
import mage.client.dialog.PreferencesDialog;
import mage.remote.Connection;
import mage.remote.Connection.ProxyType;
import org.apache.log4j.Logger;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
@ -235,7 +222,7 @@ public enum WizardCardsImageSource implements CardImageSource {
supportedSets.add("AKH");
supportedSets.add("MPS");
supportedSets.add("CMA");
// supportedSets.add("CM2"); // Commander Anthology, Vol. II
supportedSets.add("CM2"); // Commander Anthology, Vol. II
supportedSets.add("E01");
supportedSets.add("HOU");
supportedSets.add("C17");
@ -249,7 +236,10 @@ public enum WizardCardsImageSource implements CardImageSource {
supportedSets.add("RIX"); // Rivals of Ixalan
supportedSets.add("A25"); // Masters 25
supportedSets.add("DOM"); // Dominaria
// supportedSets.add("M19"); // Core 2019
supportedSets.add("M19"); // Core 2019
// supportedSets.add("GRN"); // Guilds of Ravnica
// supportedSets.add("RNA"); // Ravnica Allegiance
// supportedSets.add("C18"); // Commander 2018
sets = new HashMap<>();
setsAliases = new HashMap<>();
@ -286,7 +276,7 @@ public enum WizardCardsImageSource implements CardImageSource {
setsAliases.put("C16", "Commander 2016");
setsAliases.put("C17", "Commander 2017");
setsAliases.put("CMA", "Commander Anthology");
// setsAliases.put("CM2", "Commander Anthology, Vol. II");
setsAliases.put("CM2", "Commander Anthology 2018");
setsAliases.put("CHK", "Champions of Kamigawa");
setsAliases.put("CHR", "Chronicles");
setsAliases.put("CMD", "Magic: The Gathering-Commander");