move Google Guava to mage-root pom in dependencyManagement, so other modules can use it

This commit is contained in:
Ingmar Goudt 2019-03-18 15:48:35 +01:00
parent efb357747d
commit 72c8c267a1
7 changed files with 32 additions and 29 deletions

View file

@ -56,7 +56,6 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>20.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.swinglabs</groupId> <groupId>org.swinglabs</groupId>

View file

@ -1,5 +1,6 @@
package org.mage.plugins.card.dl.sources; package org.mage.plugins.card.dl.sources;
import com.google.common.collect.ImmutableMap;
import org.tritonus.share.ArraySet; import org.tritonus.share.ArraySet;
import java.util.HashMap; import java.util.HashMap;
@ -12,22 +13,19 @@ import java.util.Set;
*/ */
public class ScryfallImageSupportCards { public class ScryfallImageSupportCards {
private static final Map<String, String> xmageSetsToScryfall = new HashMap<String, String>() { private static final Map<String, String> xmageSetsToScryfall = ImmutableMap.<String, String>builder().put("DD3GVL", "gvl").
{ put("DD3JVC", "jvc").
// xmage -> scryfall put("DD3DVD", "dvd").
put("DD3GVL", "gvl"); put("DD3EVG", "evg").
put("DD3JVC", "jvc"); put("MPS-AKH", "mp2").
put("DD3DVD", "dvd"); put("MBP", "pmei").
put("DD3EVG", "evg"); put("WMCQ", "pwcq").
put("MPS-AKH", "mp2"); put("EURO", "pelp").
put("MBP", "pmei"); put("GPX", "pgpx").
put("WMCQ", "pwcq"); put("MED", "me1").
put("EURO", "pelp"); put("MEDM", "med").build();
put("GPX", "pgpx");
put("MED", "me1");
put("MEDM", "med");
}
};
private static final Set<String> supportedSets = new ArraySet<String>() { private static final Set<String> supportedSets = new ArraySet<String>() {
{ {

View file

@ -20,7 +20,7 @@ import mage.constants.SubType;
*/ */
public final class ScreechingSilcaw extends CardImpl { public final class ScreechingSilcaw extends CardImpl {
private static final String text = "<i>Metalcraft</i> &mdash; Whenever Screeching Silcaw deals combat damage to a player, if you control three or more artifacts, that player puts the top four cards of their library into their graveyard."; private static final String rule = "<i>Metalcraft</i> &mdash; Whenever Screeching Silcaw deals combat damage to a player, if you control three or more artifacts, that player puts the top four cards of their library into their graveyard.";
public ScreechingSilcaw(UUID ownerId, CardSetInfo setInfo) { public ScreechingSilcaw(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}");
@ -34,7 +34,7 @@ public final class ScreechingSilcaw extends CardImpl {
//"<i>Metalcraft</i> &mdash; Whenever Screeching Silcaw deals combat damage to a player, if you control three or more artifacts, that player puts the top four cards of their library into their graveyard. //"<i>Metalcraft</i> &mdash; Whenever Screeching Silcaw deals combat damage to a player, if you control three or more artifacts, that player puts the top four cards of their library into their graveyard.
TriggeredAbility conditional = new ConditionalInterveningIfTriggeredAbility( TriggeredAbility conditional = new ConditionalInterveningIfTriggeredAbility(
new DealsCombatDamageToAPlayerTriggeredAbility(new PutLibraryIntoGraveTargetEffect(4), false, true), new DealsCombatDamageToAPlayerTriggeredAbility(new PutLibraryIntoGraveTargetEffect(4), false, true),
MetalcraftCondition.instance, text); MetalcraftCondition.instance, rule);
this.addAbility(conditional); this.addAbility(conditional);
} }

View file

@ -26,6 +26,10 @@
<version>1.4.197</version> <version>1.4.197</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.j256.ormlite</groupId> <groupId>com.j256.ormlite</groupId>
<artifactId>ormlite-jdbc</artifactId> <artifactId>ormlite-jdbc</artifactId>

View file

@ -1,5 +1,6 @@
package mage.cards; package mage.cards;
import com.google.common.collect.ImmutableList;
import mage.MageObject; import mage.MageObject;
import mage.MageObjectImpl; import mage.MageObjectImpl;
import mage.Mana; import mage.Mana;
@ -224,11 +225,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
game.getState().getCardState(objectId).addInfo(key, value); game.getState().getCardState(objectId).addInfo(key, value);
} }
protected static final ArrayList<String> rulesError = new ArrayList<String>() { protected static final List<String> rulesError = ImmutableList.of("Exception occurred in rules generation");
{
add("Exception occurred in rules generation");
}
};
@Override @Override
public List<String> getRules() { public List<String> getRules() {

View file

@ -1,5 +1,6 @@
package mage.players; package mage.players;
import com.google.common.collect.ImmutableMap;
import mage.ConditionalMana; import mage.ConditionalMana;
import mage.MageObject; import mage.MageObject;
import mage.MageObjectReference; import mage.MageObjectReference;
@ -178,11 +179,10 @@ public abstract class PlayerImpl implements Player, Serializable {
/** /**
* During some steps we can't play anything * During some steps we can't play anything
*/ */
protected final Map<PhaseStep, Step.StepPart> silentPhaseSteps = new EnumMap<PhaseStep, Step.StepPart>(PhaseStep.class) { protected final Map<PhaseStep, Step.StepPart> silentPhaseSteps = ImmutableMap.<PhaseStep, Step.StepPart>builder().
{ put(PhaseStep.DECLARE_ATTACKERS, Step.StepPart.PRE).build();
put(PhaseStep.DECLARE_ATTACKERS, Step.StepPart.PRE);
}
};
public PlayerImpl(String name, RangeOfInfluence range) { public PlayerImpl(String name, RangeOfInfluence range) {
this(UUID.randomUUID()); this(UUID.randomUUID());

View file

@ -109,6 +109,11 @@
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.8.0-beta2</version> <version>1.8.0-beta2</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>20.0</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</project> </project>