Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

create 'magic.cardDefinition*' and relocate classes.

master
lodici 2016-10-05 11:16:03 +01:00
parent 17132dd8c3
commit b55da6a394
18 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/magic/ui/cardBuilder/IRenderableCard.java → src/magic/cardBuilder/IRenderableCard.java
View File

@ -1,4 +1,4 @@
package magic.ui.cardBuilder;
package magic.cardBuilder;
import java.util.Collection;
import java.util.Collections;

2
src/magic/ui/cardBuilder/ResourceManager.java → src/magic/cardBuilder/ResourceManager.java
View File

@ -1,4 +1,4 @@
package magic.ui.cardBuilder;
package magic.cardBuilder;
import java.awt.Font;
import java.awt.font.TextAttribute;

4
src/magic/ui/cardBuilder/renderers/CardBuilder.java → src/magic/cardBuilder/renderers/CardBuilder.java
View File

@ -1,4 +1,4 @@
package magic.ui.cardBuilder.renderers;
package magic.cardBuilder.renderers;
import java.awt.Graphics2D;
import java.awt.geom.AffineTransform;
@ -7,7 +7,7 @@ import java.awt.image.BufferedImage;
import magic.model.MagicAbility;
import magic.model.MagicSubType;
import magic.model.MagicType;
import magic.ui.cardBuilder.IRenderableCard;
import magic.cardBuilder.IRenderableCard;
public class CardBuilder {

6
src/magic/ui/cardBuilder/renderers/Frame.java → src/magic/cardBuilder/renderers/Frame.java
View File

@ -1,4 +1,4 @@
package magic.ui.cardBuilder.renderers;
package magic.cardBuilder.renderers;
import java.awt.AlphaComposite;
import java.awt.Graphics2D;
@ -16,8 +16,8 @@ import magic.model.MagicManaType;
import magic.model.MagicSubType;
import magic.model.MagicType;
import magic.model.event.MagicManaActivation;
import magic.ui.cardBuilder.IRenderableCard;
import magic.ui.cardBuilder.ResourceManager;
import magic.cardBuilder.IRenderableCard;
import magic.cardBuilder.ResourceManager;
public class Frame {

6
src/magic/ui/cardBuilder/renderers/ImageFrame.java → src/magic/cardBuilder/renderers/ImageFrame.java
View File

@ -1,4 +1,4 @@
package magic.ui.cardBuilder.renderers;
package magic.cardBuilder.renderers;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
@ -11,8 +11,8 @@ import magic.model.MagicColor;
import magic.model.MagicType;
import magic.ui.ImageFileIO;
import magic.ui.MagicImages;
import magic.ui.cardBuilder.IRenderableCard;
import magic.ui.cardBuilder.ResourceManager;
import magic.cardBuilder.IRenderableCard;
import magic.cardBuilder.ResourceManager;
import magic.ui.utility.GraphicsUtils;
import magic.utility.MagicFileSystem;

6
src/magic/ui/cardBuilder/renderers/OracleText.java → src/magic/cardBuilder/renderers/OracleText.java
View File

@ -1,4 +1,4 @@
package magic.ui.cardBuilder.renderers;
package magic.cardBuilder.renderers;
import java.awt.Color;
import java.awt.Font;
@ -26,8 +26,8 @@ import java.util.TreeMap;
import magic.model.MagicColor;
import magic.model.MagicType;
import magic.ui.MagicImages;
import magic.ui.cardBuilder.IRenderableCard;
import magic.ui.cardBuilder.ResourceManager;
import magic.cardBuilder.IRenderableCard;
import magic.cardBuilder.ResourceManager;
import magic.ui.utility.GraphicsUtils;
public class OracleText {

6
src/magic/ui/cardBuilder/renderers/Overlay.java → src/magic/cardBuilder/renderers/Overlay.java
View File

@ -1,4 +1,4 @@
package magic.ui.cardBuilder.renderers;
package magic.cardBuilder.renderers;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
@ -8,8 +8,8 @@ import java.util.stream.Collectors;
import magic.model.MagicAbility;
import magic.model.MagicColor;
import magic.ui.cardBuilder.IRenderableCard;
import magic.ui.cardBuilder.ResourceManager;
import magic.cardBuilder.IRenderableCard;
import magic.cardBuilder.ResourceManager;
public class Overlay {

6
src/magic/ui/cardBuilder/renderers/PTFrame.java → src/magic/cardBuilder/renderers/PTFrame.java
View File

@ -1,4 +1,4 @@
package magic.ui.cardBuilder.renderers;
package magic.cardBuilder.renderers;
import java.awt.Color;
import java.awt.Font;
@ -16,8 +16,8 @@ import magic.model.MagicAbility;
import magic.model.MagicColor;
import magic.model.MagicSubType;
import magic.model.MagicType;
import magic.ui.cardBuilder.IRenderableCard;
import magic.ui.cardBuilder.ResourceManager;
import magic.cardBuilder.IRenderableCard;
import magic.cardBuilder.ResourceManager;
public class PTFrame {

6
src/magic/ui/cardBuilder/renderers/TitleFrame.java → src/magic/cardBuilder/renderers/TitleFrame.java
View File

@ -1,4 +1,4 @@
package magic.ui.cardBuilder.renderers;
package magic.cardBuilder.renderers;
import java.awt.Color;
import java.awt.Font;
@ -19,8 +19,8 @@ import javax.swing.ImageIcon;
import magic.data.MagicIcon;
import magic.model.MagicType;
import magic.ui.MagicImages;
import magic.ui.cardBuilder.IRenderableCard;
import magic.ui.cardBuilder.ResourceManager;
import magic.cardBuilder.IRenderableCard;
import magic.cardBuilder.ResourceManager;
public class TitleFrame {

6
src/magic/ui/cardBuilder/renderers/TypeLine.java → src/magic/cardBuilder/renderers/TypeLine.java
View File

@ -1,4 +1,4 @@
package magic.ui.cardBuilder.renderers;
package magic.cardBuilder.renderers;
import java.awt.Color;
@ -9,8 +9,8 @@ import java.awt.RenderingHints;
import java.awt.image.BufferedImage;
import magic.model.MagicType;
import magic.ui.cardBuilder.IRenderableCard;
import magic.ui.cardBuilder.ResourceManager;
import magic.cardBuilder.IRenderableCard;
import magic.cardBuilder.ResourceManager;
public class TypeLine {
private static final Font cardTypeFont = ResourceManager.getFont("JaceBeleren-Bold.ttf").deriveFont(Font.PLAIN, 16);

2
src/magic/model/MagicCard.java
View File

@ -17,7 +17,7 @@ import magic.model.stack.MagicItemOnStack;
import magic.model.target.MagicTarget;
import magic.model.target.MagicTargetFilter;
import magic.model.target.MagicTargetType;
import magic.ui.cardBuilder.IRenderableCard;
import magic.cardBuilder.IRenderableCard;
public class MagicCard
extends MagicObjectImpl

2
src/magic/model/MagicCardDefinition.java
View File

@ -15,7 +15,7 @@ import magic.model.trigger.ThisCycleTrigger;
import magic.model.trigger.ThisDrawnTrigger;
import magic.model.trigger.ThisPutIntoGraveyardTrigger;
import magic.model.trigger.ThisSpellIsCastTrigger;
import magic.ui.cardBuilder.IRenderableCard;
import magic.cardBuilder.IRenderableCard;
import magic.utility.MagicFileSystem;
public class MagicCardDefinition implements MagicAbilityStore, IRenderableCard {

2
src/magic/model/MagicPermanent.java
View File

@ -34,7 +34,7 @@ import magic.model.target.MagicTargetFilterFactory;
import magic.model.trigger.EntersBattlefieldTrigger;
import magic.model.trigger.MagicTrigger;
import magic.model.trigger.MagicTriggerType;
import magic.ui.cardBuilder.IRenderableCard;
import magic.cardBuilder.IRenderableCard;
public class MagicPermanent extends MagicObjectImpl implements MagicSource, MagicTarget, Comparable<MagicPermanent>, MagicMappable<MagicPermanent>, IRenderableCard {

2
src/magic/ui/MagicImages.java
View File

@ -20,7 +20,7 @@ import magic.model.MagicColor;
import magic.model.MagicDeck;
import magic.model.MagicManaType;
import magic.model.player.PlayerProfile;
import magic.ui.cardBuilder.renderers.CardBuilder;
import magic.cardBuilder.renderers.CardBuilder;
import magic.ui.prefs.ImageSizePresets;
import magic.ui.theme.PlayerAvatar;
import magic.ui.utility.GraphicsUtils;

2
src/magic/ui/screen/DeckTiledCardsScreen.java
View File

@ -23,7 +23,7 @@ import magic.ui.MagicImages;
import magic.ui.canvas.cards.CardsCanvas.LayoutMode;
import magic.ui.canvas.cards.CardsCanvas;
import magic.ui.canvas.cards.ICardsCanvasListener;
import magic.ui.cardBuilder.renderers.CardBuilder;
import magic.cardBuilder.renderers.CardBuilder;
import magic.ui.deck.editor.DeckSideBar;
import magic.ui.screen.interfaces.IActionBar;
import magic.ui.screen.interfaces.IStatusBar;

2
src/magic/ui/screen/DuelDecksScreen.java
View File

@ -25,7 +25,7 @@ import magic.ui.MagicFrame;
import magic.ui.ScreenController;
import magic.ui.ScreenOptionsOverlay;
import magic.translate.UiString;
import magic.ui.cardBuilder.renderers.CardBuilder;
import magic.cardBuilder.renderers.CardBuilder;
import magic.ui.screen.interfaces.IActionBar;
import magic.ui.screen.interfaces.IOptionsMenu;
import magic.ui.screen.interfaces.IStatusBar;

2
src/magic/ui/screen/SampleHandScreen.java
View File

@ -19,7 +19,7 @@ import magic.ui.MagicImages;
import magic.translate.UiString;
import magic.ui.canvas.cards.CardsCanvas.LayoutMode;
import magic.ui.canvas.cards.CardsCanvas;
import magic.ui.cardBuilder.renderers.CardBuilder;
import magic.cardBuilder.renderers.CardBuilder;
import magic.ui.screen.interfaces.IActionBar;
import magic.ui.screen.interfaces.IStatusBar;
import magic.ui.screen.widget.ActionBarButton;

2
src/magic/utility/MagicFileSystem.java
View File

@ -22,7 +22,7 @@ import java.util.List;
import magic.data.GeneralConfig;
import magic.model.MagicCardDefinition;
import magic.ui.cardBuilder.IRenderableCard;
import magic.cardBuilder.IRenderableCard;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;