diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 8bd04935929..850b0f7bff0 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -44,6 +44,7 @@ import forge.card.spellability.SpellPermanent; import forge.card.staticability.StaticAbility; import forge.card.trigger.Trigger; import forge.item.CardDb; +import forge.util.MyRandom; /** *
diff --git a/src/main/java/forge/CardList.java b/src/main/java/forge/CardList.java index ebb30942ba4..8fdd770f585 100644 --- a/src/main/java/forge/CardList.java +++ b/src/main/java/forge/CardList.java @@ -27,6 +27,7 @@ import com.google.code.jyield.Generator; import com.google.code.jyield.Yieldable; import forge.card.spellability.SpellAbility; +import forge.util.MyRandom; /** *
diff --git a/src/main/java/forge/CardUtil.java b/src/main/java/forge/CardUtil.java index 34184547f47..3859ed2ea91 100644 --- a/src/main/java/forge/CardUtil.java +++ b/src/main/java/forge/CardUtil.java @@ -38,6 +38,7 @@ import forge.gui.input.InputPayManaCostUtil; import forge.item.CardPrinted; import forge.properties.ForgeProps; import forge.properties.NewConstants; +import forge.util.MyRandom; /** *
diff --git a/src/main/java/forge/ComputerUtilAttack.java b/src/main/java/forge/ComputerUtilAttack.java index 7d0c838a101..71b041885c0 100644 --- a/src/main/java/forge/ComputerUtilAttack.java +++ b/src/main/java/forge/ComputerUtilAttack.java @@ -24,6 +24,7 @@ import java.util.Random; import forge.Constant.Zone; import forge.card.cardfactory.CardFactoryUtil; import forge.card.trigger.Trigger; +import forge.util.MyRandom; //doesHumanAttackAndWin() uses the global variable AllZone.getComputerPlayer() /** diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index 848b4f5ce7a..187e8026755 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -58,6 +58,7 @@ import forge.gui.input.InputPayManaCostUtil; import forge.item.CardPrinted; import forge.properties.ForgeProps; import forge.properties.NewConstants.Lang.GameAction.GameActionText; +import forge.util.MyRandom; import forge.view.GuiTopLevel; import forge.view.match.ViewWinLose; diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java index 52a5e4097bb..13296854dfa 100644 --- a/src/main/java/forge/GameActionUtil.java +++ b/src/main/java/forge/GameActionUtil.java @@ -33,6 +33,7 @@ import forge.game.GameLossReason; import forge.gui.GuiUtils; import forge.gui.input.InputPayManaCostAbility; import forge.gui.input.InputPayManaCostUtil; +import forge.util.MyRandom; /** *
diff --git a/src/main/java/forge/GuiDownloadSetPicturesLQ.java b/src/main/java/forge/GuiDownloadSetPicturesLQ.java index 22d910c28ea..f5863f33b66 100644 --- a/src/main/java/forge/GuiDownloadSetPicturesLQ.java +++ b/src/main/java/forge/GuiDownloadSetPicturesLQ.java @@ -29,6 +29,7 @@ import forge.item.CardDb; import forge.item.CardPrinted; import forge.properties.ForgeProps; import forge.properties.NewConstants; +import forge.util.Base64Coder; /** *
diff --git a/src/main/java/forge/GuiDownloader.java b/src/main/java/forge/GuiDownloader.java index 27ee22cd939..4e62a8407f9 100644 --- a/src/main/java/forge/GuiDownloader.java +++ b/src/main/java/forge/GuiDownloader.java @@ -58,6 +58,7 @@ import com.esotericsoftware.minlog.Log; import forge.error.ErrorViewer; import forge.properties.ForgeProps; import forge.properties.NewConstants; +import forge.util.MyRandom; /** *
diff --git a/src/main/java/forge/GuiImportPicture.java b/src/main/java/forge/GuiImportPicture.java index 5227458cc91..afe8e49b24a 100644 --- a/src/main/java/forge/GuiImportPicture.java +++ b/src/main/java/forge/GuiImportPicture.java @@ -43,6 +43,7 @@ import javax.swing.event.MouseInputAdapter; import forge.properties.ForgeProps; import forge.properties.NewConstants; +import forge.util.CopyFiles; /** *
diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java index e8fd71f5e01..140fb8aa838 100644 --- a/src/main/java/forge/Player.java +++ b/src/main/java/forge/Player.java @@ -35,6 +35,7 @@ import forge.card.spellability.SpellAbility; import forge.card.staticability.StaticAbility; import forge.game.GameLossReason; import forge.gui.GuiUtils; +import forge.util.MyRandom; import forge.view.GuiTopLevel; import forge.view.match.MatchTopLevel; diff --git a/src/main/java/forge/SetUtils.java b/src/main/java/forge/SetUtils.java index a71c5b3c074..80f04c024b2 100644 --- a/src/main/java/forge/SetUtils.java +++ b/src/main/java/forge/SetUtils.java @@ -29,6 +29,7 @@ import org.apache.commons.lang3.StringUtils; import forge.card.CardBlock; import forge.card.CardSet; import forge.game.GameFormat; +import forge.util.FileUtil; /** *
diff --git a/src/main/java/forge/Time.java b/src/main/java/forge/Time.java
deleted file mode 100644
index 96808a66b4b..00000000000
--- a/src/main/java/forge/Time.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Forge: Play Magic: the Gathering.
- * Copyright (C) 2011 Forge Team
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see
- * Time class. - *
- * - * @author Forge - * @version $Id$ - */ -public class Time { - private long startTime; - private long stopTime; - - /** - *- * Constructor for Time. - *
- */ - public Time() { - this.start(); - } - - /** - *- * start. - *
- */ - public final void start() { - this.startTime = System.currentTimeMillis(); - } - - /** - *- * stop. - *
- * - * @return a double. - */ - public final double stop() { - this.stopTime = System.currentTimeMillis(); - return this.getTime(); - } - - /** - *- * getTime. - *
- * - * @return a double. - */ - public final double getTime() { - return (this.stopTime - this.startTime) / 1000.0; - } -} diff --git a/src/main/java/forge/card/BoosterGenerator.java b/src/main/java/forge/card/BoosterGenerator.java index d08286920a9..e7b86ae8f3d 100644 --- a/src/main/java/forge/card/BoosterGenerator.java +++ b/src/main/java/forge/card/BoosterGenerator.java @@ -26,10 +26,10 @@ import java.util.Map.Entry; import net.slightlymagic.braids.util.lambda.Lambda1; import net.slightlymagic.maxmtg.Closure1; import net.slightlymagic.maxmtg.Predicate; -import forge.MyRandom; import forge.deck.Deck; import forge.item.CardDb; import forge.item.CardPrinted; +import forge.util.MyRandom; /** *
diff --git a/src/main/java/forge/card/BoosterUtils.java b/src/main/java/forge/card/BoosterUtils.java
index 1ee6ec0793c..a9b326d8217 100644
--- a/src/main/java/forge/card/BoosterUtils.java
+++ b/src/main/java/forge/card/BoosterUtils.java
@@ -26,9 +26,9 @@ import net.slightlymagic.maxmtg.Predicate;
import org.apache.commons.lang3.StringUtils;
import forge.Constant;
-import forge.MyRandom;
import forge.item.CardDb;
import forge.item.CardPrinted;
+import forge.util.MyRandom;
// The BoosterPack generates cards for the Card Pool in Quest Mode
/**
diff --git a/src/main/java/forge/card/MtgDataParser.java b/src/main/java/forge/card/MtgDataParser.java
index ecbf2b13024..616c7a1648b 100644
--- a/src/main/java/forge/card/MtgDataParser.java
+++ b/src/main/java/forge/card/MtgDataParser.java
@@ -25,10 +25,10 @@ import java.util.Map;
import org.apache.commons.lang3.StringUtils;
-import forge.FileUtil;
import forge.card.CardManaCost.ManaParser;
import forge.properties.ForgeProps;
import forge.properties.NewConstants;
+import forge.util.FileUtil;
/** This class can read CardRules from Arch's mtg-data.txt file. */
public final class MtgDataParser implements Iterator
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java
index c8d5f745384..7db7bc21120 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryAttach.java
@@ -35,7 +35,6 @@ import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
import forge.GameEntity;
-import forge.MyRandom;
import forge.Player;
import forge.card.cardfactory.CardFactoryUtil;
import forge.card.cost.Cost;
@@ -47,6 +46,7 @@ import forge.card.spellability.SpellPermanent;
import forge.card.spellability.Target;
import forge.card.staticability.StaticAbility;
import forge.gui.GuiUtils;
+import forge.util.MyRandom;
/**
* The Class AbilityFactory_Attach.
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
index c1e6aa0e483..94de20aab8e 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
@@ -34,7 +34,6 @@ import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
import forge.GameActionUtil;
-import forge.MyRandom;
import forge.Player;
import forge.PlayerZone;
import forge.card.cardfactory.CardFactoryUtil;
@@ -47,6 +46,7 @@ import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellPermanent;
import forge.card.spellability.Target;
import forge.gui.GuiUtils;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java
index 033215a3199..54c68a63dbd 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java
@@ -32,7 +32,6 @@ import forge.Command;
import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
-import forge.MyRandom;
import forge.card.cardfactory.CardFactoryUtil;
import forge.card.spellability.Ability;
import forge.card.spellability.AbilityActivated;
@@ -41,6 +40,7 @@ import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target;
import forge.gui.GuiUtils;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java
index cdd77670d53..069e8613000 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java
@@ -23,7 +23,6 @@ import java.util.HashMap;
import forge.AllZone;
import forge.Card;
import forge.ComputerUtil;
-import forge.MyRandom;
import forge.card.cardfactory.CardFactoryUtil;
import forge.card.cost.Cost;
import forge.card.cost.CostUtil;
@@ -34,6 +33,7 @@ import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellAbilityStackInstance;
import forge.card.spellability.Target;
import forge.card.spellability.TargetSelection;
+import forge.util.MyRandom;
//Destination - send countered spell to: (only applies to Spells; ignored for Abilities)
// -Graveyard (Default)
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java
index 83e26cfe756..5f04b952394 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java
@@ -32,7 +32,6 @@ import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
import forge.Counters;
-import forge.MyRandom;
import forge.PhaseHandler;
import forge.Player;
import forge.PlayerZone;
@@ -46,6 +45,7 @@ import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target;
import forge.gui.GuiUtils;
import forge.gui.input.Input;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java
index 997e7404b3f..8eb0212028e 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java
@@ -30,7 +30,6 @@ import forge.CardUtil;
import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
-import forge.MyRandom;
import forge.Player;
import forge.card.cardfactory.CardFactoryUtil;
import forge.card.cost.Cost;
@@ -40,6 +39,7 @@ import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java
index 1bfb17a0e23..b041949e8d4 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java
@@ -33,7 +33,6 @@ import forge.Command;
import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
-import forge.MyRandom;
import forge.card.cardfactory.CardFactoryUtil;
import forge.card.cost.Cost;
import forge.card.cost.CostUtil;
@@ -43,6 +42,7 @@ import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellAbilityRestriction;
import forge.card.spellability.Target;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java
index a09ccdeae1b..8ad8aa21891 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java
@@ -30,7 +30,6 @@ import forge.CardListFilter;
import forge.CardUtil;
import forge.ComputerUtil;
import forge.Constant.Zone;
-import forge.MyRandom;
import forge.Player;
import forge.card.cardfactory.CardFactoryUtil;
import forge.card.cost.Cost;
@@ -40,6 +39,7 @@ import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java
index a96908b7d54..76fd508b42b 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryEffect.java
@@ -30,7 +30,6 @@ import forge.Command;
import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
-import forge.MyRandom;
import forge.PhaseHandler;
import forge.Player;
import forge.card.spellability.AbilityActivated;
@@ -40,6 +39,7 @@ import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target;
import forge.card.trigger.Trigger;
import forge.card.trigger.TriggerHandler;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java
index 67141f48b43..5a1fb953ef8 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryMana.java
@@ -30,7 +30,6 @@ import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
import forge.Counters;
-import forge.MyRandom;
import forge.Player;
import forge.card.cardfactory.CardFactoryUtil;
import forge.card.cost.Cost;
@@ -42,6 +41,7 @@ import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target;
import forge.gui.GuiUtils;
import forge.gui.input.InputPayManaCostUtil;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java
index 25cdc6e4c89..3e13b9dd2b3 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java
@@ -30,7 +30,6 @@ import forge.CardListFilter;
import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
-import forge.MyRandom;
import forge.PhaseHandler;
import forge.Player;
import forge.card.cardfactory.CardFactoryUtil;
@@ -42,6 +41,7 @@ import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target;
import forge.gui.GuiUtils;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
index 7e540bb4932..0d8ec3377f3 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryPump.java
@@ -32,7 +32,6 @@ import forge.Command;
import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
-import forge.MyRandom;
import forge.Player;
import forge.card.cardfactory.CardFactoryUtil;
import forge.card.cost.Cost;
@@ -43,6 +42,7 @@ import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellAbilityRestriction;
import forge.card.spellability.Target;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryReveal.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryReveal.java
index 1d9ece08892..4fceac2353a 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryReveal.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryReveal.java
@@ -34,7 +34,6 @@ import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
import forge.GameActionUtil;
-import forge.MyRandom;
import forge.Player;
import forge.PlayerZone;
import forge.card.cost.Cost;
@@ -45,6 +44,7 @@ import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target;
import forge.gui.GuiUtils;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java b/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java
index d40d4920ff5..1b31b20eecf 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java
@@ -28,7 +28,6 @@ import forge.CardList;
import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
-import forge.MyRandom;
import forge.Player;
import forge.card.cardfactory.CardFactoryUtil;
import forge.card.cost.Cost;
@@ -39,6 +38,7 @@ import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target;
import forge.gui.GuiUtils;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java
index a4f021a0368..1cf21241408 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryToken.java
@@ -28,7 +28,6 @@ import forge.CardList;
import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
-import forge.MyRandom;
import forge.Player;
import forge.card.cardfactory.CardFactoryUtil;
import forge.card.cost.Cost;
@@ -40,6 +39,7 @@ import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target;
import forge.card.trigger.Trigger;
import forge.card.trigger.TriggerHandler;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
index 75032b1b82b..0f34867807f 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
@@ -31,7 +31,6 @@ import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
import forge.GameActionUtil;
-import forge.MyRandom;
import forge.Player;
import forge.card.cardfactory.CardFactoryUtil;
import forge.card.cost.Cost;
@@ -42,6 +41,7 @@ import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target;
import forge.gui.GuiUtils;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/cardfactory/AbstractCardFactory.java b/src/main/java/forge/card/cardfactory/AbstractCardFactory.java
index e2efbe90a85..822f61e6625 100644
--- a/src/main/java/forge/card/cardfactory/AbstractCardFactory.java
+++ b/src/main/java/forge/card/cardfactory/AbstractCardFactory.java
@@ -40,7 +40,6 @@ import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
import forge.Counters;
-import forge.FileUtil;
import forge.GameActionUtil;
import forge.Player;
import forge.PlayerZone;
@@ -59,6 +58,7 @@ import forge.gui.input.Input;
import forge.gui.input.InputPayManaCost;
import forge.properties.ForgeProps;
import forge.properties.NewConstants;
+import forge.util.FileUtil;
/**
*
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java
index f4cdebf8336..48f1b5131e0 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java
@@ -37,7 +37,6 @@ import forge.Constant;
import forge.Constant.Zone;
import forge.Counters;
import forge.GameActionUtil;
-import forge.MyRandom;
import forge.Player;
import forge.PlayerZone;
import forge.card.abilityfactory.AbilityFactory;
@@ -55,6 +54,7 @@ import forge.card.trigger.Trigger;
import forge.gui.GuiUtils;
import forge.gui.input.Input;
import forge.gui.input.InputPayManaCost;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryInstants.java b/src/main/java/forge/card/cardfactory/CardFactoryInstants.java
index f0320594f87..0792843a5e4 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryInstants.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryInstants.java
@@ -29,7 +29,6 @@ import forge.Command;
import forge.ComputerUtil;
import forge.Constant;
import forge.Constant.Zone;
-import forge.MyRandom;
import forge.PhaseUtil;
import forge.Player;
import forge.PlayerZone;
@@ -40,6 +39,7 @@ import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target;
import forge.gui.GuiUtils;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryLands.java b/src/main/java/forge/card/cardfactory/CardFactoryLands.java
index 4581f2daf7c..3fabf3e1bf8 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryLands.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryLands.java
@@ -30,7 +30,6 @@ import forge.Constant;
import forge.Constant.Zone;
import forge.Counters;
import forge.GameActionUtil;
-import forge.MyRandom;
import forge.Player;
import forge.PlayerZone;
import forge.card.cost.Cost;
@@ -40,6 +39,7 @@ import forge.card.spellability.AbilityMana;
import forge.card.spellability.SpellAbility;
import forge.gui.GuiUtils;
import forge.gui.input.Input;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
index 51253d06a6f..3be9ee433e9 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
@@ -45,7 +45,6 @@ import forge.Constant.Zone;
import forge.Counters;
import forge.GameActionUtil;
import forge.HandSizeOp;
-import forge.MyRandom;
import forge.PhaseHandler;
import forge.Player;
import forge.PlayerZone;
@@ -67,6 +66,7 @@ import forge.gui.GuiUtils;
import forge.gui.input.Input;
import forge.gui.input.InputPayManaCost;
import forge.gui.input.InputPayManaCostUtil;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/deck/DeckGeneration.java b/src/main/java/forge/deck/DeckGeneration.java
index 0f23d603a99..fa651a0bab8 100644
--- a/src/main/java/forge/deck/DeckGeneration.java
+++ b/src/main/java/forge/deck/DeckGeneration.java
@@ -22,7 +22,6 @@ import java.util.Random;
import forge.CardList;
import forge.Constant;
-import forge.MyRandom;
import forge.PlayerType;
import forge.deck.generate.Generate2ColorDeck;
import forge.deck.generate.Generate3ColorDeck;
@@ -32,6 +31,7 @@ import forge.deck.generate.GenerateConstructedMultiColorDeck;
import forge.deck.generate.GenerateThemeDeck;
import forge.game.GameType;
import forge.gui.GuiUtils;
+import forge.util.MyRandom;
/**
* Utility class to hold add deck generation routines, methods moved from
diff --git a/src/main/java/forge/deck/DeckManager.java b/src/main/java/forge/deck/DeckManager.java
index 06fd654174f..85148142c34 100644
--- a/src/main/java/forge/deck/DeckManager.java
+++ b/src/main/java/forge/deck/DeckManager.java
@@ -41,7 +41,6 @@ import javax.swing.filechooser.FileFilter;
import org.apache.commons.lang3.StringUtils;
import forge.Card;
-import forge.FileUtil;
import forge.PlayerType;
import forge.error.ErrorViewer;
import forge.game.GameType;
@@ -50,6 +49,7 @@ import forge.item.CardPrinted;
import forge.item.ItemPoolView;
import forge.properties.ForgeProps;
import forge.properties.NewConstants;
+import forge.util.FileUtil;
import freemarker.template.Configuration;
import freemarker.template.DefaultObjectWrapper;
import freemarker.template.Template;
diff --git a/src/main/java/forge/deck/generate/Generate2ColorDeck.java b/src/main/java/forge/deck/generate/Generate2ColorDeck.java
index dfadc89af4b..09e50b74d43 100644
--- a/src/main/java/forge/deck/generate/Generate2ColorDeck.java
+++ b/src/main/java/forge/deck/generate/Generate2ColorDeck.java
@@ -28,11 +28,11 @@ import forge.CardFilter;
import forge.CardList;
import forge.CardListFilter;
import forge.Constant;
-import forge.MyRandom;
import forge.PlayerType;
import forge.Singletons;
import forge.error.ErrorViewer;
import forge.properties.ForgeProps;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/deck/generate/Generate3ColorDeck.java b/src/main/java/forge/deck/generate/Generate3ColorDeck.java
index 857f2d062c0..3044e370258 100644
--- a/src/main/java/forge/deck/generate/Generate3ColorDeck.java
+++ b/src/main/java/forge/deck/generate/Generate3ColorDeck.java
@@ -28,11 +28,11 @@ import forge.CardFilter;
import forge.CardList;
import forge.CardListFilter;
import forge.Constant;
-import forge.MyRandom;
import forge.PlayerType;
import forge.Singletons;
import forge.error.ErrorViewer;
import forge.properties.ForgeProps;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/deck/generate/Generate5ColorDeck.java b/src/main/java/forge/deck/generate/Generate5ColorDeck.java
index d6d24f43379..fcc2ccadfee 100644
--- a/src/main/java/forge/deck/generate/Generate5ColorDeck.java
+++ b/src/main/java/forge/deck/generate/Generate5ColorDeck.java
@@ -28,11 +28,11 @@ import forge.CardFilter;
import forge.CardList;
import forge.CardListFilter;
import forge.Constant;
-import forge.MyRandom;
import forge.PlayerType;
import forge.Singletons;
import forge.error.ErrorViewer;
import forge.properties.ForgeProps;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/deck/generate/GenerateThemeDeck.java b/src/main/java/forge/deck/generate/GenerateThemeDeck.java
index 316370cef9f..8b5ac353748 100644
--- a/src/main/java/forge/deck/generate/GenerateThemeDeck.java
+++ b/src/main/java/forge/deck/generate/GenerateThemeDeck.java
@@ -29,8 +29,8 @@ import java.util.Random;
import forge.AllZone;
import forge.Card;
import forge.CardList;
-import forge.MyRandom;
import forge.error.ErrorViewer;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/game/limited/BoosterDraft.java b/src/main/java/forge/game/limited/BoosterDraft.java
index 103156e00c8..9c24ed7655b 100644
--- a/src/main/java/forge/game/limited/BoosterDraft.java
+++ b/src/main/java/forge/game/limited/BoosterDraft.java
@@ -35,8 +35,6 @@ import forge.AllZone;
import forge.Card;
import forge.CardList;
import forge.Constant;
-import forge.FileUtil;
-import forge.HttpUtil;
import forge.SetUtils;
import forge.card.BoosterGenerator;
import forge.card.CardBlock;
@@ -50,6 +48,8 @@ import forge.item.ItemPool;
import forge.item.ItemPoolView;
import forge.properties.ForgeProps;
import forge.properties.NewConstants;
+import forge.util.FileUtil;
+import forge.util.HttpUtil;
/**
*
diff --git a/src/main/java/forge/game/limited/BoosterDraftAI.java b/src/main/java/forge/game/limited/BoosterDraftAI.java
index 3e5ab7603a7..6be955b37b1 100644
--- a/src/main/java/forge/game/limited/BoosterDraftAI.java
+++ b/src/main/java/forge/game/limited/BoosterDraftAI.java
@@ -31,10 +31,10 @@ import forge.CardList;
import forge.CardListFilter;
import forge.CardListUtil;
import forge.Constant;
-import forge.MyRandom;
import forge.card.spellability.AbilityMana;
import forge.deck.Deck;
import forge.game.GameType;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/game/limited/CardRatings.java b/src/main/java/forge/game/limited/CardRatings.java
index ecf689cc83f..15bead5c716 100644
--- a/src/main/java/forge/game/limited/CardRatings.java
+++ b/src/main/java/forge/game/limited/CardRatings.java
@@ -23,10 +23,10 @@ import java.util.TreeMap;
import org.apache.commons.lang3.ArrayUtils;
-import forge.FileUtil;
-import forge.HttpUtil;
import forge.properties.ForgeProps;
import forge.properties.NewConstants;
+import forge.util.FileUtil;
+import forge.util.HttpUtil;
/**
* Contains Maps of card ratings.
diff --git a/src/main/java/forge/game/limited/SealedDeck.java b/src/main/java/forge/game/limited/SealedDeck.java
index 36840eb4616..015f027f94c 100644
--- a/src/main/java/forge/game/limited/SealedDeck.java
+++ b/src/main/java/forge/game/limited/SealedDeck.java
@@ -31,8 +31,6 @@ import forge.CardList;
import forge.CardListFilter;
import forge.CardListUtil;
import forge.Constant;
-import forge.FileUtil;
-import forge.MyRandom;
import forge.SetUtils;
import forge.card.BoosterGenerator;
import forge.card.CardBlock;
@@ -45,6 +43,8 @@ import forge.gui.GuiUtils;
import forge.item.CardDb;
import forge.item.CardPrinted;
import forge.item.ItemPool;
+import forge.util.FileUtil;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/gui/deckeditor/DeckAnalysis.java b/src/main/java/forge/gui/deckeditor/DeckAnalysis.java
index 911601a0636..a6e50dbbd20 100644
--- a/src/main/java/forge/gui/deckeditor/DeckAnalysis.java
+++ b/src/main/java/forge/gui/deckeditor/DeckAnalysis.java
@@ -46,11 +46,11 @@ import javax.swing.event.MouseInputAdapter;
import javax.swing.table.DefaultTableModel;
import net.miginfocom.swing.MigLayout;
-import forge.MyRandom;
import forge.card.CardRules;
import forge.card.CardType;
import forge.item.CardPrinted;
import forge.item.ItemPoolView;
+import forge.util.MyRandom;
/**
* This code was edited or generated using CloudGarden's Jigloo SWT/Swing GUI
diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java
index 92e2315a950..8d1eecdaac5 100644
--- a/src/main/java/forge/model/FModel.java
+++ b/src/main/java/forge/model/FModel.java
@@ -31,13 +31,13 @@ import forge.ComputerAIGeneral;
import forge.ComputerAIInput;
import forge.Constant;
import forge.ConstantStringArrayList;
-import forge.FileUtil;
-import forge.HttpUtil;
import forge.game.GameSummary;
import forge.gui.input.InputControl;
import forge.properties.ForgePreferences;
import forge.properties.ForgeProps;
import forge.properties.NewConstants;
+import forge.util.FileUtil;
+import forge.util.HttpUtil;
/**
* The default Model implementation for Forge.
diff --git a/src/main/java/forge/quest/data/QuestData.java b/src/main/java/forge/quest/data/QuestData.java
index 64606248c68..b3649ae0752 100644
--- a/src/main/java/forge/quest/data/QuestData.java
+++ b/src/main/java/forge/quest/data/QuestData.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import net.slightlymagic.maxmtg.Predicate;
-import forge.MyRandom;
import forge.SetUtils;
import forge.deck.Deck;
import forge.error.ErrorViewer;
@@ -34,6 +33,7 @@ import forge.properties.ForgeProps;
import forge.properties.NewConstants;
import forge.quest.data.item.QuestInventory;
import forge.quest.data.pet.QuestPetManager;
+import forge.util.MyRandom;
//when you create QuestDataOld and AFTER you copy the AI decks over
//you have to call one of these two methods below
diff --git a/src/main/java/forge/quest/data/QuestUtilCards.java b/src/main/java/forge/quest/data/QuestUtilCards.java
index a4f647a9efa..6a3843046ef 100644
--- a/src/main/java/forge/quest/data/QuestUtilCards.java
+++ b/src/main/java/forge/quest/data/QuestUtilCards.java
@@ -23,7 +23,6 @@ import java.util.Map.Entry;
import net.slightlymagic.braids.util.lambda.Lambda1;
import net.slightlymagic.maxmtg.Predicate;
-import forge.MyRandom;
import forge.SetUtils;
import forge.card.BoosterGenerator;
import forge.card.BoosterUtils;
@@ -36,6 +35,7 @@ import forge.item.CardPrinted;
import forge.item.InventoryItem;
import forge.item.ItemPool;
import forge.item.ItemPoolView;
+import forge.util.MyRandom;
/**
* This is a helper class to execute operations on QuestData. It has been
diff --git a/src/main/java/forge/quest/data/ReadPriceList.java b/src/main/java/forge/quest/data/ReadPriceList.java
index f296fb4ee9c..b489c46afd7 100644
--- a/src/main/java/forge/quest/data/ReadPriceList.java
+++ b/src/main/java/forge/quest/data/ReadPriceList.java
@@ -26,10 +26,10 @@ import java.util.Random;
import com.esotericsoftware.minlog.Log;
-import forge.MyRandom;
import forge.error.ErrorViewer;
import forge.properties.ForgeProps;
import forge.properties.NewConstants;
+import forge.util.MyRandom;
/**
*
diff --git a/src/main/java/forge/quest/gui/QuestWinLoseHandler.java b/src/main/java/forge/quest/gui/QuestWinLoseHandler.java
index f3ffd24c051..11bff2b985f 100644
--- a/src/main/java/forge/quest/gui/QuestWinLoseHandler.java
+++ b/src/main/java/forge/quest/gui/QuestWinLoseHandler.java
@@ -31,7 +31,6 @@ import forge.AllZone;
import forge.CardList;
import forge.Constant;
import forge.Constant.Zone;
-import forge.MyRandom;
import forge.Player;
import forge.SetUtils;
import forge.Singletons;
@@ -51,6 +50,7 @@ import forge.quest.data.QuestPreferences;
import forge.quest.data.QuestUtil;
import forge.quest.gui.main.QuestChallenge;
import forge.quest.gui.main.QuestEvent;
+import forge.util.MyRandom;
import forge.view.GuiTopLevel;
import forge.view.match.ViewWinLose;
import forge.view.toolbox.FSkin;
diff --git a/src/main/java/forge/quest/gui/main/QuestEventManager.java b/src/main/java/forge/quest/gui/main/QuestEventManager.java
index aeb410b69d9..b25345b8ff1 100644
--- a/src/main/java/forge/quest/gui/main/QuestEventManager.java
+++ b/src/main/java/forge/quest/gui/main/QuestEventManager.java
@@ -24,12 +24,12 @@ import java.util.List;
import java.util.Random;
import forge.AllZone;
-import forge.FileUtil;
import forge.deck.DeckManager;
import forge.properties.ForgeProps;
import forge.properties.NewConstants;
import forge.quest.data.QuestPreferences;
import forge.quest.data.QuestUtil;
+import forge.util.FileUtil;
/**
*
diff --git a/src/main/java/forge/Base64Coder.java b/src/main/java/forge/util/Base64Coder.java
similarity index 99%
rename from src/main/java/forge/Base64Coder.java
rename to src/main/java/forge/util/Base64Coder.java
index 0a8ba9117e4..00e208413ae 100644
--- a/src/main/java/forge/Base64Coder.java
+++ b/src/main/java/forge/util/Base64Coder.java
@@ -29,7 +29,7 @@
// Please contact the author if you need another license.
// This module is provided "as is", without warranties of any kind.
-package forge;
+package forge.util;
/**
* A Base64 encoder/decoder.
diff --git a/src/main/java/forge/CopyFiles.java b/src/main/java/forge/util/CopyFiles.java
similarity index 98%
rename from src/main/java/forge/CopyFiles.java
rename to src/main/java/forge/util/CopyFiles.java
index 29bc20d8919..a12204d0d17 100644
--- a/src/main/java/forge/CopyFiles.java
+++ b/src/main/java/forge/util/CopyFiles.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see
* HttpUtil class.
diff --git a/src/main/java/forge/MyRandom.java b/src/main/java/forge/util/MyRandom.java
similarity index 98%
rename from src/main/java/forge/MyRandom.java
rename to src/main/java/forge/util/MyRandom.java
index a432386e758..9fc91f85491 100644
--- a/src/main/java/forge/MyRandom.java
+++ b/src/main/java/forge/util/MyRandom.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see