diff --git a/Mage.Client/plugins/mage-card-plugin.jar b/Mage.Client/plugins/mage-card-plugin.jar deleted file mode 100644 index 9bfd0cbcf7..0000000000 Binary files a/Mage.Client/plugins/mage-card-plugin.jar and /dev/null differ diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml index e16471b57a..e52061feb0 100644 --- a/Mage.Client/pom.xml +++ b/Mage.Client/pom.xml @@ -85,12 +85,6 @@ 0.4 runtime - - ${project.groupId} - Mage-Card-Plugin - 0.7 - runtime - ${project.groupId} Mage-Counter-Plugin @@ -107,6 +101,11 @@ swing-layout 1.0.3 + + org.jsoup + jsoup + 1.5.2 + diff --git a/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java b/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java index b0e566a5d4..c1dbd014f1 100644 --- a/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java +++ b/Mage.Client/src/main/java/mage/client/plugins/impl/Plugins.java @@ -22,6 +22,7 @@ import mage.view.PermanentView; import net.xeoh.plugins.base.PluginManager; import net.xeoh.plugins.base.impl.PluginManagerFactory; import org.apache.log4j.Logger; +import org.mage.plugins.card.CardPluginImpl; import javax.swing.*; import java.awt.*; @@ -51,7 +52,7 @@ public class Plugins implements MagePlugins { logger.info("Loading plugins..."); pm = PluginManagerFactory.createPluginManager(); pm.addPluginsFrom(new File(Constants.PLUGINS_DIRECTORY).toURI()); - this.cardPlugin = pm.getPlugin(CardPlugin.class); + this.cardPlugin = new CardPluginImpl(); this.counterPlugin = pm.getPlugin(CounterPlugin.class); this.themePlugin = pm.getPlugin(ThemePlugin.class); logger.info("Done."); diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/Animation.java b/Mage.Client/src/main/java/org/mage/card/arcane/Animation.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/Animation.java rename to Mage.Client/src/main/java/org/mage/card/arcane/Animation.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java rename to Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/GlowText.java b/Mage.Client/src/main/java/org/mage/card/arcane/GlowText.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/GlowText.java rename to Mage.Client/src/main/java/org/mage/card/arcane/GlowText.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/ManaSymbols.java b/Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/ManaSymbols.java rename to Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/ScaledImagePanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/ScaledImagePanel.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/ScaledImagePanel.java rename to Mage.Client/src/main/java/org/mage/card/arcane/ScaledImagePanel.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/UI.java b/Mage.Client/src/main/java/org/mage/card/arcane/UI.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/UI.java rename to Mage.Client/src/main/java/org/mage/card/arcane/UI.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/Util.java b/Mage.Client/src/main/java/org/mage/card/arcane/Util.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/Util.java rename to Mage.Client/src/main/java/org/mage/card/arcane/Util.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/CardPluginImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/CardPluginImpl.java rename to Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/constants/Constants.java b/Mage.Client/src/main/java/org/mage/plugins/card/constants/Constants.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/constants/Constants.java rename to Mage.Client/src/main/java/org/mage/plugins/card/constants/Constants.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/DownloadGui.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/DownloadGui.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/DownloadGui.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/DownloadGui.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/DownloadJob.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/DownloadJob.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/DownloadJob.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/DownloadJob.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/Downloader.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/Downloader.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/Downloader.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/Downloader.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/AbstractBoundBean.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/AbstractBoundBean.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/AbstractBoundBean.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/AbstractBoundBean.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/BoundBean.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/BoundBean.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/BoundBean.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/BoundBean.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/EventListenerList.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/EventListenerList.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/EventListenerList.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/EventListenerList.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/PropertyChangeSupport.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/PropertyChangeSupport.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/PropertyChangeSupport.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/PropertyChangeSupport.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/collections/ListenableCollections.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/collections/ListenableCollections.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/collections/ListenableCollections.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/collections/ListenableCollections.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/package-info.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/package-info.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/package-info.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/package-info.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/AbstractProperties.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/AbstractProperties.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/AbstractProperties.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/AbstractProperties.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/AbstractProperty.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/AbstractProperty.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/AbstractProperty.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/AbstractProperty.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/CompoundProperties.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/CompoundProperties.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/CompoundProperties.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/CompoundProperties.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/Properties.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/Properties.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/Properties.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/Properties.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/Property.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/Property.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/Property.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/Property.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/basic/BasicProperties.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/basic/BasicProperties.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/basic/BasicProperties.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/basic/BasicProperties.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/basic/BasicProperty.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/basic/BasicProperty.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/basic/BasicProperty.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/basic/BasicProperty.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/BoundProperties.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/BoundProperties.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/BoundProperties.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/BoundProperties.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/BoundProperty.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/BoundProperty.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/BoundProperty.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/BoundProperty.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/PropertyChangeListListener.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/PropertyChangeListListener.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/PropertyChangeListListener.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/PropertyChangeListListener.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/PropertyChangeMapListener.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/PropertyChangeMapListener.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/PropertyChangeMapListener.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/PropertyChangeMapListener.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/PropertyChangeSetListener.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/PropertyChangeSetListener.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/PropertyChangeSetListener.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/beans/properties/bound/PropertyChangeSetListener.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/lm/AbstractLaternaBean.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/lm/AbstractLaternaBean.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/lm/AbstractLaternaBean.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/lm/AbstractLaternaBean.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/sources/CardImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/CardImageSource.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/sources/CardImageSource.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/CardImageSource.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/sources/GathererSymbols.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSymbols.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/sources/GathererSymbols.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSymbols.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MagicCardsImageSource.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/sources/MtgatheringRuImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MtgatheringRuImageSource.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/sources/MtgatheringRuImageSource.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/MtgatheringRuImageSource.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java rename to Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/images/CardInfo.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/CardInfo.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/images/CardInfo.java rename to Mage.Client/src/main/java/org/mage/plugins/card/images/CardInfo.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/images/DownloadPictures.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/images/DownloadPictures.java rename to Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/images/ImageCache.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/images/ImageCache.java rename to Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java rename to Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/properties/SettingsManager.java b/Mage.Client/src/main/java/org/mage/plugins/card/properties/SettingsManager.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/properties/SettingsManager.java rename to Mage.Client/src/main/java/org/mage/plugins/card/properties/SettingsManager.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/utils/BufferedImageBuilder.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/BufferedImageBuilder.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/utils/BufferedImageBuilder.java rename to Mage.Client/src/main/java/org/mage/plugins/card/utils/BufferedImageBuilder.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java rename to Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/utils/ImageManager.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/ImageManager.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/utils/ImageManager.java rename to Mage.Client/src/main/java/org/mage/plugins/card/utils/ImageManager.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/utils/Transparency.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/Transparency.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/utils/Transparency.java rename to Mage.Client/src/main/java/org/mage/plugins/card/utils/Transparency.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java rename to Mage.Client/src/main/java/org/mage/plugins/card/utils/impl/ImageManagerImpl.java diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/resources/card-pictures-tok.txt rename to Mage.Client/src/main/resources/card-pictures-tok.txt diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/resources/image.url.properties b/Mage.Client/src/main/resources/image.url.properties similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/resources/image.url.properties rename to Mage.Client/src/main/resources/image.url.properties diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/resources/sickness.png b/Mage.Client/src/main/resources/sickness.png similarity index 100% rename from Mage.Plugins/Mage.Card.Plugin/src/main/resources/sickness.png rename to Mage.Client/src/main/resources/sickness.png diff --git a/Mage.Plugins/Mage.Card.Plugin/pom.xml b/Mage.Plugins/Mage.Card.Plugin/pom.xml deleted file mode 100644 index 169270d856..0000000000 --- a/Mage.Plugins/Mage.Card.Plugin/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - 4.0.0 - - - org.mage - Mage-Plugins - 0.8.0 - - - Mage-Card-Plugin - jar - ${plugin-version} - Mage Card Plugin - Plugin for drawing card - - - - ${project.groupId} - Mage-Common - ${mage-version} - - - com.googlecode.jspf - jspf-core - ${jspf-version} - - - log4j - log4j - 1.2.9 - provided - - - com.google.collections - google-collections - 1.0 - provided - - - com.mortennobel - java-image-scaling - 0.8.4 - provided - - - org.jetlang - jetlang - 0.2.4 - provided - - - - org.jsoup - jsoup - 1.5.2 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - - mage-card-plugin - - - - 0.7 - 0.9.1 - - diff --git a/Mage.Plugins/pom.xml b/Mage.Plugins/pom.xml index a12b93a5c4..eaeb1383f7 100644 --- a/Mage.Plugins/pom.xml +++ b/Mage.Plugins/pom.xml @@ -17,7 +17,6 @@ Mage.Theme.Plugin - Mage.Card.Plugin Mage.Counter.Plugin Mage.Rating.Plugin