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

move card/CardCharacteristics.java to forge.game.card

Browse Source
This commit is contained in:
Maxmtg
2013-11-24 09:24:50 +00:00
parent e9409d01a6
commit 21ea8e377c
6 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -14806,7 +14806,6 @@ forge-gui/src/main/java/forge/ai/ability/UntapAi.java -text
forge-gui/src/main/java/forge/ai/ability/UntapAllAi.java -text forge-gui/src/main/java/forge/ai/ability/UntapAllAi.java -text
forge-gui/src/main/java/forge/ai/ability/ZoneExchangeAi.java -text forge-gui/src/main/java/forge/ai/ability/ZoneExchangeAi.java -text
forge-gui/src/main/java/forge/card/CardBlock.java -text forge-gui/src/main/java/forge/card/CardBlock.java -text
forge-gui/src/main/java/forge/card/CardCharacteristics.java -text
forge-gui/src/main/java/forge/card/CardEditionPredicates.java -text forge-gui/src/main/java/forge/card/CardEditionPredicates.java -text
forge-gui/src/main/java/forge/card/MetaSet.java -text forge-gui/src/main/java/forge/card/MetaSet.java -text
forge-gui/src/main/java/forge/card/UnOpenedMeta.java -text forge-gui/src/main/java/forge/card/UnOpenedMeta.java -text
@@ -14968,6 +14967,7 @@ forge-gui/src/main/java/forge/game/ability/effects/UntapEffect.java -text
forge-gui/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java -text forge-gui/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java -text
forge-gui/src/main/java/forge/game/ability/package-info.java svneol=native#text/plain forge-gui/src/main/java/forge/game/ability/package-info.java svneol=native#text/plain
forge-gui/src/main/java/forge/game/card/Card.java svneol=native#text/plain forge-gui/src/main/java/forge/game/card/Card.java svneol=native#text/plain
forge-gui/src/main/java/forge/game/card/CardCharacteristics.java -text
forge-gui/src/main/java/forge/game/card/CardColor.java svneol=native#text/plain forge-gui/src/main/java/forge/game/card/CardColor.java svneol=native#text/plain
forge-gui/src/main/java/forge/game/card/CardDamageHistory.java -text forge-gui/src/main/java/forge/game/card/CardDamageHistory.java -text
forge-gui/src/main/java/forge/game/card/CardFactory.java svneol=native#text/plain forge-gui/src/main/java/forge/game/card/CardFactory.java svneol=native#text/plain

1
forge-gui/src/main/java/forge/game/card/Card.java
View File

@@ -44,7 +44,6 @@ import com.google.common.collect.Lists;
import forge.Command; import forge.Command;
import forge.Singletons; import forge.Singletons;
import forge.card.CardCharacteristicName; import forge.card.CardCharacteristicName;
import forge.card.CardCharacteristics;
import forge.card.CardEdition; import forge.card.CardEdition;
import forge.card.CardRarity; import forge.card.CardRarity;
import forge.card.CardRules; import forge.card.CardRules;

5
forge-gui/src/main/java/forge/card/CardCharacteristics.java → forge-gui/src/main/java/forge/game/card/CardCharacteristics.java
View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package forge.card; package forge.game.card;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -25,8 +25,9 @@ import java.util.concurrent.CopyOnWriteArrayList;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import forge.card.CardEdition;
import forge.card.CardRarity;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
import forge.game.card.CardColor;
import forge.game.replacement.ReplacementEffect; import forge.game.replacement.ReplacementEffect;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.staticability.StaticAbility; import forge.game.staticability.StaticAbility;

1
forge-gui/src/main/java/forge/game/card/CardFactory.java
View File

@@ -24,7 +24,6 @@ import java.util.Map.Entry;
import forge.ImageCache; import forge.ImageCache;
import forge.card.CardCharacteristicName; import forge.card.CardCharacteristicName;
import forge.card.CardCharacteristics;
import forge.card.CardRules; import forge.card.CardRules;
import forge.card.CardSplitType; import forge.card.CardSplitType;
import forge.card.ICardFace; import forge.card.ICardFace;

1
forge-gui/src/main/java/forge/game/card/CardUtil.java
View File

@@ -26,7 +26,6 @@ import forge.Constant;
import forge.Singletons; import forge.Singletons;
import forge.Constant.Keywords; import forge.Constant.Keywords;
import forge.card.CardCharacteristicName; import forge.card.CardCharacteristicName;
import forge.card.CardCharacteristics;
import forge.card.ColorSet; import forge.card.ColorSet;
import forge.card.MagicColor; import forge.card.MagicColor;
import forge.game.Game; import forge.game.Game;

2
forge-gui/src/main/java/forge/game/spellability/AbilityTriggered.java
View File

@@ -21,9 +21,9 @@ import java.util.Arrays;
import forge.Command; import forge.Command;
import forge.card.CardCharacteristicName; import forge.card.CardCharacteristicName;
import forge.card.CardCharacteristics;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
import forge.game.card.Card; import forge.game.card.Card;
import forge.game.card.CardCharacteristics;
import forge.game.trigger.ZCTrigger; import forge.game.trigger.ZCTrigger;
/** /**