module separation in progress. Project cannot be compiled. Will restore in under an hour

forge-ai/pom.xml

@@ -18,11 +18,6 @@
             <artifactId>forge-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>forge</groupId>
-            <artifactId>forge-game</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
     </dependencies>
 </project>

forge-game/pom.xml

@@ -18,5 +18,15 @@
             <artifactId>forge-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.googlecode</groupId>
+            <artifactId>minlog</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>forge</groupId>
+            <artifactId>forge-ai</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>

forge-game/src/main/java/forge/Command.java

@@ -23,7 +23,7 @@ package forge;
  * </p>
  * 
  * @author Forge
- * @version $Id$
+ * @version $Id: Command.java 21051 2013-04-17 11:48:06Z Max mtg $
  */
 public interface Command extends java.io.Serializable, Runnable {
     /** Constant <code>Blank</code>. */

forge-game/src/main/java/forge/Constant.java

@@ -26,7 +26,7 @@ import java.util.List;
  * </p>
  * 
  * @author Forge
- * @version $Id$
+ * @version $Id: Constant.java 23713 2013-11-20 08:34:37Z Max mtg $
  */
 public final class Constant {
     // used to pass information between the GUI screens

forge-game/src/main/java/forge/PreferencesBridge.java

@@ -0,0 +1,10 @@
+package forge;
+
+public enum PreferencesBridge {
+    
+    Instance;
+    
+    public static enum GamePref {
+        
+    }
+}

forge-game/src/main/java/forge/ai/AiAttackController.java

@@ -43,7 +43,7 @@ import forge.game.zone.ZoneType;
  * </p>
  * 
  * @author Forge
- * @version $Id$
+ * @version $Id: AiAttackController.java 24355 2014-01-19 01:33:24Z swordshine $
  */
 public class AiAttackController {
 

forge-game/src/main/java/forge/ai/AiBlockController.java

@@ -43,7 +43,7 @@ import forge.game.trigger.TriggerType;
  * </p>
  * 
  * @author Forge
- * @version $Id$
+ * @version $Id: AiBlockController.java 24355 2014-01-19 01:33:24Z swordshine $
  */
 public class AiBlockController {
     

forge-game/src/main/java/forge/ai/AiController.java

@@ -34,7 +34,6 @@ import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
-import forge.Singletons;
 import forge.card.CardType;
 import forge.card.MagicColor;
 import forge.deck.CardPool;
@@ -63,7 +62,6 @@ import forge.game.spellability.SpellAbility;
 import forge.game.spellability.SpellPermanent;
 import forge.game.zone.ZoneType;
 import forge.item.PaperCard;
-import forge.properties.ForgePreferences.FPref;
 import forge.util.Aggregates;
 import forge.util.Expressions;
 import forge.util.MyRandom;
@@ -74,7 +72,7 @@ import forge.util.MyRandom;
  * </p>
  * 
  * @author Forge
- * @version $Id$
+ * @version $Id: AiController.java 24379 2014-01-20 14:13:13Z swordshine $
  */
 public class AiController {
 

forge-game/src/main/java/forge/ai/ComputerUtil.java

@@ -32,7 +32,6 @@ import com.google.common.collect.Iterables;
 import forge.card.CardType;
 import forge.card.MagicColor;
 import forge.card.CardType.Constant;
-import forge.error.BugReporter;
 import forge.game.Game;
 import forge.game.GameObject;
 import forge.game.ability.AbilityFactory;
@@ -77,7 +76,7 @@ import forge.util.MyRandom;
  * </p>
  * 
  * @author Forge
- * @version $Id$
+ * @version $Id: ComputerUtil.java 24317 2014-01-17 08:32:39Z Max mtg $
  */
 public class ComputerUtil {
 
@@ -821,7 +820,7 @@ public class ComputerUtil {
                     }
 
                 }  catch (final Exception ex) {
-                    BugReporter.reportException(ex, "There is an error in the card code for %s:%n", c.getName(), ex.getMessage());
+                    throw new RuntimeException(String.format("There is an error in the card code for %s:%n", c.getName(), ex.getMessage()), ex);
                 } 
             }
         }
@@ -868,8 +867,7 @@ public class ComputerUtil {
                         }
                     }
                 } catch (final Exception ex) {
-                    BugReporter.reportException(ex, "There is an error in the card code for %s:%n", c.getName(),
-                            ex.getMessage());
+                    throw new RuntimeException(String.format("There is an error in the card code for %s:%n", c.getName(), ex.getMessage()), ex);
                 }
             }
         }

