diff --git a/.gitattributes b/.gitattributes
index f13f2530dae..1730deae8fc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14806,10 +14806,6 @@ forge-gui/src/main/java/forge/ai/ability/UnattachAllAi.java -text
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/ZoneExchangeAi.java -text
-forge-gui/src/main/java/forge/card/CardBlock.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/package-info.java svneol=native#text/plain
forge-gui/src/main/java/forge/control/ChatArea.java -text
forge-gui/src/main/java/forge/control/FControl.java -text
forge-gui/src/main/java/forge/control/FControlGameEventHandler.java -text
@@ -15513,9 +15509,12 @@ forge-gui/src/main/java/forge/gui/workshop/views/VCardDesigner.java -text
forge-gui/src/main/java/forge/gui/workshop/views/VCardScript.java -text
forge-gui/src/main/java/forge/gui/workshop/views/VWorkshopCatalog.java -text
forge-gui/src/main/java/forge/model/BuildInfo.java -text
+forge-gui/src/main/java/forge/model/CardBlock.java -text
forge-gui/src/main/java/forge/model/CardCollections.java -text
forge-gui/src/main/java/forge/model/FModel.java svneol=native#text/plain
+forge-gui/src/main/java/forge/model/MetaSet.java -text
forge-gui/src/main/java/forge/model/MultipleForgeJarsFoundError.java -text
+forge-gui/src/main/java/forge/model/UnOpenedMeta.java -text
forge-gui/src/main/java/forge/model/package-info.java svneol=native#text/plain
forge-gui/src/main/java/forge/net/FServer.java -text
forge-gui/src/main/java/forge/net/IClientSocket.java -text
diff --git a/forge-gui/src/main/java/forge/card/package-info.java b/forge-gui/src/main/java/forge/card/package-info.java
deleted file mode 100644
index f1f6a105de4..00000000000
--- a/forge-gui/src/main/java/forge/card/package-info.java
+++ /dev/null
@@ -1,3 +0,0 @@
-/** Forge Card Game. */
-package forge.card;
-
diff --git a/forge-gui/src/main/java/forge/game/limited/BoosterDraft.java b/forge-gui/src/main/java/forge/game/limited/BoosterDraft.java
index 342ab7ddb62..28966c09f0a 100644
--- a/forge-gui/src/main/java/forge/game/limited/BoosterDraft.java
+++ b/forge-gui/src/main/java/forge/game/limited/BoosterDraft.java
@@ -34,7 +34,6 @@ import org.apache.commons.lang3.ArrayUtils;
import com.google.common.base.Supplier;
import forge.Constant.Preferences;
import forge.Singletons;
-import forge.card.CardBlock;
import forge.card.CardEdition;
import forge.card.IUnOpenedProduct;
import forge.card.UnOpenedProduct;
@@ -44,6 +43,7 @@ import forge.gui.GuiChoose;
import forge.item.PaperCard;
import forge.item.IPaperCard;
import forge.item.SealedProduct;
+import forge.model.CardBlock;
import forge.properties.NewConstants;
import forge.util.FileUtil;
import forge.util.HttpUtil;
diff --git a/forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java b/forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java
index 317b92d1b55..b309dc8eb00 100644
--- a/forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java
+++ b/forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java
@@ -27,15 +27,15 @@ import javax.swing.JOptionPane;
import org.apache.commons.lang3.ArrayUtils;
import forge.Singletons;
-import forge.card.CardBlock;
import forge.card.CardEdition;
import forge.card.IUnOpenedProduct;
-import forge.card.UnOpenedMeta;
import forge.card.UnOpenedProduct;
import forge.deck.CardPool;
import forge.gui.GuiChoose;
import forge.item.PaperCard;
import forge.item.SealedProduct;
+import forge.model.CardBlock;
+import forge.model.UnOpenedMeta;
import forge.util.FileUtil;
import forge.util.ItemPool;
import forge.util.TextUtil;
diff --git a/forge-gui/src/main/java/forge/card/CardBlock.java b/forge-gui/src/main/java/forge/model/CardBlock.java
similarity index 94%
rename from forge-gui/src/main/java/forge/card/CardBlock.java
rename to forge-gui/src/main/java/forge/model/CardBlock.java
index 6a91dc8610f..f19392928e7 100644
--- a/forge-gui/src/main/java/forge/card/CardBlock.java
+++ b/forge-gui/src/main/java/forge/model/CardBlock.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package forge.card;
+package forge.model;
import java.util.ArrayList;
import java.util.List;
@@ -28,6 +28,10 @@ import com.google.common.base.Function;
import com.google.common.base.Predicate;
import forge.Singletons;
+import forge.card.CardEdition;
+import forge.card.IUnOpenedProduct;
+import forge.card.UnOpenedProduct;
+import forge.card.CardEdition.Collection;
import forge.item.PaperCard;
import forge.item.IPaperCard;
import forge.util.TextUtil;
diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java
index 5f9d2a7dfcf..5e81a1c28eb 100644
--- a/forge-gui/src/main/java/forge/model/FModel.java
+++ b/forge-gui/src/main/java/forge/model/FModel.java
@@ -28,7 +28,6 @@ import forge.Constant;
import forge.Constant.Preferences;
import forge.Singletons;
import forge.ai.AiProfileUtil;
-import forge.card.CardBlock;
import forge.card.CardType;
import forge.error.ExceptionHandler;
import forge.game.GameFormat;
@@ -279,7 +278,7 @@ public class FModel {
}
- /** @return {@link forge.util.storage.IStorage}<{@link forge.card.CardBlock}> */
+ /** @return {@link forge.util.storage.IStorage}<{@link forge.model.CardBlock}> */
public IStorage getBlocks() {
return blocks;
}
@@ -335,7 +334,7 @@ public class FModel {
this.gauntletData = data0;
}
- /** @return {@link forge.util.storage.IStorage}<{@link forge.card.CardBlock}> */
+ /** @return {@link forge.util.storage.IStorage}<{@link forge.model.CardBlock}> */
public IStorage getFantasyBlocks() {
return fantasyBlocks;
}
diff --git a/forge-gui/src/main/java/forge/card/MetaSet.java b/forge-gui/src/main/java/forge/model/MetaSet.java
similarity index 96%
rename from forge-gui/src/main/java/forge/card/MetaSet.java
rename to forge-gui/src/main/java/forge/model/MetaSet.java
index 017b81a2d1d..fd1d6001739 100644
--- a/forge-gui/src/main/java/forge/card/MetaSet.java
+++ b/forge-gui/src/main/java/forge/model/MetaSet.java
@@ -16,13 +16,15 @@
* along with this program. If not, see .
*/
-package forge.card;
+package forge.model;
import java.io.File;
import java.util.List;
import com.google.common.base.Predicate;
import forge.Singletons;
+import forge.card.IUnOpenedProduct;
+import forge.card.UnOpenedProduct;
import forge.game.limited.CustomLimited;
import forge.item.PaperCard;
import forge.item.IPaperCard;
diff --git a/forge-gui/src/main/java/forge/card/UnOpenedMeta.java b/forge-gui/src/main/java/forge/model/UnOpenedMeta.java
similarity index 95%
rename from forge-gui/src/main/java/forge/card/UnOpenedMeta.java
rename to forge-gui/src/main/java/forge/model/UnOpenedMeta.java
index b926e650e56..569c5b888a4 100644
--- a/forge-gui/src/main/java/forge/card/UnOpenedMeta.java
+++ b/forge-gui/src/main/java/forge/model/UnOpenedMeta.java
@@ -16,12 +16,13 @@
* along with this program. If not, see .
*/
-package forge.card;
+package forge.model;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+import forge.card.IUnOpenedProduct;
import forge.gui.GuiChoose;
import forge.item.PaperCard;
import forge.util.MyRandom;