- added bunde module to the maven build

- bundle module now builds the distributable tar.gz file - fixed gui test cases which needed files from moved res directory
2025-11-19 20:28:00 +00:00 · 2014-02-28 10:04:20 +00:00
parent 3ae604d414
commit 5de0bacd5f
30 changed files with 205 additions and 20 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -139,6 +139,16 @@ forge-ai/src/main/java/forge/ai/ability/UntapAi.java -text
 forge-ai/src/main/java/forge/ai/ability/UntapAllAi.java -text
 forge-ai/src/main/java/forge/ai/ability/ZoneExchangeAi.java -text
 forge-bundle/pom.xml svneol=native#text/xml
+forge-bundle/src/main/conf/cardsfolder.xml svneol=native#text/xml
+forge-bundle/src/main/conf/forge.ico -text svneol=unset#image/ico
+forge-bundle/src/main/conf/windows-linux.xml svneol=native#text/xml
+forge-bundle/src/main/resources/CHANGES.txt -text
+forge-bundle/src/main/resources/LICENSE.txt -text
+forge-bundle/src/main/resources/README.txt -text
+forge-bundle/src/main/resources/forge.bat svneol=native#text/plain
+forge-bundle/src/main/resources/forge.command svneol=native#text/x-sh
+forge-bundle/src/main/resources/forge.profile.properties.example -text
+forge-bundle/src/main/resources/forge.sh svneol=native#text/x-sh
 forge-bundle/src/main/resources/res/ai/Default.ai -text
 forge-bundle/src/main/resources/res/ai/Reckless.ai -text
 forge-bundle/src/main/resources/res/blockdata/blocks.txt svneol=native#text/plain
@@ -15402,18 +15412,11 @@ forge-gui/.project -text
 forge-gui/.settings/org.eclipse.core.resources.prefs -text
 forge-gui/.settings/org.eclipse.jdt.core.prefs -text
 forge-gui/.settings/org.eclipse.m2e.core.prefs -text
-forge-gui/CHANGES.txt -text
-forge-gui/LICENSE.txt -text
-forge-gui/README.txt -text
-forge-gui/forge.profile.properties.example -text
 forge-gui/pom.xml -text
 forge-gui/src/main/config/Forge.icns -text
 forge-gui/src/main/config/backgroundImage.jpg -text svneol=unset#image/jpeg
 forge-gui/src/main/config/builder/create-dmg.builder -text
 forge-gui/src/main/config/create-dmg -text
-forge-gui/src/main/config/forge.command svneol=native#text/x-sh
-forge-gui/src/main/config/forge.ico -text svneol=unset#image/ico
-forge-gui/src/main/config/forge.sh svneol=native#text/x-sh
 forge-gui/src/main/config/forge_checks.xml svneol=native#text/xml
 forge-gui/src/main/config/support/dmg-license.py svneol=native#text/x-python
 forge-gui/src/main/config/support/template.applescript -text
@@ -15955,6 +15958,18 @@ forge-gui/src/test/java/forge/gui/ListChooserTest.java svneol=native#text/plain
 forge-gui/src/test/java/forge/gui/game/CardDetailPanelTest.java svneol=native#text/plain
 forge-gui/src/test/java/forge/item/DeckHintsTest.java -text
 forge-gui/src/test/java/forge/model/FModelTest.java -text
+forge-gui/src/test/resources/cardsfolder/acidic_slime.txt svneol=native#text/plain
+forge-gui/src/test/resources/cardsfolder/ajanis_sunstriker.txt svneol=native#text/plain
+forge-gui/src/test/resources/cardsfolder/assault_griffin.txt svneol=native#text/plain
+forge-gui/src/test/resources/cardsfolder/auramancer.txt svneol=native#text/plain
+forge-gui/src/test/resources/cardsfolder/crown_of_empires.txt svneol=native#text/plain
+forge-gui/src/test/resources/cardsfolder/griffin_rider.txt svneol=native#text/plain
+forge-gui/src/test/resources/cardsfolder/llanowar_elves.txt svneol=native#text/plain
+forge-gui/src/test/resources/cardsfolder/mwonvuli_beast_tracker.txt svneol=native#text/plain
+forge-gui/src/test/resources/cardsfolder/scepter_of_empires.txt svneol=native#text/plain
+forge-gui/src/test/resources/cardsfolder/throne_of_empires.txt svneol=native#text/plain
+forge-gui/src/test/resources/cardsfolder/unsummon.txt svneol=native#text/plain
+forge-gui/src/test/resources/cardsfolder/wurms_tooth.txt svneol=native#text/plain
 forge-gui/tools/PerSetTracking.py svneol=native#text/x-python
 forge-gui/tools/assignSetInfo.py svneol=native#text/x-python
 forge-gui/tools/cardTemplateScript.py svneol=native#text/x-python
