mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 20:58:03 +00:00
remove warnings, removed manaparser
This commit is contained in:
1
.gitattributes
vendored
1
.gitattributes
vendored
@@ -11656,7 +11656,6 @@ src/main/java/forge/card/CardRules.java -text
|
||||
src/main/java/forge/card/CardRulesReader.java svneol=native#text/plain
|
||||
src/main/java/forge/card/CardSuperType.java -text
|
||||
src/main/java/forge/card/CardType.java -text
|
||||
src/main/java/forge/card/CardnameTxtManaCostParser.java -text
|
||||
src/main/java/forge/card/EditionCollection.java svneol=native#text/plain
|
||||
src/main/java/forge/card/EditionInfo.java svneol=native#text/plain
|
||||
src/main/java/forge/card/FatPackData.java -text
|
||||
|
||||
@@ -23,7 +23,6 @@ import java.util.HashMap;
|
||||
|
||||
import com.esotericsoftware.minlog.Log;
|
||||
|
||||
import forge.card.cardfactory.CardFactoryUtil;
|
||||
import forge.card.replacement.ReplacementEffect;
|
||||
import forge.card.spellability.SpellAbility;
|
||||
import forge.card.staticability.StaticAbility;
|
||||
|
||||
@@ -1,108 +0,0 @@
|
||||
package forge.card;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import forge.card.CardManaCost.ManaParser;
|
||||
|
||||
/**
|
||||
* The Class ParserCardnameTxtManaCost.
|
||||
*/
|
||||
public class CardnameTxtManaCostParser implements ManaParser {
|
||||
private final String[] cost;
|
||||
private int nextToken;
|
||||
private int colorlessCost;
|
||||
|
||||
/**
|
||||
* Instantiates a new parser cardname txt mana cost.
|
||||
*
|
||||
* @param cost
|
||||
* the cost
|
||||
*/
|
||||
public CardnameTxtManaCostParser(final String cost) {
|
||||
this.cost = cost.split(" ");
|
||||
// System.out.println(cost);
|
||||
this.nextToken = 0;
|
||||
this.colorlessCost = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see forge.card.CardManaCost.ManaParser#getTotalColorlessCost()
|
||||
*/
|
||||
@Override
|
||||
public final int getTotalColorlessCost() {
|
||||
if (this.hasNext()) {
|
||||
throw new RuntimeException("Colorless cost should be obtained after iteration is complete");
|
||||
}
|
||||
return this.colorlessCost;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see java.util.Iterator#hasNext()
|
||||
*/
|
||||
@Override
|
||||
public final boolean hasNext() {
|
||||
return this.nextToken < this.cost.length;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see java.util.Iterator#next()
|
||||
*/
|
||||
@Override
|
||||
public final CardManaCostShard next() {
|
||||
|
||||
final String unparsed = this.cost[this.nextToken++];
|
||||
// System.out.println(unparsed);
|
||||
if (StringUtils.isNumeric(unparsed)) {
|
||||
this.colorlessCost += Integer.parseInt(unparsed);
|
||||
return null;
|
||||
}
|
||||
|
||||
int atoms = 0;
|
||||
for (int iChar = 0; iChar < unparsed.length(); iChar++) {
|
||||
switch (unparsed.charAt(iChar)) {
|
||||
case 'W':
|
||||
atoms |= CardManaCostShard.Atom.WHITE;
|
||||
break;
|
||||
case 'U':
|
||||
atoms |= CardManaCostShard.Atom.BLUE;
|
||||
break;
|
||||
case 'B':
|
||||
atoms |= CardManaCostShard.Atom.BLACK;
|
||||
break;
|
||||
case 'R':
|
||||
atoms |= CardManaCostShard.Atom.RED;
|
||||
break;
|
||||
case 'G':
|
||||
atoms |= CardManaCostShard.Atom.GREEN;
|
||||
break;
|
||||
case '2':
|
||||
atoms |= CardManaCostShard.Atom.OR_2_COLORLESS;
|
||||
break;
|
||||
case 'P':
|
||||
atoms |= CardManaCostShard.Atom.OR_2_LIFE;
|
||||
break;
|
||||
case 'X':
|
||||
atoms |= CardManaCostShard.Atom.IS_X;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
return CardManaCostShard.valueOf(atoms);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see java.util.Iterator#remove()
|
||||
*/
|
||||
@Override
|
||||
public void remove() {
|
||||
} // unsuported
|
||||
}
|
||||
@@ -35,7 +35,6 @@ import forge.CardUtil;
|
||||
import forge.Command;
|
||||
import forge.Constant;
|
||||
import forge.Counters;
|
||||
import forge.GameActionUtil;
|
||||
import forge.Singletons;
|
||||
import forge.card.abilityfactory.AbilityFactory;
|
||||
import forge.card.cost.Cost;
|
||||
|
||||
@@ -20,7 +20,6 @@ package forge.card.cardfactory;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import forge.Card;
|
||||
import forge.CardList;
|
||||
import forge.Counters;
|
||||
import forge.card.cost.Cost;
|
||||
import forge.card.spellability.Ability;
|
||||
|
||||
@@ -20,7 +20,6 @@ import forge.card.trigger.TriggerType;
|
||||
import forge.control.FControl;
|
||||
import forge.control.input.InputMulligan;
|
||||
import forge.deck.Deck;
|
||||
import forge.game.phase.PhaseHandler;
|
||||
import forge.game.player.Player;
|
||||
import forge.game.zone.ZoneType;
|
||||
import forge.gui.match.CMatchUI;
|
||||
|
||||
@@ -24,7 +24,6 @@ import forge.Card;
|
||||
import forge.CardList;
|
||||
import forge.CardListFilter;
|
||||
import forge.CardListUtil;
|
||||
import forge.CardUtil;
|
||||
import forge.Singletons;
|
||||
import forge.card.cardfactory.CardFactoryUtil;
|
||||
import forge.card.spellability.SpellAbility;
|
||||
|
||||
@@ -395,10 +395,10 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
|
||||
private void fillRow(final CardStackRow sourceRow, final List<CardStackRow> rows, final CardStackRow row) {
|
||||
int rowWidth = row.getWidth();
|
||||
|
||||
final Iterator itr = sourceRow.iterator();
|
||||
final Iterator<CardStack> itr = sourceRow.iterator();
|
||||
|
||||
while (itr.hasNext()) {
|
||||
final CardStack stack = (CardStack) itr.next();
|
||||
final CardStack stack = itr.next();
|
||||
|
||||
rowWidth += stack.getWidth();
|
||||
if (rowWidth > this.playAreaWidth) {
|
||||
|
||||
Reference in New Issue
Block a user