forge-game/src/main/java/forge/ai/ComputerUtilMana.java

@@ -16,7 +16,6 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 
-import forge.FThreads;
 import forge.card.MagicColor;
 import forge.card.mana.ManaAtom;
 import forge.card.mana.ManaCost;
@@ -133,15 +132,15 @@ public class ComputerUtilMana {
         // select which abilities may be used for each shard
         MapOfLists<ManaCostShard, SpellAbility> sourcesForShards = ComputerUtilMana.groupAndOrderToPayShards(ai, manaAbilityMap, cost);
 
-        if (DEBUG_MANA_PAYMENT) {
-            System.out.println((test ? "test -- " : "PROD -- ") + FThreads.debugGetStackTraceItem(5, true));
-            for (Entry<ManaCostShard, Collection<SpellAbility>> src : sourcesForShards.entrySet()) {
-                System.out.println("\t" +src.getKey() + " : " + src.getValue().size() + " source(s)");
-                for (SpellAbility sss : src.getValue()) {
-                    System.out.printf("\t\t%s - %s%n", sss.getSourceCard(), sss);
-                }
-            }
-        }
+//        if (DEBUG_MANA_PAYMENT) {
+//            System.out.println((test ? "test -- " : "PROD -- ") + FThreads.debugGetStackTraceItem(5, true));
+//            for (Entry<ManaCostShard, Collection<SpellAbility>> src : sourcesForShards.entrySet()) {
+//                System.out.println("\t" +src.getKey() + " : " + src.getValue().size() + " source(s)");
+//                for (SpellAbility sss : src.getValue()) {
+//                    System.out.printf("\t\t%s - %s%n", sss.getSourceCard(), sss);
+//                }
+//            }
+//        }
 
         List<String> paymentPlan = new ArrayList<String>();
 
@@ -235,11 +234,11 @@ public class ComputerUtilMana {
         }
         handleOfferingsAI(sa, test, cost.isPaid());
 
-        if (DEBUG_MANA_PAYMENT) {
-            System.err.printf("%s > [%s] payment has %s (%s +%d) for (%s) %s:%n\t%s%n%n",
-                    FThreads.debugGetCurrThreadId(), test ? "test" : "PROD", cost.isPaid() ? "*PAID*" : "failed", originalCost,
-                    extraMana, sa.getSourceCard(), sa.toUnsuppressedString(), StringUtils.join(paymentPlan, "\n\t"));
-        }
+//        if (DEBUG_MANA_PAYMENT) {
+//            System.err.printf("%s > [%s] payment has %s (%s +%d) for (%s) %s:%n\t%s%n%n",
+//                    FThreads.debugGetCurrThreadId(), test ? "test" : "PROD", cost.isPaid() ? "*PAID*" : "failed", originalCost,
+//                    extraMana, sa.getSourceCard(), sa.toUnsuppressedString(), StringUtils.join(paymentPlan, "\n\t"));
+//        }
 
         if (!cost.isPaid()) {
             if (test) {

forge-game/src/main/java/forge/ai/ability/AddTurnAi.java

@@ -30,7 +30,7 @@ import forge.game.spellability.SpellAbility;
  * </p>
  * 
  * @author Forge
- * @version $Id$
+ * @version $Id: AddTurnAi.java 23792 2013-11-24 10:02:58Z Max mtg $
  */
 public class AddTurnAi extends SpellAbilityAi {
 

forge-game/src/main/java/forge/ai/ability/CountersAi.java

@@ -34,7 +34,7 @@ import forge.util.Aggregates;
  * </p>
  * 
  * @author Forge
- * @version $Id$
+ * @version $Id: CountersAi.java 23787 2013-11-24 07:09:23Z Max mtg $
  */
 public abstract class CountersAi {
     // An AbilityFactory subclass for Putting or Removing Counters on Cards.