--- a/.gitignore
+++ b/.gitignore
@@ -81,6 +81,7 @@ forge-bundle/src/main/resources/res/skins/the_simpsons/decks
 forge-bundle/src/main/resources/res/skins/the_simpsons/layouts
 forge-bundle/src/main/resources/res/skins/the_simpsons/pics*
 forge-bundle/src/main/resources/res/skins/the_simpsons/pics_product
+forge-bundle/target
 forge-core/forge-core.iml
 forge-core/target
 forge-game/target
--- a/forge-bundle/pom.xml
+++ b/forge-bundle/pom.xml
@@ -55,9 +55,6 @@
 									<mainClass>forge.view.Main</mainClass>
 									<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 								</manifest>
-								<manifestEntries>
-									<Implementation-Version>${fullversionstring}</Implementation-Version>
-								</manifestEntries>
 							</archive>
 						</configuration>
 					</execution>
--- a/forge-bundle/src/main/conf/cardsfolder.xml
+++ b/forge-bundle/src/main/conf/cardsfolder.xml
@@ -0,0 +1,13 @@
+<assembly>
+	<id>bundle</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<fileSets>
+		<fileSet>
+			<directory>${project.basedir}/src/main/resources/res/cardsfolder</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+	</fileSets>
+</assembly>
--- a/forge-bundle/src/main/conf/forge.ico
+++ b/forge-bundle/src/main/conf/forge.ico
--- a/forge-bundle/src/main/conf/windows-linux.xml
+++ b/forge-bundle/src/main/conf/windows-linux.xml
@@ -0,0 +1,44 @@
+<assembly>
+	<id>bundle</id>
+	<formats>
+		<format>tar.bz2</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<fileSets>
+		<fileSet>
+			<directory>${project.basedir}/src/main/resources</directory>
+			<includes>
+				<include>forge.sh</include>
+				<include>forge.command</include>
+				<include>forge.bat</include>
+			</includes>
+			<outputDirectory>/</outputDirectory>
+			<filtered>true</filtered>
+		</fileSet>
+		<fileSet>
+			<directory>${project.basedir}/src/main/resources</directory>
+			<excludes>
+				<exclude>res/cardsfolder/**</exclude>
+				<exclude>forge.sh</exclude>
+				<exclude>forge.command</exclude>
+				<exclude>forge.bat</exclude>
+			</excludes>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${project.build.directory}</directory>
+			<includes>
+				<include>cardsfolder.zip</include>
+			</includes>
+			<outputDirectory>/res/cardsfolder</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${project.build.directory}</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>forge.exe</include>
+				<include>${project.build.finalName}-jar-with-dependencies.jar</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+</assembly>
--- a/forge-bundle/src/main/resources/CHANGES.txt
+++ b/forge-bundle/src/main/resources/CHANGES.txt
--- a/forge-bundle/src/main/resources/LICENSE.txt
+++ b/forge-bundle/src/main/resources/LICENSE.txt
--- a/forge-bundle/src/main/resources/README.txt
+++ b/forge-bundle/src/main/resources/README.txt
--- a/forge-bundle/src/main/resources/forge.bat
+++ b/forge-bundle/src/main/resources/forge.bat
@@ -0,0 +1,4 @@
+@echo off
+SETLOCAL
+cd %~dp0
+java -Xmx1024M -cp "%~dp0res";"%~dp0${project.build.finalName}-jar-with-dependencies.jar" forge.view.Main
--- a/forge-bundle/src/main/resources/forge.command
+++ b/forge-bundle/src/main/resources/forge.command
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd "`dirname \"$0\"`"
+java -Xmx1024m -cp res;${project.build.finalName}-jar-with-dependencies.jar forge.view.Main
--- a/forge-bundle/src/main/resources/forge.profile.properties.example
+++ b/forge-bundle/src/main/resources/forge.profile.properties.example
--- a/forge-bundle/src/main/resources/forge.sh
+++ b/forge-bundle/src/main/resources/forge.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd "`dirname \"$0\"`"
+java -Xmx1024m -cp res;${project.build.finalName}-jar-with-dependencies.jar forge.view.Main
--- a/forge-gui/src/main/config/forge.command
+++ b/forge-gui/src/main/config/forge.command
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd "`dirname \"$0\"`"
-java -Xmx1024m -jar $project.build.finalName$
--- a/forge-gui/src/main/config/forge.sh
+++ b/forge-gui/src/main/config/forge.sh
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd "`dirname \"$0\"`"
-java -Xmx1024m -jar $project.build.finalName$
--- a/forge-gui/src/main/java/forge/properties/NewConstants.java
+++ b/forge-gui/src/main/java/forge/properties/NewConstants.java
@@ -25,7 +25,7 @@ public final class NewConstants {
    public static final String PROFILE_TEMPLATE_FILE = PROFILE_FILE + ".example";

    // data that is only in the program dir
-    private static final String _RES_ROOT = "res/";
+    private static final String _RES_ROOT = NewConstants.class.getResource("/").getFile();
    private static final String _LIST_DIR = _RES_ROOT + "lists/";
    public static final String KEYWORD_LIST_FILE                     = _LIST_DIR + "NonStackingKWList.txt";
    public static final String TYPE_LIST_FILE                        = _LIST_DIR + "TypeLists.txt";
--- a/forge-gui/src/test/java/forge/item/DeckHintsTest.java
+++ b/forge-gui/src/test/java/forge/item/DeckHintsTest.java
@@ -127,8 +127,7 @@ public class DeckHintsTest {
     * @return the CardPrinted
     */
    protected PaperCard readCard(String filename) {
-        String firstLetter = filename.substring(0, 1);
-        File dir = new File(NewConstants.CARD_DATA_DIR, firstLetter);
+        File dir = new File(NewConstants.CARD_DATA_DIR);
        File txtFile = new File(dir, filename);

        CardRules.Reader crr = new CardRules.Reader();
--- a/forge-gui/src/test/resources/cardsfolder/acidic_slime.txt
+++ b/forge-gui/src/test/resources/cardsfolder/acidic_slime.txt
@@ -0,0 +1,10 @@
+Name:Acidic Slime
+ManaCost:3 G G
+Types:Creature Ooze
+PT:2/2
+K:Deathtouch
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target artifact, enchantment, or land.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact,Enchantment,Land | TgtPrompt$ Select an artifact, enchantment, or land.
+SVar:PlayMain1:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_slime.jpg
+Oracle:Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.)\nWhen Acidic Slime enters the battlefield, destroy target artifact, enchantment, or land.
--- a/forge-gui/src/test/resources/cardsfolder/ajanis_sunstriker.txt
+++ b/forge-gui/src/test/resources/cardsfolder/ajanis_sunstriker.txt
@@ -0,0 +1,7 @@
+Name:Ajani's Sunstriker
+ManaCost:W W
+Types:Creature Cat Cleric
+PT:2/2
+K:Lifelink
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ajanis_sunstriker.jpg
+Oracle:Lifelink (Damage dealt by this creature also causes you to gain that much life.)
--- a/forge-gui/src/test/resources/cardsfolder/assault_griffin.txt
+++ b/forge-gui/src/test/resources/cardsfolder/assault_griffin.txt
@@ -0,0 +1,7 @@
+Name:Assault Griffin
+ManaCost:3 W
+Types:Creature Griffin
+PT:3/2
+K:Flying
+SVar:Picture:http://www.wizards.com/global/images/magic/general/assault_griffin.jpg
+Oracle:Flying
--- a/forge-gui/src/test/resources/cardsfolder/auramancer.txt
+++ b/forge-gui/src/test/resources/cardsfolder/auramancer.txt
@@ -0,0 +1,8 @@
+Name:Auramancer
+ManaCost:2 W
+Types:Creature Human Wizard
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return target enchantment card from your graveyard to your hand.
+SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Enchantment.YouCtrl
+SVar:Picture:http://www.wizards.com/global/images/magic/general/auramancer.jpg
+Oracle:When Auramancer enters the battlefield, you may return target enchantment card from your graveyard to your hand.
--- a/forge-gui/src/test/resources/cardsfolder/crown_of_empires.txt
+++ b/forge-gui/src/test/resources/cardsfolder/crown_of_empires.txt
@@ -0,0 +1,13 @@
+Name:Crown of Empires
+ManaCost:2
+Types:Artifact
+A:AB$ Tap | Cost$ 3 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | ConditionCheckSVar$ M12Complete | ConditionSVarCompare$ EQ0 | SubAbility$ DBControl | SpellDescription$ Tap target creature. Gain control of that creature instead if you control artifacts named Scepter of Empires and Throne of Empires.
+SVar:DBControl:DB$ GainControl | Defined$ Targeted | ConditionCheckSVar$ M12Complete
+SVar:RemRandomDeck:True
+DeckHints:Name$Scepter of Empires|Throne of Empires
+SVar:M12Complete:Count$Compare AllM12Empires GT0.1.0
+SVar:AllM12Empires:SVar$X/Times.Y
+SVar:X:Count$Valid Artifact.namedScepter of Empires+YouCtrl
+SVar:Y:Count$Valid Artifact.namedThrone of Empires+YouCtrl
+SVar:Picture:http://www.wizards.com/global/images/magic/general/crown_of_empires.jpg
+Oracle:{3}, {T}: Tap target creature. Gain control of that creature instead if you control artifacts named Scepter of Empires and Throne of Empires.
--- a/forge-gui/src/test/resources/cardsfolder/griffin_rider.txt
+++ b/forge-gui/src/test/resources/cardsfolder/griffin_rider.txt
@@ -0,0 +1,11 @@
+Name:Griffin Rider
+ManaCost:1 W
+Types:Creature Human Knight
+PT:1/1
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddToughness$ 3 | AddKeyword$ Flying | CheckSVar$ X | SVarCompare$ GE1 | Description$ As long as you control a Griffin, CARDNAME gets +3/+3 and has flying.
+SVar:X:Count$Valid Griffin.YouCtrl
+SVar:BuffedBy:Griffin
+SVar:RemRandomDeck:True
+DeckHints:Type$Griffin
+SVar:Picture:http://www.wizards.com/global/images/magic/general/griffin_rider.jpg
+Oracle:As long as you control a Griffin creature, Griffin Rider gets +3/+3 and has flying.
--- a/forge-gui/src/test/resources/cardsfolder/llanowar_elves.txt
+++ b/forge-gui/src/test/resources/cardsfolder/llanowar_elves.txt
@@ -0,0 +1,7 @@
+Name:Llanowar Elves
+ManaCost:G
+Types:Creature Elf Druid
+PT:1/1
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G} to your mana pool.
+SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83515.jpg
+Oracle:{T}: Add {G} to your mana pool.
--- a/forge-gui/src/test/resources/cardsfolder/mwonvuli_beast_tracker.txt
+++ b/forge-gui/src/test/resources/cardsfolder/mwonvuli_beast_tracker.txt
@@ -0,0 +1,10 @@
+Name:Mwonvuli Beast Tracker
+ManaCost:1 G G
+Types:Creature Human Scout
+PT:2/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ ScoutSearch | TriggerDescription$ When CARDNAME enters the battlefield, search your library for a creature card with deathtouch, hexproof, reach or trample and reveal it. Shuffle your library, then put that card on top of it.
+SVar:ScoutSearch:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeNum$ 1 | ChangeType$ Creature.withDeathtouch+YouCtrl,Creature.withHexproof+YouCtrl,Creature.withReach+YouCtrl,Creature.withTrample+YouCtrl
+SVar:RemRandomDeck:True
+DeckHints:Keyword$Deathtouch|Hexproof|Reach|Trample
+SVar:Picture:http://www.wizards.com/global/images/magic/general/mwonvuli_beast_tracker.jpg
+Oracle:When Mwonvuli Beast Tracker enters the battlefield, search your library for a creature card with deathtouch, hexproof, reach, or trample and reveal it. Shuffle your library and put that card on top of it.
--- a/forge-gui/src/test/resources/cardsfolder/scepter_of_empires.txt
+++ b/forge-gui/src/test/resources/cardsfolder/scepter_of_empires.txt
@@ -0,0 +1,12 @@
+Name:Scepter of Empires
+ManaCost:3
+Types:Artifact
+A:AB$ DealDamage | Cost$ T | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ X | References$ X,Y,Z,AllM12Empires | SpellDescription$ CARDNAME deals 1 damage to target player. It deals 3 damage to that player instead if you control artifacts named Crown of Empires and Throne of Empires.
+SVar:X:Count$Compare AllM12Empires GT0.3.1
+SVar:AllM12Empires:SVar$Z/Times.Y
+SVar:Z:Count$Valid Artifact.namedCrown of Empires+YouCtrl
+SVar:Y:Count$Valid Artifact.namedThrone of Empires+YouCtrl
+SVar:RemRandomDeck:True
+DeckHints:Name$Throne of Empires|Crown of Empires
+SVar:Picture:http://www.wizards.com/global/images/magic/general/scepter_of_empires.jpg
+Oracle:{T}: Scepter of Empires deals 1 damage to target player. It deals 3 damage to that player instead if you control artifacts named Crown of Empires and Throne of Empires.
--- a/forge-gui/src/test/resources/cardsfolder/throne_of_empires.txt
+++ b/forge-gui/src/test/resources/cardsfolder/throne_of_empires.txt
@@ -0,0 +1,12 @@
+Name:Throne of Empires
+ManaCost:4
+Types:Artifact
+A:AB$ Token | Cost$ 1 T | TokenAmount$ X | References$ X,Y,Z,AllM12Empires | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 white Soldier creature token onto the battlefield. Put five of those tokens onto the battlefield instead if you control artifacts named Crown of Empires and Scepter of Empires.
+SVar:X:Count$Compare AllM12Empires GT0.5.1
+SVar:AllM12Empires:SVar$Z/Times.Y
+SVar:Z:Count$Valid Artifact.namedCrown of Empires+YouCtrl
+SVar:Y:Count$Valid Artifact.namedScepter of Empires+YouCtrl
+SVar:RemRandomDeck:True
+DeckHints:Name$Scepter of Empires|Crown of Empires
+SVar:Picture:http://www.wizards.com/global/images/magic/general/throne_of_empires.jpg
+Oracle:{1}, {T}: Put a 1/1 white Soldier creature token onto the battlefield. Put five of those tokens onto the battlefield instead if you control artifacts named Crown of Empires and Scepter of Empires.
--- a/forge-gui/src/test/resources/cardsfolder/unsummon.txt
+++ b/forge-gui/src/test/resources/cardsfolder/unsummon.txt
@@ -0,0 +1,6 @@
+Name:Unsummon
+ManaCost:U
+Types:Instant
+A:SP$ ChangeZone | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/unsummon.jpg
+Oracle:Return target creature to its owner's hand.
--- a/forge-gui/src/test/resources/cardsfolder/wurms_tooth.txt
+++ b/forge-gui/src/test/resources/cardsfolder/wurms_tooth.txt
@@ -0,0 +1,9 @@
+Name:Wurm's Tooth
+ManaCost:2
+Types:Artifact
+T:Mode$ SpellCast | ValidCard$ Card.Green | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ Whenever a player casts a green spell, you may gain 1 life.
+SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
+SVar:RemRandomDeck:True
+DeckNeeds:Color$Green
+SVar:Picture:http://www.wizards.com/global/images/magic/general/wurms_tooth.jpg
+Oracle:Whenever a player casts a green spell, you may gain 1 life.
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,7 @@

    <modules>
        <module>forge-ai</module>
-		<!--module>forge-bundle</module-->
+		<module>forge-bundle</module>
        <module>forge-core</module>
        <module>forge-game</module>
        <module>forge-gui</module>