From 0a3c95dde572e40bd9b120f2636fe93725f4228d Mon Sep 17 00:00:00 2001 From: vraskulin Date: Tue, 28 Feb 2017 12:40:12 +0300 Subject: [PATCH] Inner classes should be static. It reduces memory usage and gives perfomance boost + DeckImporter rollback --- .../components/ability/AbilityPicker.java | 13 +-- .../components/ext/dlg/impl/StackDialog.java | 2 +- .../generator/RatioAdjustingSliderPanel.java | 6 +- .../collection/viewer/MageBook.java | 25 +++-- .../mage/client/table/PlayersChatPanel.java | 38 ++++---- .../client/util/gui/BufferedImageBuilder.java | 2 +- .../card/arcane/CardPanelComponentImpl.java | 33 +++---- .../mage/card/arcane/CardPanelRenderImpl.java | 23 +++-- .../mage/card/arcane/ModernCardRenderer.java | 25 +++-- .../card/dl/sources/TokensMtgImageSource.java | 2 +- .../mage/client/game/MultiConnectTest.java | 2 +- .../target/maven-archiver/pom.properties | 2 +- .../java/mage/player/ai/ComputerPlayer.java | 92 ++++--------------- .../src/mage/cards/a/ArchdemonOfGreed.java | 5 +- .../src/mage/cards/a/AshlingThePilgrim.java | 5 +- .../src/mage/cards/a/AtarkaMonument.java | 5 +- Mage.Sets/src/mage/cards/a/AuraBarbs.java | 8 +- Mage.Sets/src/mage/cards/a/Aurification.java | 9 +- .../src/mage/cards/a/AwakenTheAncient.java | 5 +- .../src/mage/cards/a/AzoriusKeyrune.java | 8 +- Mage.Sets/src/mage/cards/b/BanefulOmen.java | 13 +-- Mage.Sets/src/mage/cards/b/BlademaneBaku.java | 42 ++++----- .../src/mage/cards/b/BlossomingWreath.java | 5 +- .../src/mage/cards/b/BorosFuryShield.java | 5 +- Mage.Sets/src/mage/cards/b/BorosKeyrune.java | 11 ++- .../src/mage/cards/b/BrinkOfMadness.java | 13 ++- Mage.Sets/src/mage/cards/c/CairnWanderer.java | 27 +----- Mage.Sets/src/mage/cards/c/ChimericEgg.java | 5 +- .../src/mage/cards/c/ClashOfRealities.java | 8 +- .../src/mage/cards/c/CoalhaulerSwine.java | 2 +- .../src/mage/cards/c/ConvalescentCare.java | 5 +- Mage.Sets/src/mage/cards/c/Conversion.java | 20 ++-- Mage.Sets/src/mage/cards/c/CrazedArmodon.java | 5 +- .../src/mage/cards/c/CrosstownCourier.java | 5 +- .../src/mage/cards/d/DanceOfTheSkywise.java | 5 +- Mage.Sets/src/mage/cards/d/DeathWatch.java | 2 +- Mage.Sets/src/mage/cards/d/DebtOfLoyalty.java | 5 +- .../src/mage/cards/d/DefenseOfTheHeart.java | 13 ++- .../src/mage/cards/d/DevastatingSummons.java | 5 +- Mage.Sets/src/mage/cards/d/DimirKeyrune.java | 11 ++- .../src/mage/cards/g/GenjuOfTheCedars.java | 5 +- .../src/mage/cards/g/GenjuOfTheFalls.java | 5 +- .../src/mage/cards/g/GenjuOfTheFens.java | 5 +- .../src/mage/cards/g/GenjuOfTheFields.java | 11 +-- .../src/mage/cards/g/GenjuOfTheRealm.java | 5 +- .../src/mage/cards/g/GenjuOfTheSpires.java | 5 +- Mage.Sets/src/mage/cards/g/GoblinWelder.java | 7 +- .../src/mage/cards/g/GolgariKeyrune.java | 8 +- .../src/mage/cards/g/GreenbeltRampager.java | 2 +- .../src/mage/cards/g/GroveOfTheGuardian.java | 5 +- Mage.Sets/src/mage/cards/g/GruulKeyrune.java | 11 ++- Mage.Sets/src/mage/cards/h/HeedTheMists.java | 8 +- .../src/mage/cards/h/HellionCrucible.java | 4 +- .../src/mage/cards/h/HellionEruption.java | 6 +- Mage.Sets/src/mage/cards/h/HungryFlames.java | 2 +- .../src/mage/cards/i/InnerFlameIgniter.java | 5 +- Mage.Sets/src/mage/cards/i/IzzetKeyrune.java | 13 ++- Mage.Sets/src/mage/cards/j/JadeStatue.java | 5 +- Mage.Sets/src/mage/cards/j/JediEnclave.java | 7 +- Mage.Sets/src/mage/cards/j/JunkyoBell.java | 5 +- .../mage/cards/k/KalitasBloodchiefOfGhet.java | 5 +- Mage.Sets/src/mage/cards/k/KyrenToy.java | 5 +- Mage.Sets/src/mage/cards/l/LightningDart.java | 5 +- Mage.Sets/src/mage/cards/l/LiquidFire.java | 5 +- Mage.Sets/src/mage/cards/l/LivingArmor.java | 5 +- .../src/mage/cards/m/MagneticMountain.java | 5 +- .../src/mage/cards/m/MagusOfTheMoon.java | 13 +-- .../src/mage/cards/m/MinionsMurmurs.java | 5 +- Mage.Sets/src/mage/cards/m/MoltenBirth.java | 5 +- Mage.Sets/src/mage/cards/n/NecroticOoze.java | 22 ++--- Mage.Sets/src/mage/cards/n/NightDealings.java | 15 ++- Mage.Sets/src/mage/cards/n/NoMercy.java | 5 +- .../src/mage/cards/o/OjutaiMonument.java | 5 +- Mage.Sets/src/mage/cards/o/OrbOfDreams.java | 5 +- Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java | 11 ++- Mage.Sets/src/mage/cards/o/Outwit.java | 32 +++---- .../src/mage/cards/p/ParagonOfTheAmesha.java | 12 +-- Mage.Sets/src/mage/cards/p/Pariah.java | 11 ++- Mage.Sets/src/mage/cards/p/PhantomWings.java | 10 +- .../src/mage/cards/p/PhylacteryLich.java | 5 +- .../src/mage/cards/p/PhyrexianTotem.java | 5 +- .../src/mage/cards/p/PlanarCollapse.java | 10 +- Mage.Sets/src/mage/cards/p/PlatinumAngel.java | 13 +-- .../src/mage/cards/p/PrideOfTheClouds.java | 7 +- Mage.Sets/src/mage/cards/p/PrimalClay.java | 5 +- Mage.Sets/src/mage/cards/p/PrimalPlasma.java | 5 +- Mage.Sets/src/mage/cards/p/ProteanHydra.java | 7 +- Mage.Sets/src/mage/cards/q/QuillmaneBaku.java | 5 +- Mage.Sets/src/mage/cards/r/RainbowVale.java | 11 +-- Mage.Sets/src/mage/cards/r/RakdosCharm.java | 5 +- Mage.Sets/src/mage/cards/r/RakdosKeyrune.java | 8 +- Mage.Sets/src/mage/cards/r/RavenFamiliar.java | 11 +-- .../src/mage/cards/r/RelentlessRats.java | 12 +-- Mage.Sets/src/mage/cards/r/RockHydra.java | 5 +- Mage.Sets/src/mage/cards/r/RoninWarclub.java | 5 +- Mage.Sets/src/mage/cards/r/RootGreevil.java | 5 +- Mage.Sets/src/mage/cards/r/RootingKavu.java | 5 +- Mage.Sets/src/mage/cards/r/Rumination.java | 5 +- Mage.Sets/src/mage/cards/s/ScarredPuma.java | 7 +- Mage.Sets/src/mage/cards/s/SecondChance.java | 10 +- .../src/mage/cards/s/SelesnyaKeyrune.java | 8 +- Mage.Sets/src/mage/cards/s/ShapeAnew.java | 11 +-- .../src/mage/cards/s/ShapeshiftersMarrow.java | 11 +-- .../src/mage/cards/s/SiegeModification.java | 2 +- .../src/mage/cards/s/SilumgarMonument.java | 5 +- Mage.Sets/src/mage/cards/s/SimicKeyrune.java | 11 ++- Mage.Sets/src/mage/cards/s/SithLord.java | 5 +- Mage.Sets/src/mage/cards/s/SithRavager.java | 5 +- Mage.Sets/src/mage/cards/s/SithRuins.java | 7 +- Mage.Sets/src/mage/cards/s/SkullRend.java | 10 +- Mage.Sets/src/mage/cards/s/SkullmaneBaku.java | 10 +- .../src/mage/cards/s/SlumberingTora.java | 8 +- .../src/mage/cards/s/SoulbrightFlamekin.java | 5 +- Mage.Sets/src/mage/cards/s/SoulsMajesty.java | 9 +- Mage.Sets/src/mage/cards/s/SpoilsOfEvil.java | 5 +- Mage.Sets/src/mage/cards/s/Subversion.java | 10 +- Mage.Sets/src/mage/cards/t/TerashisGrasp.java | 7 +- Mage.Sets/src/mage/cards/t/ThunderTotem.java | 7 +- .../src/mage/cards/t/TimberpackWolf.java | 6 +- .../src/mage/cards/t/ToilsOfNightAndDay.java | 10 +- Mage.Sets/src/mage/cards/t/TurnBurn.java | 5 +- .../src/mage/cards/u/UncheckedGrowth.java | 12 +-- .../src/mage/cards/u/UnderworldSlums.java | 7 +- .../src/mage/cards/u/UtvaraHellkite.java | 7 +- Mage.Sets/src/mage/cards/v/VolitionReins.java | 5 +- .../src/mage/cards/v/VulshokBattlemaster.java | 5 +- Mage.Sets/src/mage/cards/w/Wirecat.java | 5 +- Mage.Sets/src/mage/cards/y/YixlidJailer.java | 12 +-- .../src/mage/cards/y/YoungPyromancer.java | 5 +- .../mage/cards/z/ZektarShrineExpedition.java | 5 +- .../serverside/deck/DeckValidatorTest.java | 7 +- .../LimitedTimesPerTurnActivatedAbility.java | 5 +- .../mana/ActivateOncePerTurnManaAbility.java | 5 +- .../cards/decks/importer/DeckImporter.java | 12 +-- .../SwissPairingMinimalWeightMatching.java | 2 +- 135 files changed, 582 insertions(+), 642 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java b/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java index fa4e43e60dc..5617acd492a 100644 --- a/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java +++ b/Mage.Client/src/main/java/mage/client/components/ability/AbilityPicker.java @@ -1,10 +1,5 @@ package mage.client.components.ability; -import java.awt.*; -import java.awt.event.*; -import java.util.*; -import java.util.List; -import javax.swing.*; import mage.client.SessionHandler; import mage.client.util.ImageHelper; import mage.client.util.SettingsManager; @@ -19,6 +14,12 @@ import org.jsoup.Jsoup; import org.mage.card.arcane.ManaSymbols; import org.mage.card.arcane.UI; +import javax.swing.*; +import java.awt.*; +import java.awt.event.*; +import java.util.*; +import java.util.List; + /** * Dialog for choosing abilities. * @@ -233,7 +234,7 @@ public class AbilityPicker extends JXPanel implements MouseWheelListener { action.actionPerformed(null); } - public class ImageRenderer2 extends JEditorPane implements ListCellRenderer { + public static class ImageRenderer2 extends JEditorPane implements ListCellRenderer { public final Map cache = new HashMap(); diff --git a/Mage.Client/src/main/java/mage/client/components/ext/dlg/impl/StackDialog.java b/Mage.Client/src/main/java/mage/client/components/ext/dlg/impl/StackDialog.java index a8720e4deae..d7644731e17 100644 --- a/Mage.Client/src/main/java/mage/client/components/ext/dlg/impl/StackDialog.java +++ b/Mage.Client/src/main/java/mage/client/components/ext/dlg/impl/StackDialog.java @@ -36,7 +36,7 @@ public class StackDialog extends IDialogPanel { private final UUID gameId; - private class CustomLabel extends JLabel { + private static class CustomLabel extends JLabel { @Override public void paintComponent(Graphics g) { diff --git a/Mage.Client/src/main/java/mage/client/deck/generator/RatioAdjustingSliderPanel.java b/Mage.Client/src/main/java/mage/client/deck/generator/RatioAdjustingSliderPanel.java index bd6903eaec3..972911400c7 100644 --- a/Mage.Client/src/main/java/mage/client/deck/generator/RatioAdjustingSliderPanel.java +++ b/Mage.Client/src/main/java/mage/client/deck/generator/RatioAdjustingSliderPanel.java @@ -30,7 +30,7 @@ package mage.client.deck.generator; import javax.swing.*; import java.awt.*; -import java.util.*; +import java.util.ArrayList; import java.util.List; /** @@ -42,7 +42,7 @@ public class RatioAdjustingSliderPanel extends JPanel { private final List textLabels = new ArrayList<>(); private AdjustingSliderGroup sg; - private class JStorageSlider extends JSlider { + private static class JStorageSlider extends JSlider { // Slider stores its initial value to revert to when reset private final int defaultValue; @@ -74,7 +74,7 @@ public class RatioAdjustingSliderPanel extends JPanel { } - private class AdjustingSliderGroup + private static class AdjustingSliderGroup { private final ArrayList storageSliders; private int sliderIndex = 0; diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java index 1bad0df4a1a..1f4df876f94 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java @@ -27,19 +27,6 @@ */ package mage.client.deckeditor.collection.viewer; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Image; -import java.awt.Rectangle; -import java.awt.image.BufferedImage; -import java.io.FileNotFoundException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import javax.imageio.ImageIO; -import javax.swing.*; import mage.cards.Card; import mage.cards.CardDimensions; import mage.cards.MageCard; @@ -63,6 +50,16 @@ import org.apache.log4j.Logger; import org.mage.card.arcane.GlowText; import org.mage.card.arcane.ManaSymbols; +import javax.imageio.ImageIO; +import javax.swing.*; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * Mage book with cards and page flipping. * @@ -362,7 +359,7 @@ public class MageBook extends JComponent { public static final int GAP_Y = 45; } - abstract class Configuration { + abstract static class Configuration { public int CARDS_PER_PAGE; public int CARD_ROWS; diff --git a/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java b/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java index c67a88c655f..04801b11e1a 100644 --- a/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/PlayersChatPanel.java @@ -33,28 +33,8 @@ */ package mage.client.table; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionAdapter; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.swing.Icon; -import javax.swing.JLabel; -import javax.swing.JTable; -import javax.swing.border.EmptyBorder; -import javax.swing.table.AbstractTableModel; -import javax.swing.table.JTableHeader; -import javax.swing.table.TableColumn; -import javax.swing.table.TableColumnModel; import mage.client.MageFrame; import mage.client.chat.ChatPanelBasic; -import static mage.client.chat.ChatPanelBasic.CHAT_ALPHA; -import static mage.client.dialog.PreferencesDialog.KEY_USERS_COLUMNS_ORDER; -import static mage.client.dialog.PreferencesDialog.KEY_USERS_COLUMNS_WIDTH; import mage.client.util.GUISizeHelper; import mage.client.util.MageTableRowSorter; import mage.client.util.gui.TableUtil; @@ -64,6 +44,22 @@ import mage.view.RoomUsersView; import mage.view.UsersView; import net.java.balloontip.utils.ToolTipUtils; +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import javax.swing.table.AbstractTableModel; +import javax.swing.table.JTableHeader; +import javax.swing.table.TableColumn; +import javax.swing.table.TableColumnModel; +import java.awt.*; +import java.awt.event.MouseEvent; +import java.awt.event.MouseMotionAdapter; +import java.util.*; +import java.util.List; + +import static mage.client.chat.ChatPanelBasic.CHAT_ALPHA; +import static mage.client.dialog.PreferencesDialog.KEY_USERS_COLUMNS_ORDER; +import static mage.client.dialog.PreferencesDialog.KEY_USERS_COLUMNS_WIDTH; + /** * * @author BetaSteward_at_googlemail.com, nantuko @@ -391,7 +387,7 @@ public class PlayersChatPanel extends javax.swing.JPanel { private javax.swing.JTable jTablePlayers; // End of variables declaration//GEN-END:variables - class ColumnHeaderToolTips extends MouseMotionAdapter { + static class ColumnHeaderToolTips extends MouseMotionAdapter { int curCol; final Map tips = new HashMap<>(); diff --git a/Mage.Client/src/main/java/mage/client/util/gui/BufferedImageBuilder.java b/Mage.Client/src/main/java/mage/client/util/gui/BufferedImageBuilder.java index cf71f462331..97e2c45741c 100644 --- a/Mage.Client/src/main/java/mage/client/util/gui/BufferedImageBuilder.java +++ b/Mage.Client/src/main/java/mage/client/util/gui/BufferedImageBuilder.java @@ -72,7 +72,7 @@ public class BufferedImageBuilder { } } - class ImageLoadStatus { + static class ImageLoadStatus { public boolean widthDone = false; public boolean heightDone = false; } diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java index 781df3cb46f..e7eed38f7fc 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelComponentImpl.java @@ -2,24 +2,6 @@ package org.mage.card.arcane; import com.google.common.base.Function; import com.google.common.collect.MapMaker; -import java.awt.AlphaComposite; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.RenderingHints; -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.Map; -import java.util.StringTokenizer; -import java.util.UUID; -import javax.swing.BorderFactory; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JLabel; -import javax.swing.JPanel; import mage.cards.action.ActionCallback; import mage.client.dialog.PreferencesDialog; import mage.client.util.ImageCaches; @@ -34,11 +16,20 @@ import mage.view.StackAbilityView; import net.java.truevfs.access.TFile; import org.apache.log4j.Logger; import org.jdesktop.swingx.graphics.GraphicsUtilities; -import static org.mage.plugins.card.constants.Constants.THUMBNAIL_SIZE_FULL; import org.mage.plugins.card.dl.sources.DirectLinksForDownload; import org.mage.plugins.card.images.ImageCache; import org.mage.plugins.card.utils.impl.ImageManagerImpl; +import javax.swing.*; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.File; +import java.util.Map; +import java.util.StringTokenizer; +import java.util.UUID; + +import static org.mage.plugins.card.constants.Constants.THUMBNAIL_SIZE_FULL; + /** * Class for drawing the mage card object by using a form based JComponent approach * @@ -84,7 +75,7 @@ public class CardPanelComponentImpl extends CardPanel { private final static Map IMAGE_CACHE; - class Key { + static class Key { final int width; final int height; @@ -341,7 +332,7 @@ public class CardPanelComponentImpl extends CardPanel { g2d.drawImage( IMAGE_CACHE.get( - new Key(getWidth(), getHeight(), getCardWidth(), getCardHeight(), getCardXOffset(), getCardYOffset(), + new Key(getWidth(), getHeight(), getCardWidth(), getCardHeight(), getCardXOffset(), getCardYOffset(), hasImage, isSelected(), isChoosable(), gameCard.isPlayable(), gameCard.isCanAttack())), 0, 0, null); g2d.dispose(); diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java index 5d7a5362eb3..d5a3f7b74d5 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java @@ -1,14 +1,6 @@ package org.mage.card.arcane; import com.google.common.collect.MapMaker; -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.RenderingHints; -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.Map; -import java.util.UUID; import mage.cards.action.ActionCallback; import mage.constants.CardType; import mage.view.CardView; @@ -18,10 +10,17 @@ import mage.view.StackAbilityView; import net.java.truevfs.access.TFile; import org.apache.log4j.Logger; import org.jdesktop.swingx.graphics.GraphicsUtilities; -import static org.mage.plugins.card.constants.Constants.THUMBNAIL_SIZE_FULL; import org.mage.plugins.card.dl.sources.DirectLinksForDownload; import org.mage.plugins.card.images.ImageCache; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.File; +import java.util.Map; +import java.util.UUID; + +import static org.mage.plugins.card.constants.Constants.THUMBNAIL_SIZE_FULL; + public class CardPanelRenderImpl extends CardPanel { private static final Logger LOGGER = Logger.getLogger(CardPanelRenderImpl.class); @@ -114,7 +113,7 @@ public class CardPanelRenderImpl extends CardPanel { return true; } - class ImageKey { + static class ImageKey { final BufferedImage artImage; final int width; @@ -258,8 +257,8 @@ public class CardPanelRenderImpl extends CardPanel { // Try to get card image from cache based on our card characteristics ImageKey key = new ImageKey(gameCard, artImage, - getCardWidth(), getCardHeight(), - isChoosable(), isSelected()); + getCardWidth(), getCardHeight(), + isChoosable(), isSelected()); cardImage = IMAGE_CACHE.computeIfAbsent(key, k -> renderCard()); // No cached copy exists? Render one and cache it diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java index 367984774b3..bc6e75ee8ce 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java @@ -5,12 +5,17 @@ */ package org.mage.card.arcane; +import mage.ObjectColor; +import mage.cards.FrameStyle; +import mage.client.dialog.PreferencesDialog; +import mage.constants.CardType; +import mage.view.CardView; +import mage.view.PermanentView; +import org.apache.log4j.Logger; + +import javax.swing.*; import java.awt.*; -import java.awt.font.FontRenderContext; -import java.awt.font.LineBreakMeasurer; -import java.awt.font.TextAttribute; -import java.awt.font.TextLayout; -import java.awt.font.TextMeasurer; +import java.awt.font.*; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.awt.image.RasterFormatException; @@ -22,14 +27,6 @@ import java.text.CharacterIterator; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.swing.ImageIcon; -import mage.ObjectColor; -import mage.cards.FrameStyle; -import mage.client.dialog.PreferencesDialog; -import mage.constants.CardType; -import mage.view.CardView; -import mage.view.PermanentView; -import org.apache.log4j.Logger; /* @@ -721,7 +718,7 @@ public class ModernCardRenderer extends CardRenderer { // Draw the card's textbox in a given rect protected boolean loyaltyAbilityColorToggle = false; - private class RuleLayout { + private static class RuleLayout { public List attributedRules; public int remainingHeight; diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/TokensMtgImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/TokensMtgImageSource.java index 38376e1888a..97e8544e247 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/TokensMtgImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/TokensMtgImageSource.java @@ -265,7 +265,7 @@ public class TokensMtgImageSource implements CardImageSource { return newTokensData; } - final class TokenData { + static final class TokenData { final private String name; final private String number; diff --git a/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java b/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java index ca9ce44059b..9db5d602eff 100644 --- a/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java +++ b/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java @@ -37,7 +37,7 @@ public class MultiConnectTest { private final Object sync = new Object(); private MageUI ui; - private class ClientMock implements MageClient { + private static class ClientMock implements MageClient { private Session session; private final String username; diff --git a/Mage.Server.Plugins/Mage.Game.CanadianHighlanderDuel/target/maven-archiver/pom.properties b/Mage.Server.Plugins/Mage.Game.CanadianHighlanderDuel/target/maven-archiver/pom.properties index 93d5e67cb66..0e72abf8dc2 100644 --- a/Mage.Server.Plugins/Mage.Game.CanadianHighlanderDuel/target/maven-archiver/pom.properties +++ b/Mage.Server.Plugins/Mage.Game.CanadianHighlanderDuel/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Feb 15 19:18:14 MSK 2017 +#Tue Feb 28 12:32:48 MSK 2017 version=1.4.21 groupId=org.mage artifactId=mage-game-canadianhighlanderduel diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java index 4d285b8e277..b270e765c0e 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java @@ -27,49 +27,15 @@ */ package mage.player.ai; -import java.io.IOException; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeMap; -import java.util.UUID; import mage.MageObject; import mage.Mana; -import mage.abilities.Ability; -import mage.abilities.ActivatedAbility; -import mage.abilities.Mode; -import mage.abilities.Modes; -import mage.abilities.SpellAbility; -import mage.abilities.TriggeredAbility; +import mage.abilities.*; import mage.abilities.costs.VariableCost; -import mage.abilities.costs.mana.ColoredManaCost; -import mage.abilities.costs.mana.ColorlessManaCost; -import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.costs.mana.HybridManaCost; -import mage.abilities.costs.mana.ManaCost; -import mage.abilities.costs.mana.ManaCosts; -import mage.abilities.costs.mana.MonoHybridManaCost; -import mage.abilities.costs.mana.PhyrexianManaCost; +import mage.abilities.costs.mana.*; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect; -import mage.abilities.keyword.DoubleStrikeAbility; -import mage.abilities.keyword.EquipAbility; -import mage.abilities.keyword.FirstStrikeAbility; -import mage.abilities.keyword.FlashAbility; -import mage.abilities.keyword.TrampleAbility; +import mage.abilities.keyword.*; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.abilities.mana.ManaOptions; import mage.cards.Card; @@ -81,21 +47,9 @@ import mage.cards.repository.CardInfo; import mage.cards.repository.CardRepository; import mage.choices.Choice; import mage.choices.ChoiceColor; -import mage.constants.AsThoughEffectType; -import mage.constants.CardType; -import mage.constants.ColoredManaSymbol; -import mage.constants.Outcome; -import mage.constants.RangeOfInfluence; -import mage.constants.Rarity; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterPermanent; -import mage.filter.common.FilterCreatureForCombatBlock; -import mage.filter.common.FilterCreatureOrPlayer; -import mage.filter.common.FilterCreaturePermanent; -import mage.filter.common.FilterLandCard; -import mage.filter.common.FilterNonlandCard; -import mage.filter.common.FilterPermanentOrPlayer; -import mage.filter.common.FilterPlaneswalkerPermanent; +import mage.filter.common.*; import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.game.Game; import mage.game.combat.CombatGroup; @@ -115,31 +69,19 @@ import mage.players.Player; import mage.players.PlayerImpl; import mage.players.net.UserData; import mage.players.net.UserGroup; -import mage.target.Target; -import mage.target.TargetAmount; -import mage.target.TargetCard; -import mage.target.TargetPermanent; -import mage.target.TargetPlayer; -import mage.target.TargetSource; -import mage.target.TargetSpell; -import mage.target.common.TargetCardInASingleGraveyard; -import mage.target.common.TargetCardInExile; -import mage.target.common.TargetCardInGraveyard; -import mage.target.common.TargetCardInHand; -import mage.target.common.TargetCardInLibrary; -import mage.target.common.TargetCardInOpponentsGraveyard; -import mage.target.common.TargetCardInYourGraveyard; -import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreatureOrPlayer; -import mage.target.common.TargetCreatureOrPlayerAmount; -import mage.target.common.TargetDefender; -import mage.target.common.TargetDiscard; -import mage.target.common.TargetOpponent; -import mage.target.common.TargetPermanentOrPlayer; -import mage.target.common.TargetSpellOrPermanent; -import mage.util.*; +import mage.target.*; +import mage.target.common.*; +import mage.util.Copier; +import mage.util.RandomUtil; +import mage.util.TournamentUtil; +import mage.util.TreeNode; import org.apache.log4j.Logger; +import java.io.IOException; +import java.io.Serializable; +import java.util.*; +import java.util.Map.Entry; + /** * * suitable for two player games and some multiplayer games @@ -1941,7 +1883,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { return null; } - private class PickedCard { + private static class PickedCard { public Card card; public Integer score; diff --git a/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java b/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java index 62eeb7850c7..7d49377f729 100644 --- a/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java +++ b/Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; @@ -48,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author anonymous @@ -87,7 +88,7 @@ public class ArchdemonOfGreed extends CardImpl { return new ArchdemonOfGreed(this); } - class ArchdemonOfGreedEffect extends OneShotEffect { + static class ArchdemonOfGreedEffect extends OneShotEffect { public ArchdemonOfGreedEffect() { super(Outcome.Damage); diff --git a/Mage.Sets/src/mage/cards/a/AshlingThePilgrim.java b/Mage.Sets/src/mage/cards/a/AshlingThePilgrim.java index 2249902ff9f..1d19449d107 100644 --- a/Mage.Sets/src/mage/cards/a/AshlingThePilgrim.java +++ b/Mage.Sets/src/mage/cards/a/AshlingThePilgrim.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -79,7 +80,7 @@ public class AshlingThePilgrim extends CardImpl { class AshlingThePilgrimEffect extends OneShotEffect { - class ActivationInfo { + static class ActivationInfo { public int zoneChangeCounter; public int turn; public int activations; diff --git a/Mage.Sets/src/mage/cards/a/AtarkaMonument.java b/Mage.Sets/src/mage/cards/a/AtarkaMonument.java index 2a52665939c..e4716224fae 100644 --- a/Mage.Sets/src/mage/cards/a/AtarkaMonument.java +++ b/Mage.Sets/src/mage/cards/a/AtarkaMonument.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author fireshoes @@ -69,7 +70,7 @@ public class AtarkaMonument extends CardImpl { return new AtarkaMonument(this); } - private class AtarkaMonumentToken extends Token { + private static class AtarkaMonumentToken extends Token { AtarkaMonumentToken() { super("", "4/4 red and green Dragon artifact creature with flying"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/a/AuraBarbs.java b/Mage.Sets/src/mage/cards/a/AuraBarbs.java index 1fee4ed963d..926627ccdda 100644 --- a/Mage.Sets/src/mage/cards/a/AuraBarbs.java +++ b/Mage.Sets/src/mage/cards/a/AuraBarbs.java @@ -27,13 +27,11 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.CardTypePredicate; @@ -42,6 +40,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -66,7 +66,7 @@ public class AuraBarbs extends CardImpl { return new AuraBarbs(this); } - private class AuraBarbsEffect extends OneShotEffect { + private static class AuraBarbsEffect extends OneShotEffect { public AuraBarbsEffect() { super(Outcome.Detriment); diff --git a/Mage.Sets/src/mage/cards/a/Aurification.java b/Mage.Sets/src/mage/cards/a/Aurification.java index 5bd02eb70b8..e5f4ad33cea 100644 --- a/Mage.Sets/src/mage/cards/a/Aurification.java +++ b/Mage.Sets/src/mage/cards/a/Aurification.java @@ -39,7 +39,10 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.*; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.CounterPredicate; @@ -95,7 +98,7 @@ public class Aurification extends CardImpl { return new Aurification(this); } - public class AddGoldCountersAbility extends TriggeredAbilityImpl { + public static class AddGoldCountersAbility extends TriggeredAbilityImpl { public AddGoldCountersAbility() { super(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.GOLD.createInstance())); @@ -136,7 +139,7 @@ public class Aurification extends CardImpl { } - public class RemoveAllGoldCountersEffect extends OneShotEffect { + public static class RemoveAllGoldCountersEffect extends OneShotEffect { public RemoveAllGoldCountersEffect() { super(Outcome.Neutral); this.staticText = "remove all gold counters from all creatures"; diff --git a/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java b/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java index 220cce36e69..2157bd326e6 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java +++ b/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java @@ -27,7 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -46,6 +45,8 @@ import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -81,7 +82,7 @@ public class AwakenTheAncient extends CardImpl { return new AwakenTheAncient(this); } - private class GiantToken extends Token { + private static class GiantToken extends Token { GiantToken() { super("Giant", "7/7 red Giant creature with haste"); diff --git a/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java b/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java index 9ed8701d5f5..7617d1ef68b 100644 --- a/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java +++ b/Mage.Sets/src/mage/cards/a/AzoriusKeyrune.java @@ -27,9 +27,6 @@ */ package mage.cards.a; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,10 +36,13 @@ import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * @author LevelX2 */ @@ -68,7 +68,7 @@ public class AzoriusKeyrune extends CardImpl { return new AzoriusKeyrune(this); } - private class AzoriusKeyruneToken extends Token { + private static class AzoriusKeyruneToken extends Token { AzoriusKeyruneToken() { super("", "2/2 white and blue Bird artifact creature with flying"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/b/BanefulOmen.java b/Mage.Sets/src/mage/cards/b/BanefulOmen.java index 41981e0f9ad..f2bc1b33ea8 100644 --- a/Mage.Sets/src/mage/cards/b/BanefulOmen.java +++ b/Mage.Sets/src/mage/cards/b/BanefulOmen.java @@ -27,16 +27,10 @@ */ package mage.cards.b; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -45,6 +39,9 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.players.Player; +import java.util.Set; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -99,7 +96,7 @@ public class BanefulOmen extends CardImpl { } } - class BanefulOmenEffect extends OneShotEffect { + static class BanefulOmenEffect extends OneShotEffect { public BanefulOmenEffect() { super(Outcome.Benefit); diff --git a/Mage.Sets/src/mage/cards/b/BlademaneBaku.java b/Mage.Sets/src/mage/cards/b/BlademaneBaku.java index a73db0e3321..a8109dd5adc 100644 --- a/Mage.Sets/src/mage/cards/b/BlademaneBaku.java +++ b/Mage.Sets/src/mage/cards/b/BlademaneBaku.java @@ -28,27 +28,27 @@ package mage.cards.b; -import java.util.UUID; + import mage.MageInt; + import mage.abilities.Ability; + import mage.abilities.common.SimpleActivatedAbility; + import mage.abilities.common.SpellCastControllerTriggeredAbility; + import mage.abilities.costs.Cost; + import mage.abilities.costs.common.RemoveVariableCountersSourceCost; + import mage.abilities.costs.mana.GenericManaCost; + import mage.abilities.effects.OneShotEffect; + import mage.abilities.effects.common.continuous.BoostSourceEffect; + import mage.abilities.effects.common.counter.AddCountersSourceEffect; + import mage.cards.CardImpl; + import mage.cards.CardSetInfo; + import mage.constants.CardType; + import mage.constants.Duration; + import mage.constants.Outcome; + import mage.constants.Zone; + import mage.counters.CounterType; + import mage.filter.common.FilterSpiritOrArcaneCard; + import mage.game.Game; -import mage.constants.CardType; -import mage.constants.Zone; -import mage.MageInt; -import mage.abilities.Ability; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.common.SpellCastControllerTriggeredAbility; -import mage.abilities.costs.Cost; -import mage.abilities.costs.common.RemoveVariableCountersSourceCost; -import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.continuous.BoostSourceEffect; -import mage.abilities.effects.common.counter.AddCountersSourceEffect; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.counters.CounterType; -import mage.filter.common.FilterSpiritOrArcaneCard; -import mage.game.Game; + import java.util.UUID; /** * @author LevelX2 @@ -82,7 +82,7 @@ public class BlademaneBaku extends CardImpl { return new BlademaneBaku(this); } - class BlademaneBakuBoostEffect extends OneShotEffect { + static class BlademaneBakuBoostEffect extends OneShotEffect { public BlademaneBakuBoostEffect() { super(Outcome.UnboostCreature); diff --git a/Mage.Sets/src/mage/cards/b/BlossomingWreath.java b/Mage.Sets/src/mage/cards/b/BlossomingWreath.java index 543885cc72d..9b0e8893172 100644 --- a/Mage.Sets/src/mage/cards/b/BlossomingWreath.java +++ b/Mage.Sets/src/mage/cards/b/BlossomingWreath.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Derpthemeus @@ -60,7 +61,7 @@ public class BlossomingWreath extends CardImpl { return new BlossomingWreath(this); } - class BlossomingWreathEffect extends OneShotEffect { + static class BlossomingWreathEffect extends OneShotEffect { public BlossomingWreathEffect() { super(Outcome.GainLife); diff --git a/Mage.Sets/src/mage/cards/b/BorosFuryShield.java b/Mage.Sets/src/mage/cards/b/BorosFuryShield.java index fcd96342cf7..87ce29756a7 100644 --- a/Mage.Sets/src/mage/cards/b/BorosFuryShield.java +++ b/Mage.Sets/src/mage/cards/b/BorosFuryShield.java @@ -27,7 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.condition.common.ManaWasSpentCondition; import mage.abilities.decorator.ConditionalOneShotEffect; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Dilnu @@ -75,7 +76,7 @@ public class BorosFuryShield extends CardImpl { return new BorosFuryShield(this); } - class BorosFuryShieldDamageEffect extends OneShotEffect { + static class BorosFuryShieldDamageEffect extends OneShotEffect { BorosFuryShieldDamageEffect() { super(Outcome.Damage); staticText = "{this} deals damage to that creature's controller equal to the creature's power"; diff --git a/Mage.Sets/src/mage/cards/b/BorosKeyrune.java b/Mage.Sets/src/mage/cards/b/BorosKeyrune.java index 6716e9ce7a2..7798e8149e1 100644 --- a/Mage.Sets/src/mage/cards/b/BorosKeyrune.java +++ b/Mage.Sets/src/mage/cards/b/BorosKeyrune.java @@ -27,10 +27,6 @@ */ package mage.cards.b; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,8 +36,13 @@ import mage.abilities.mana.RedManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 @@ -68,7 +69,7 @@ public class BorosKeyrune extends CardImpl { return new BorosKeyrune(this); } - private class BorosKeyruneToken extends Token { + private static class BorosKeyruneToken extends Token { BorosKeyruneToken() { super("Soldier", "1/1 red and white Soldier artifact creature with double strike"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/b/BrinkOfMadness.java b/Mage.Sets/src/mage/cards/b/BrinkOfMadness.java index 8b7a698d36d..cbb5523499b 100644 --- a/Mage.Sets/src/mage/cards/b/BrinkOfMadness.java +++ b/Mage.Sets/src/mage/cards/b/BrinkOfMadness.java @@ -27,10 +27,6 @@ */ package mage.cards.b; -import java.util.Set; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -41,10 +37,17 @@ import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.Set; +import java.util.UUID; + /** * * @author Plopman @@ -73,7 +76,7 @@ public class BrinkOfMadness extends CardImpl { return new BrinkOfMadness(this); } - class BrinkOfMadnessEffect extends OneShotEffect { + static class BrinkOfMadnessEffect extends OneShotEffect { public BrinkOfMadnessEffect() { super(Outcome.Benefit); diff --git a/Mage.Sets/src/mage/cards/c/CairnWanderer.java b/Mage.Sets/src/mage/cards/c/CairnWanderer.java index 720866bacd2..7675bc9cb25 100644 --- a/Mage.Sets/src/mage/cards/c/CairnWanderer.java +++ b/Mage.Sets/src/mage/cards/c/CairnWanderer.java @@ -27,39 +27,22 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.MageSingleton; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; -import mage.abilities.keyword.ChangelingAbility; -import mage.abilities.keyword.DeathtouchAbility; -import mage.abilities.keyword.DoubleStrikeAbility; -import mage.abilities.keyword.FearAbility; -import mage.abilities.keyword.FirstStrikeAbility; -import mage.abilities.keyword.FlyingAbility; -import mage.abilities.keyword.HasteAbility; -import mage.abilities.keyword.LandwalkAbility; -import mage.abilities.keyword.LifelinkAbility; -import mage.abilities.keyword.ProtectionAbility; -import mage.abilities.keyword.ReachAbility; -import mage.abilities.keyword.ShroudAbility; -import mage.abilities.keyword.TrampleAbility; -import mage.abilities.keyword.VigilanceAbility; +import mage.abilities.keyword.*; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author psykad @@ -89,7 +72,7 @@ public class CairnWanderer extends CardImpl { return new CairnWanderer(this); } - class CairnWandererEffect extends ContinuousEffectImpl { + static class CairnWandererEffect extends ContinuousEffectImpl { public CairnWandererEffect() { super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); diff --git a/Mage.Sets/src/mage/cards/c/ChimericEgg.java b/Mage.Sets/src/mage/cards/c/ChimericEgg.java index 579e458cf5f..54f4046493f 100644 --- a/Mage.Sets/src/mage/cards/c/ChimericEgg.java +++ b/Mage.Sets/src/mage/cards/c/ChimericEgg.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SpellCastOpponentTriggeredAbility; @@ -47,6 +46,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.permanent.token.Token; +import java.util.UUID; + /** @@ -81,7 +82,7 @@ public class ChimericEgg extends CardImpl { return new ChimericEgg(this); } - private class ChimericEggToken extends Token { + private static class ChimericEggToken extends Token { ChimericEggToken() { super("", "6/6 Construct artifact creature with trample"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/c/ClashOfRealities.java b/Mage.Sets/src/mage/cards/c/ClashOfRealities.java index 3451d019591..f8d9af36aca 100644 --- a/Mage.Sets/src/mage/cards/c/ClashOfRealities.java +++ b/Mage.Sets/src/mage/cards/c/ClashOfRealities.java @@ -27,9 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.ZoneChangeTriggeredAbility; @@ -38,6 +35,7 @@ import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; @@ -45,6 +43,8 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -83,7 +83,7 @@ public class ClashOfRealities extends CardImpl { return new ClashOfRealities(this); } - private class ClashOfRealitiesTriggeredAbility extends ZoneChangeTriggeredAbility { + private static class ClashOfRealitiesTriggeredAbility extends ZoneChangeTriggeredAbility { public ClashOfRealitiesTriggeredAbility(Effect effect, String rule) { super(Zone.BATTLEFIELD, effect, rule, true); diff --git a/Mage.Sets/src/mage/cards/c/CoalhaulerSwine.java b/Mage.Sets/src/mage/cards/c/CoalhaulerSwine.java index 77cac8a8db3..1eb57c1ae53 100644 --- a/Mage.Sets/src/mage/cards/c/CoalhaulerSwine.java +++ b/Mage.Sets/src/mage/cards/c/CoalhaulerSwine.java @@ -68,7 +68,7 @@ public class CoalhaulerSwine extends CardImpl { return new CoalhaulerSwine(this); } - class CoalhaulerSwineEffect extends OneShotEffect { + static class CoalhaulerSwineEffect extends OneShotEffect { public CoalhaulerSwineEffect() { super(Outcome.Damage); diff --git a/Mage.Sets/src/mage/cards/c/ConvalescentCare.java b/Mage.Sets/src/mage/cards/c/ConvalescentCare.java index db847155bee..cd478adc8db 100644 --- a/Mage.Sets/src/mage/cards/c/ConvalescentCare.java +++ b/Mage.Sets/src/mage/cards/c/ConvalescentCare.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -42,6 +41,8 @@ import mage.constants.CardType; import mage.constants.TargetController; import mage.game.Game; +import java.util.UUID; + /** * * @author fireshoes @@ -67,7 +68,7 @@ public class ConvalescentCare extends CardImpl { return new ConvalescentCare(this); } - class FiveOrLessLifeCondition implements Condition { + static class FiveOrLessLifeCondition implements Condition { @Override public boolean apply(Game game, Ability source) { diff --git a/Mage.Sets/src/mage/cards/c/Conversion.java b/Mage.Sets/src/mage/cards/c/Conversion.java index 0e573f29b02..34b8a20880a 100644 --- a/Mage.Sets/src/mage/cards/c/Conversion.java +++ b/Mage.Sets/src/mage/cards/c/Conversion.java @@ -27,10 +27,6 @@ */ package mage.cards.c; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -41,18 +37,16 @@ import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.DependencyType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; + /** * * @author LevelX2 @@ -81,7 +75,7 @@ public class Conversion extends CardImpl { return new Conversion(this); } - class ConversionEffect extends ContinuousEffectImpl { + static class ConversionEffect extends ContinuousEffectImpl { ConversionEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/cards/c/CrazedArmodon.java b/Mage.Sets/src/mage/cards/c/CrazedArmodon.java index dcfd16396aa..6a22f536b0a 100644 --- a/Mage.Sets/src/mage/cards/c/CrazedArmodon.java +++ b/Mage.Sets/src/mage/cards/c/CrazedArmodon.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -48,6 +47,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author fireshoes @@ -80,7 +81,7 @@ public class CrazedArmodon extends CardImpl { return new CrazedArmodon(this); } - class CrazedArmodonDelayedTriggeredAbility extends DelayedTriggeredAbility { + static class CrazedArmodonDelayedTriggeredAbility extends DelayedTriggeredAbility { public CrazedArmodonDelayedTriggeredAbility() { super(new DestroySourceEffect()); diff --git a/Mage.Sets/src/mage/cards/c/CrosstownCourier.java b/Mage.Sets/src/mage/cards/c/CrosstownCourier.java index 62504c2359e..aec8f08ad81 100644 --- a/Mage.Sets/src/mage/cards/c/CrosstownCourier.java +++ b/Mage.Sets/src/mage/cards/c/CrosstownCourier.java @@ -27,7 +27,6 @@ */ package mage.cards.c; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.dynamicvalue.common.StaticValue; @@ -43,6 +42,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author LevelX2 @@ -69,7 +70,7 @@ public class CrosstownCourier extends CardImpl { return new CrosstownCourier(this); } - class CrosstownCourierTriggeredAbility extends TriggeredAbilityImpl { + static class CrosstownCourierTriggeredAbility extends TriggeredAbilityImpl { public CrosstownCourierTriggeredAbility() { super(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(0), false); diff --git a/Mage.Sets/src/mage/cards/d/DanceOfTheSkywise.java b/Mage.Sets/src/mage/cards/d/DanceOfTheSkywise.java index a2d0774e2a1..0b621f9e82e 100644 --- a/Mage.Sets/src/mage/cards/d/DanceOfTheSkywise.java +++ b/Mage.Sets/src/mage/cards/d/DanceOfTheSkywise.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BecomesCreatureTargetEffect; @@ -39,6 +38,8 @@ import mage.constants.Duration; import mage.game.permanent.token.Token; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author fireshoes @@ -64,7 +65,7 @@ public class DanceOfTheSkywise extends CardImpl { return new DanceOfTheSkywise(this); } - private class DragonIllusionToken extends Token { + private static class DragonIllusionToken extends Token { public DragonIllusionToken() { super("Dragon", "blue Dragon Illusion with base power and toughness 4/4 and with flying"); diff --git a/Mage.Sets/src/mage/cards/d/DeathWatch.java b/Mage.Sets/src/mage/cards/d/DeathWatch.java index dccd3c92eca..b4fb087f21c 100644 --- a/Mage.Sets/src/mage/cards/d/DeathWatch.java +++ b/Mage.Sets/src/mage/cards/d/DeathWatch.java @@ -75,7 +75,7 @@ public class DeathWatch extends CardImpl { return new DeathWatch(this); } - class DeathWatchEffect extends OneShotEffect { + static class DeathWatchEffect extends OneShotEffect { public DeathWatchEffect() { super(Outcome.LoseLife); diff --git a/Mage.Sets/src/mage/cards/d/DebtOfLoyalty.java b/Mage.Sets/src/mage/cards/d/DebtOfLoyalty.java index ccc551b59fc..84582e129bf 100644 --- a/Mage.Sets/src/mage/cards/d/DebtOfLoyalty.java +++ b/Mage.Sets/src/mage/cards/d/DebtOfLoyalty.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.common.RegenerateTargetEffect; import mage.abilities.effects.common.continuous.GainControlTargetEffect; @@ -39,6 +38,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Dilnu @@ -62,7 +63,7 @@ public class DebtOfLoyalty extends CardImpl { return new DebtOfLoyalty(this); } - class DebtOfLoyaltyEffect extends RegenerateTargetEffect { + static class DebtOfLoyaltyEffect extends RegenerateTargetEffect { public DebtOfLoyaltyEffect ( ) { super(); this.staticText = "Regenerate target creature. You gain control of that creature if it regenerates this way."; diff --git a/Mage.Sets/src/mage/cards/d/DefenseOfTheHeart.java b/Mage.Sets/src/mage/cards/d/DefenseOfTheHeart.java index 06ab8b055a3..ef3a136e413 100644 --- a/Mage.Sets/src/mage/cards/d/DefenseOfTheHeart.java +++ b/Mage.Sets/src/mage/cards/d/DefenseOfTheHeart.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.Set; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -40,11 +36,18 @@ import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.target.common.TargetCardInLibrary; +import java.util.Set; +import java.util.UUID; + /** * * @author Plopman @@ -72,7 +75,7 @@ public class DefenseOfTheHeart extends CardImpl { return new DefenseOfTheHeart(this); } - class DefenseOfTheHeartCondition implements Condition { + static class DefenseOfTheHeartCondition implements Condition { @Override public boolean apply(Game game, Ability source) { diff --git a/Mage.Sets/src/mage/cards/d/DevastatingSummons.java b/Mage.Sets/src/mage/cards/d/DevastatingSummons.java index 8ebba44850b..56f74298bf5 100644 --- a/Mage.Sets/src/mage/cards/d/DevastatingSummons.java +++ b/Mage.Sets/src/mage/cards/d/DevastatingSummons.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.common.SacrificeXTargetCost; import mage.abilities.dynamicvalue.common.GetXValue; @@ -40,6 +39,8 @@ import mage.filter.common.FilterControlledLandPermanent; import mage.game.Game; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -95,7 +96,7 @@ class DevastatingSummonsEffect extends OneShotEffect { return new DevastatingSummonsEffect(this); } - class ElementalToken extends Token { + static class ElementalToken extends Token { public ElementalToken() { super("Elemental", "X/X red Elemental creature"); diff --git a/Mage.Sets/src/mage/cards/d/DimirKeyrune.java b/Mage.Sets/src/mage/cards/d/DimirKeyrune.java index 0d9bad39269..10ccbec501c 100644 --- a/Mage.Sets/src/mage/cards/d/DimirKeyrune.java +++ b/Mage.Sets/src/mage/cards/d/DimirKeyrune.java @@ -27,10 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,8 +36,13 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 @@ -68,7 +69,7 @@ public class DimirKeyrune extends CardImpl { return new DimirKeyrune(this); } - private class DimirKeyruneToken extends Token { + private static class DimirKeyruneToken extends Token { DimirKeyruneToken() { super("Horror", "2/2 blue and black Horror until end of turn and can't be blocked this turn"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java index 1d78a9b295e..25c7df89907 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -49,6 +48,8 @@ import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -88,7 +89,7 @@ public class GenjuOfTheCedars extends CardImpl { return new GenjuOfTheCedars(this); } - private class SpiritToken extends Token { + private static class SpiritToken extends Token { SpiritToken() { super("", "4/4 green Spirit creature"); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java index f9e9c3be3fb..d6324eead40 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -49,6 +48,8 @@ import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -86,7 +87,7 @@ public class GenjuOfTheFalls extends CardImpl { return new GenjuOfTheFalls(this); } - private class SpiritToken extends Token { + private static class SpiritToken extends Token { SpiritToken() { super("Spirit", "3/2 blue Spirit creature with flying"); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java index af0f62f98f2..ada5a34a2dd 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -50,6 +49,8 @@ import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -87,7 +88,7 @@ public class GenjuOfTheFens extends CardImpl { return new GenjuOfTheFens(this); } - private class SpiritToken extends Token { + private static class SpiritToken extends Token { SpiritToken() { super("Spirit", "2/2 black Spirit creature with \"{B}: This creature gets +1/+1 until end of turn.\""); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java index 086b5bdee55..e6e9a147b5d 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsDamageGainLifeSourceTriggeredAbility; @@ -42,16 +41,14 @@ import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AttachmentType; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -94,7 +91,7 @@ public class GenjuOfTheFields extends CardImpl { return new GenjuOfTheFields(this); } - private class SpiritToken extends Token { + private static class SpiritToken extends Token { SpiritToken() { super("Spirit", "2/5 white Spirit creature"); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java index b0a6bf893cb..3c0ca8b547b 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -48,6 +47,8 @@ import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -84,7 +85,7 @@ public class GenjuOfTheRealm extends CardImpl { return new GenjuOfTheRealm(this); } - private class SpiritToken extends Token { + private static class SpiritToken extends Token { SpiritToken() { super("Spirit", "legendary 8/12 Spirit creature with trample"); diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java index a515f077120..22ecddcda5b 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesAttachedTriggeredAbility; @@ -48,6 +47,8 @@ import mage.game.permanent.token.Token; import mage.target.TargetPermanent; import mage.target.common.TargetLandPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -85,7 +86,7 @@ public class GenjuOfTheSpires extends CardImpl { return new GenjuOfTheSpires(this); } - private class SpiritToken extends Token { + private static class SpiritToken extends Token { SpiritToken() { super("Spirit", "6/1 red Spirit creature"); diff --git a/Mage.Sets/src/mage/cards/g/GoblinWelder.java b/Mage.Sets/src/mage/cards/g/GoblinWelder.java index 62c687af273..f8b67411b63 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWelder.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWelder.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +46,8 @@ import mage.players.Player; import mage.target.common.TargetArtifactPermanent; import mage.target.common.TargetCardInGraveyard; +import java.util.UUID; + /** * * @author Plopman @@ -77,7 +78,7 @@ public class GoblinWelder extends CardImpl { return new GoblinWelder(this); } - public class GoblinWelderEffect extends OneShotEffect { + public static class GoblinWelderEffect extends OneShotEffect { public GoblinWelderEffect() { super(Outcome.PutCardInPlay); @@ -118,7 +119,7 @@ public class GoblinWelder extends CardImpl { } - class GoblinWelderTarget extends TargetCardInGraveyard { + static class GoblinWelderTarget extends TargetCardInGraveyard { public GoblinWelderTarget() { super(1, 1, new FilterArtifactCard()); diff --git a/Mage.Sets/src/mage/cards/g/GolgariKeyrune.java b/Mage.Sets/src/mage/cards/g/GolgariKeyrune.java index a3703d6df30..3e961faab6c 100644 --- a/Mage.Sets/src/mage/cards/g/GolgariKeyrune.java +++ b/Mage.Sets/src/mage/cards/g/GolgariKeyrune.java @@ -27,9 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,10 +36,13 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * @author LevelX2 */ @@ -68,7 +68,7 @@ public class GolgariKeyrune extends CardImpl { return new GolgariKeyrune(this); } - private class GolgariKeyruneToken extends Token { + private static class GolgariKeyruneToken extends Token { GolgariKeyruneToken() { super("", "2/2 black and green Insect artifact creature with deathtouch"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/g/GreenbeltRampager.java b/Mage.Sets/src/mage/cards/g/GreenbeltRampager.java index 4c1ba8468b4..fd4c1acd1e7 100644 --- a/Mage.Sets/src/mage/cards/g/GreenbeltRampager.java +++ b/Mage.Sets/src/mage/cards/g/GreenbeltRampager.java @@ -69,7 +69,7 @@ public class GreenbeltRampager extends CardImpl { return new GreenbeltRampager(this); } - private class GreenbeltRampagerEffect extends OneShotEffect { + private static class GreenbeltRampagerEffect extends OneShotEffect { GreenbeltRampagerEffect() { super(Outcome.Neutral); diff --git a/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java b/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java index d05ff310c37..3d4961a50b7 100644 --- a/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java +++ b/Mage.Sets/src/mage/cards/g/GroveOfTheGuardian.java @@ -27,7 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -49,6 +48,8 @@ import mage.filter.predicate.permanent.TappedPredicate; import mage.game.permanent.token.Token; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * @author LevelX2 */ @@ -83,7 +84,7 @@ public class GroveOfTheGuardian extends CardImpl { return new GroveOfTheGuardian(this); } - private class ElementalToken extends Token { + private static class ElementalToken extends Token { ElementalToken() { super("Elemental", "8/8 green and white Elemental creature token with vigilance"); diff --git a/Mage.Sets/src/mage/cards/g/GruulKeyrune.java b/Mage.Sets/src/mage/cards/g/GruulKeyrune.java index 9f9c56dfe9d..00b6169eac3 100644 --- a/Mage.Sets/src/mage/cards/g/GruulKeyrune.java +++ b/Mage.Sets/src/mage/cards/g/GruulKeyrune.java @@ -27,10 +27,6 @@ */ package mage.cards.g; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,8 +36,13 @@ import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 @@ -68,7 +69,7 @@ public class GruulKeyrune extends CardImpl { return new GruulKeyrune(this); } - private class GruulKeyruneToken extends Token { + private static class GruulKeyruneToken extends Token { GruulKeyruneToken() { super("Beast", "3/2 red and green Beast artifact creature with trample"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/h/HeedTheMists.java b/Mage.Sets/src/mage/cards/h/HeedTheMists.java index 064189087c9..f4cdf8a3152 100644 --- a/Mage.Sets/src/mage/cards/h/HeedTheMists.java +++ b/Mage.Sets/src/mage/cards/h/HeedTheMists.java @@ -27,19 +27,19 @@ */ package mage.cards.h; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -64,7 +64,7 @@ public class HeedTheMists extends CardImpl { return new HeedTheMists(this); } - private class HeedTheMistsEffect extends OneShotEffect { + private static class HeedTheMistsEffect extends OneShotEffect { public HeedTheMistsEffect() { super(Outcome.DrawCard); diff --git a/Mage.Sets/src/mage/cards/h/HellionCrucible.java b/Mage.Sets/src/mage/cards/h/HellionCrucible.java index d8219053bcf..b63878eb9fa 100644 --- a/Mage.Sets/src/mage/cards/h/HellionCrucible.java +++ b/Mage.Sets/src/mage/cards/h/HellionCrucible.java @@ -27,7 +27,6 @@ */ package mage.cards.h; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,6 +40,7 @@ import mage.abilities.keyword.HasteAbility; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; import mage.game.permanent.token.Token; @@ -81,7 +81,7 @@ public class HellionCrucible extends CardImpl { return new HellionCrucible(this); } - class HellionToken extends Token { + static class HellionToken extends Token { public HellionToken() { super("Hellion", "4/4 red Hellion creature token with haste"); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/h/HellionEruption.java b/Mage.Sets/src/mage/cards/h/HellionEruption.java index c68155c0778..957e42f6e92 100644 --- a/Mage.Sets/src/mage/cards/h/HellionEruption.java +++ b/Mage.Sets/src/mage/cards/h/HellionEruption.java @@ -27,13 +27,13 @@ */ package mage.cards.h; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; @@ -92,7 +92,7 @@ class HellionEruptionEffect extends OneShotEffect { return true; } - class HellionToken extends Token { + static class HellionToken extends Token { HellionToken() { super("Hellion", "4/4 red Hellion creature token"); diff --git a/Mage.Sets/src/mage/cards/h/HungryFlames.java b/Mage.Sets/src/mage/cards/h/HungryFlames.java index 9ad5c4565e9..3d821835395 100644 --- a/Mage.Sets/src/mage/cards/h/HungryFlames.java +++ b/Mage.Sets/src/mage/cards/h/HungryFlames.java @@ -65,7 +65,7 @@ public class HungryFlames extends CardImpl { return new HungryFlames(this); } - private class HungryFlamesEffect extends OneShotEffect { + private static class HungryFlamesEffect extends OneShotEffect { HungryFlamesEffect() { super(Outcome.Damage); this.staticText = "{this} deals 3 damage to target creature and 2 damage to target player"; diff --git a/Mage.Sets/src/mage/cards/i/InnerFlameIgniter.java b/Mage.Sets/src/mage/cards/i/InnerFlameIgniter.java index 259c7c6aaf8..3a107de2a62 100644 --- a/Mage.Sets/src/mage/cards/i/InnerFlameIgniter.java +++ b/Mage.Sets/src/mage/cards/i/InnerFlameIgniter.java @@ -27,7 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -77,7 +78,7 @@ public class InnerFlameIgniter extends CardImpl { class InnerFlameIgniterEffect extends OneShotEffect { - class ActivationInfo { + static class ActivationInfo { public int zoneChangeCounter; public int turn; public int activations; diff --git a/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java b/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java index 30f954ac280..d249aa00311 100644 --- a/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java +++ b/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java @@ -27,9 +27,6 @@ */ package mage.cards.i; -import java.util.UUID; - -import mage.constants.*; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; @@ -41,10 +38,16 @@ import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.token.Token; import mage.players.Player; +import java.util.UUID; + /** * @author LevelX2 */ @@ -73,7 +76,7 @@ public class IzzetKeyrune extends CardImpl { return new IzzetKeyrune(this); } - private class IzzetKeyruneEffect extends OneShotEffect { + private static class IzzetKeyruneEffect extends OneShotEffect { public IzzetKeyruneEffect() { super(Outcome.DrawCard); @@ -102,7 +105,7 @@ public class IzzetKeyrune extends CardImpl { } } - private class IzzetKeyruneToken extends Token { + private static class IzzetKeyruneToken extends Token { IzzetKeyruneToken() { super("", "2/1 blue and red Elemental artifact creature"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/j/JadeStatue.java b/Mage.Sets/src/mage/cards/j/JadeStatue.java index 494dc29671f..ff5e5c1fe26 100644 --- a/Mage.Sets/src/mage/cards/j/JadeStatue.java +++ b/Mage.Sets/src/mage/cards/j/JadeStatue.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.MageInt; import mage.abilities.condition.common.IsPhaseCondition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -41,6 +40,8 @@ import mage.constants.TurnPhase; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author anonymous @@ -64,7 +65,7 @@ public class JadeStatue extends CardImpl { return new JadeStatue(this); } - private class JadeStatueToken extends Token { + private static class JadeStatueToken extends Token { JadeStatueToken() { super("", "3/6 Golem artifact creature"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/j/JediEnclave.java b/Mage.Sets/src/mage/cards/j/JediEnclave.java index 228bc34e52d..0b4c7b096cd 100644 --- a/Mage.Sets/src/mage/cards/j/JediEnclave.java +++ b/Mage.Sets/src/mage/cards/j/JediEnclave.java @@ -27,8 +27,6 @@ */ package mage.cards.j; -import java.util.ArrayList; -import java.util.UUID; import mage.MageObject; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.SacrificeSourceCost; @@ -48,6 +46,9 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.ArrayList; +import java.util.UUID; + /** * * @author Styxo @@ -74,7 +75,7 @@ public class JediEnclave extends CardImpl { return new JediEnclave(this); } - public class JediEnclaveAbility extends ActivatedAbilityImpl { + public static class JediEnclaveAbility extends ActivatedAbilityImpl { public JediEnclaveAbility(JediEnclaveAbility ability) { super(ability); diff --git a/Mage.Sets/src/mage/cards/j/JunkyoBell.java b/Mage.Sets/src/mage/cards/j/JunkyoBell.java index 3f42cbdf842..b292efbdfa3 100644 --- a/Mage.Sets/src/mage/cards/j/JunkyoBell.java +++ b/Mage.Sets/src/mage/cards/j/JunkyoBell.java @@ -27,7 +27,6 @@ */ package mage.cards.j; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -48,6 +47,8 @@ import mage.game.permanent.Permanent; import mage.target.common.TargetControlledCreaturePermanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * @author LevelX */ @@ -74,7 +75,7 @@ public class JunkyoBell extends CardImpl { return new JunkyoBell(this); } - private class JunkyoBellSacrificeEffect extends OneShotEffect { + private static class JunkyoBellSacrificeEffect extends OneShotEffect { public JunkyoBellSacrificeEffect() { super(Outcome.Sacrifice); diff --git a/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java b/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java index 9ff74ced51b..70e6be220ab 100644 --- a/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java +++ b/Mage.Sets/src/mage/cards/k/KalitasBloodchiefOfGhet.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -45,6 +44,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -101,7 +102,7 @@ class KalitasDestroyEffect extends OneShotEffect { return true; } - class VampireToken extends Token { + static class VampireToken extends Token { public VampireToken(int tokenPower, int tokenToughness) { super("Vampire", new StringBuilder(tokenPower).append('/').append(tokenToughness).append(" black Vampire creature token").toString()); cardType.add(CardType.CREATURE); diff --git a/Mage.Sets/src/mage/cards/k/KyrenToy.java b/Mage.Sets/src/mage/cards/k/KyrenToy.java index de15966e264..1013ee36fd4 100644 --- a/Mage.Sets/src/mage/cards/k/KyrenToy.java +++ b/Mage.Sets/src/mage/cards/k/KyrenToy.java @@ -27,7 +27,6 @@ */ package mage.cards.k; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,6 +45,8 @@ import mage.counters.CounterType; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -91,7 +92,7 @@ public class KyrenToy extends CardImpl { } } - private class KyrenToyManaEffect extends ManaEffect { + private static class KyrenToyManaEffect extends ManaEffect { KyrenToyManaEffect() { super(); diff --git a/Mage.Sets/src/mage/cards/l/LightningDart.java b/Mage.Sets/src/mage/cards/l/LightningDart.java index 538aa788c58..7dfefbc52d2 100644 --- a/Mage.Sets/src/mage/cards/l/LightningDart.java +++ b/Mage.Sets/src/mage/cards/l/LightningDart.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -39,6 +38,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Derpthemeus @@ -62,7 +63,7 @@ public class LightningDart extends CardImpl { return new LightningDart(this); } - class LightningDartEffect extends OneShotEffect { + static class LightningDartEffect extends OneShotEffect { public LightningDartEffect() { super(Outcome.Damage); diff --git a/Mage.Sets/src/mage/cards/l/LiquidFire.java b/Mage.Sets/src/mage/cards/l/LiquidFire.java index c58cb222da0..39684cc70b9 100644 --- a/Mage.Sets/src/mage/cards/l/LiquidFire.java +++ b/Mage.Sets/src/mage/cards/l/LiquidFire.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.costs.Cost; import mage.abilities.costs.VariableCostImpl; @@ -44,6 +43,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Dilnu @@ -107,7 +108,7 @@ public class LiquidFire extends CardImpl { } } - class LiquidFireCost extends VariableCostImpl { + static class LiquidFireCost extends VariableCostImpl { public LiquidFireCost() { super("Choose a Number"); this.text = "As an additional cost to cast {source}, choose a number between 0 and 5"; diff --git a/Mage.Sets/src/mage/cards/l/LivingArmor.java b/Mage.Sets/src/mage/cards/l/LivingArmor.java index 4add97b25a4..069f4842a48 100644 --- a/Mage.Sets/src/mage/cards/l/LivingArmor.java +++ b/Mage.Sets/src/mage/cards/l/LivingArmor.java @@ -27,7 +27,6 @@ */ package mage.cards.l; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; @@ -43,6 +42,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Derpthemeus @@ -68,7 +69,7 @@ public class LivingArmor extends CardImpl { return new LivingArmor(this); } - class LivingArmorEffect extends OneShotEffect { + static class LivingArmorEffect extends OneShotEffect { public LivingArmorEffect() { super(Outcome.BoostCreature); diff --git a/Mage.Sets/src/mage/cards/m/MagneticMountain.java b/Mage.Sets/src/mage/cards/m/MagneticMountain.java index cc0e8437407..f3d523b3ea9 100644 --- a/Mage.Sets/src/mage/cards/m/MagneticMountain.java +++ b/Mage.Sets/src/mage/cards/m/MagneticMountain.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.Mode; @@ -51,6 +50,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** @@ -122,7 +123,7 @@ class MagneticMountainEffect extends DoIfCostPaid { return true; } - class MagneticMountainPredicate implements ObjectPlayerPredicate> { + static class MagneticMountainPredicate implements ObjectPlayerPredicate> { @Override public boolean apply(ObjectPlayer input, Game game) { return input.getObject().isTapped(); diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheMoon.java b/Mage.Sets/src/mage/cards/m/MagusOfTheMoon.java index f253f023eae..b659af86f9e 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheMoon.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheMoon.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -36,19 +35,15 @@ import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.repository.CardRepository; -import mage.constants.CardType; -import mage.constants.DependencyType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.common.FilterLandPermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -82,7 +77,7 @@ public class MagusOfTheMoon extends CardImpl { return new MagusOfTheMoon(this); } - class MagusOfTheMoonEffect extends ContinuousEffectImpl { + static class MagusOfTheMoonEffect extends ContinuousEffectImpl { MagusOfTheMoonEffect() { super(Duration.WhileOnBattlefield, Outcome.Detriment); diff --git a/Mage.Sets/src/mage/cards/m/MinionsMurmurs.java b/Mage.Sets/src/mage/cards/m/MinionsMurmurs.java index 7dbb32eb839..9fcd547ad5d 100644 --- a/Mage.Sets/src/mage/cards/m/MinionsMurmurs.java +++ b/Mage.Sets/src/mage/cards/m/MinionsMurmurs.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; @@ -38,6 +37,8 @@ import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Derpthemeus @@ -60,7 +61,7 @@ public class MinionsMurmurs extends CardImpl { return new MinionsMurmurs(this); } - class MinionsMurmursEffect extends OneShotEffect { + static class MinionsMurmursEffect extends OneShotEffect { public MinionsMurmursEffect() { super(Outcome.DrawCard); diff --git a/Mage.Sets/src/mage/cards/m/MoltenBirth.java b/Mage.Sets/src/mage/cards/m/MoltenBirth.java index 1e91c9a2f2f..2eb11f78ed0 100644 --- a/Mage.Sets/src/mage/cards/m/MoltenBirth.java +++ b/Mage.Sets/src/mage/cards/m/MoltenBirth.java @@ -27,7 +27,6 @@ */ package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -42,6 +41,8 @@ import mage.game.permanent.token.Token; import mage.players.Player; import mage.util.RandomUtil; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -99,7 +100,7 @@ class MoltenBirthEffect extends OneShotEffect { return false; } - class ElementalToken extends Token { + static class ElementalToken extends Token { public ElementalToken() { super("Elemental", "1/1 red Elemental creature"); diff --git a/Mage.Sets/src/mage/cards/n/NecroticOoze.java b/Mage.Sets/src/mage/cards/n/NecroticOoze.java index f27bfff6cae..b9f4c4f5a3a 100644 --- a/Mage.Sets/src/mage/cards/n/NecroticOoze.java +++ b/Mage.Sets/src/mage/cards/n/NecroticOoze.java @@ -27,12 +27,6 @@ */ package mage.cards.n; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; - import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbility; @@ -43,16 +37,16 @@ import mage.abilities.effects.Effect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.cards.y.YixlidJailer; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; -import mage.cards.y.YixlidJailer; + +import java.util.List; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; /** * @@ -80,7 +74,7 @@ public class NecroticOoze extends CardImpl { return new NecroticOoze(this); } - class NecroticOozeEffect extends ContinuousEffectImpl { + static class NecroticOozeEffect extends ContinuousEffectImpl { public NecroticOozeEffect() { super(Duration.WhileOnBattlefield, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); diff --git a/Mage.Sets/src/mage/cards/n/NightDealings.java b/Mage.Sets/src/mage/cards/n/NightDealings.java index e1d7520cff0..41dcfba7e6c 100644 --- a/Mage.Sets/src/mage/cards/n/NightDealings.java +++ b/Mage.Sets/src/mage/cards/n/NightDealings.java @@ -27,8 +27,6 @@ */ package mage.cards.n; -import java.util.Objects; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; @@ -36,11 +34,7 @@ import mage.abilities.costs.Cost; import mage.abilities.costs.common.RemoveVariableCountersSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -54,6 +48,9 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCardInLibrary; +import java.util.Objects; +import java.util.UUID; + /** * * @author Loki @@ -122,7 +119,7 @@ public class NightDealings extends CardImpl { } } - private class NightDealingsEffect extends OneShotEffect { + private static class NightDealingsEffect extends OneShotEffect { public NightDealingsEffect() { super(Outcome.Damage); @@ -152,7 +149,7 @@ public class NightDealings extends CardImpl { } } - private class NightDealingsSearchEffect extends OneShotEffect { + private static class NightDealingsSearchEffect extends OneShotEffect { public NightDealingsSearchEffect() { super(Outcome.DrawCard); diff --git a/Mage.Sets/src/mage/cards/n/NoMercy.java b/Mage.Sets/src/mage/cards/n/NoMercy.java index 97dc85af7f6..e0147ace676 100644 --- a/Mage.Sets/src/mage/cards/n/NoMercy.java +++ b/Mage.Sets/src/mage/cards/n/NoMercy.java @@ -27,7 +27,6 @@ */ package mage.cards.n; -import java.util.UUID; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -41,6 +40,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author Plopman @@ -63,7 +64,7 @@ public class NoMercy extends CardImpl { return new NoMercy(this); } - public class NoMercyTriggeredAbility extends TriggeredAbilityImpl { + public static class NoMercyTriggeredAbility extends TriggeredAbilityImpl { public NoMercyTriggeredAbility() { super(Zone.BATTLEFIELD, new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/o/OjutaiMonument.java b/Mage.Sets/src/mage/cards/o/OjutaiMonument.java index 0e69587c117..26c3bd240e3 100644 --- a/Mage.Sets/src/mage/cards/o/OjutaiMonument.java +++ b/Mage.Sets/src/mage/cards/o/OjutaiMonument.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author fireshoes @@ -69,7 +70,7 @@ public class OjutaiMonument extends CardImpl { return new OjutaiMonument(this); } - private class OjutaiMonumentToken extends Token { + private static class OjutaiMonumentToken extends Token { OjutaiMonumentToken() { super("", "4/4 white and blue Dragon artifact creature with flying"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/o/OrbOfDreams.java b/Mage.Sets/src/mage/cards/o/OrbOfDreams.java index 981f0db7dce..cb84a2f4adb 100644 --- a/Mage.Sets/src/mage/cards/o/OrbOfDreams.java +++ b/Mage.Sets/src/mage/cards/o/OrbOfDreams.java @@ -27,7 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; @@ -42,6 +41,8 @@ import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -64,7 +65,7 @@ public class OrbOfDreams extends CardImpl { return new OrbOfDreams(this); } - private class OrbOfDreamsEffect extends ReplacementEffectImpl { + private static class OrbOfDreamsEffect extends ReplacementEffectImpl { OrbOfDreamsEffect() { super(Duration.WhileOnBattlefield, Outcome.Tap, false); diff --git a/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java b/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java index 80f6f0eb56d..1acf35a8305 100644 --- a/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java +++ b/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java @@ -27,10 +27,6 @@ */ package mage.cards.o; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,8 +36,13 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 @@ -68,7 +69,7 @@ public class OrzhovKeyrune extends CardImpl { return new OrzhovKeyrune(this); } - private class OrzhovKeyruneToken extends Token { + private static class OrzhovKeyruneToken extends Token { OrzhovKeyruneToken() { super("Thrull", "1/4 white and black Thrull artifact creature with lifelink"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/o/Outwit.java b/Mage.Sets/src/mage/cards/o/Outwit.java index 602835a04ce..cf140a7a4aa 100644 --- a/Mage.Sets/src/mage/cards/o/Outwit.java +++ b/Mage.Sets/src/mage/cards/o/Outwit.java @@ -27,25 +27,25 @@ */ package mage.cards.o; +import mage.abilities.Ability; +import mage.abilities.effects.common.CounterTargetEffect; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Zone; +import mage.filter.Filter; +import mage.filter.FilterSpell; +import mage.game.Game; +import mage.game.stack.Spell; +import mage.game.stack.StackObject; +import mage.players.Player; +import mage.target.Target; +import mage.target.TargetObject; + import java.util.HashSet; import java.util.Set; import java.util.UUID; -import mage.constants.CardType; -import mage.abilities.Ability; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.constants.Zone; -import mage.game.Game; -import mage.game.stack.StackObject; -import mage.abilities.effects.common.CounterTargetEffect; -import mage.filter.Filter; -import mage.filter.FilterSpell; -import mage.players.Player; -import mage.game.stack.Spell; -import mage.target.TargetObject; -import mage.target.Target; - /** @@ -74,7 +74,7 @@ public class Outwit extends CardImpl { return new Outwit(this); } - private class CustomTargetSpell extends TargetObject { + private static class CustomTargetSpell extends TargetObject { protected FilterSpell filter; diff --git a/Mage.Sets/src/mage/cards/p/ParagonOfTheAmesha.java b/Mage.Sets/src/mage/cards/p/ParagonOfTheAmesha.java index 4246a27e377..fbb28302229 100644 --- a/Mage.Sets/src/mage/cards/p/ParagonOfTheAmesha.java +++ b/Mage.Sets/src/mage/cards/p/ParagonOfTheAmesha.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -41,15 +40,12 @@ import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -91,7 +87,7 @@ public class ParagonOfTheAmesha extends CardImpl { return new ParagonOfTheAmesha(this); } - private class ParagonOfTheAmeshaEffect extends ContinuousEffectImpl { + private static class ParagonOfTheAmeshaEffect extends ContinuousEffectImpl { public ParagonOfTheAmeshaEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); diff --git a/Mage.Sets/src/mage/cards/p/Pariah.java b/Mage.Sets/src/mage/cards/p/Pariah.java index b9d830e2161..6d56971dac2 100644 --- a/Mage.Sets/src/mage/cards/p/Pariah.java +++ b/Mage.Sets/src/mage/cards/p/Pariah.java @@ -27,18 +27,17 @@ */ package mage.cards.p; -import java.util.UUID; import mage.abilities.Ability; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.EnchantAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.DamagePlayerEvent; import mage.game.events.GameEvent; @@ -46,6 +45,8 @@ import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author Backfir3 @@ -75,7 +76,7 @@ public class Pariah extends CardImpl { return new Pariah(this); } - class PariahEffect extends ReplacementEffectImpl { + static class PariahEffect extends ReplacementEffectImpl { PariahEffect() { super(Duration.WhileOnBattlefield, Outcome.RedirectDamage); staticText = "All damage that would be dealt to you is dealt to enchanted creature instead"; diff --git a/Mage.Sets/src/mage/cards/p/PhantomWings.java b/Mage.Sets/src/mage/cards/p/PhantomWings.java index 7c36a41b230..4b374f89cf4 100644 --- a/Mage.Sets/src/mage/cards/p/PhantomWings.java +++ b/Mage.Sets/src/mage/cards/p/PhantomWings.java @@ -27,10 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -43,12 +39,16 @@ import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AttachmentType; +import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -82,7 +82,7 @@ public class PhantomWings extends CardImpl { return new PhantomWings(this); } - private class PhantomWingsReturnEffect extends OneShotEffect { + private static class PhantomWingsReturnEffect extends OneShotEffect { public PhantomWingsReturnEffect() { super(Outcome.ReturnToHand); diff --git a/Mage.Sets/src/mage/cards/p/PhylacteryLich.java b/Mage.Sets/src/mage/cards/p/PhylacteryLich.java index e3de400aa76..b28ab699889 100644 --- a/Mage.Sets/src/mage/cards/p/PhylacteryLich.java +++ b/Mage.Sets/src/mage/cards/p/PhylacteryLich.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.StateTriggeredAbility; @@ -49,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledPermanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com @@ -81,7 +82,7 @@ public class PhylacteryLich extends CardImpl { return new PhylacteryLich(this); } - class PhylacteryLichAbility extends StateTriggeredAbility { + static class PhylacteryLichAbility extends StateTriggeredAbility { public PhylacteryLichAbility() { super(Zone.BATTLEFIELD, new SacrificeSourceEffect()); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java b/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java index 6aca9ef9680..cc2981f8578 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianTotem.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleActivatedAbility; @@ -49,6 +48,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author FenrisulfrX @@ -76,7 +77,7 @@ public class PhyrexianTotem extends CardImpl { return new PhyrexianTotem(this); } - private class PhyrexianTotemToken extends Token { + private static class PhyrexianTotemToken extends Token { PhyrexianTotemToken() { super("Horror", "5/5 black Horror artifact creature with trample"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/p/PlanarCollapse.java b/Mage.Sets/src/mage/cards/p/PlanarCollapse.java index 67d360bf5ad..e4d31d9fe25 100644 --- a/Mage.Sets/src/mage/cards/p/PlanarCollapse.java +++ b/Mage.Sets/src/mage/cards/p/PlanarCollapse.java @@ -27,10 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -39,10 +35,14 @@ import mage.abilities.effects.common.DestroyAllEffect; import mage.abilities.effects.common.SacrificeSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; +import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; +import java.util.UUID; + /** * * @author Plopman @@ -70,7 +70,7 @@ public class PlanarCollapse extends CardImpl { return new PlanarCollapse(this); } - class PlanarCollapseCondition implements mage.abilities.condition.Condition { + static class PlanarCollapseCondition implements mage.abilities.condition.Condition { @Override public boolean apply(Game game, Ability source) { diff --git a/Mage.Sets/src/mage/cards/p/PlatinumAngel.java b/Mage.Sets/src/mage/cards/p/PlatinumAngel.java index 48f125d80a0..6330c520c9a 100644 --- a/Mage.Sets/src/mage/cards/p/PlatinumAngel.java +++ b/Mage.Sets/src/mage/cards/p/PlatinumAngel.java @@ -28,11 +28,6 @@ package mage.cards.p; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -40,10 +35,16 @@ import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com @@ -69,7 +70,7 @@ public class PlatinumAngel extends CardImpl { return new PlatinumAngel(this); } - class PlatinumAngelEffect extends ContinuousRuleModifyingEffectImpl { + static class PlatinumAngelEffect extends ContinuousRuleModifyingEffectImpl { public PlatinumAngelEffect() { super(Duration.WhileOnBattlefield, Outcome.Benefit, false, false); diff --git a/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java b/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java index 91db4b1cae5..eab699fe57a 100644 --- a/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java +++ b/Mage.Sets/src/mage/cards/p/PrideOfTheClouds.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,10 +41,12 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; -import mage.game.permanent.token.Token; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.permanent.AnotherPredicate; +import mage.game.permanent.token.Token; + +import java.util.UUID; /** * * @author fireshoes @@ -86,7 +87,7 @@ public class PrideOfTheClouds extends CardImpl { return new PrideOfTheClouds(this); } - private class BirdToken extends Token { + private static class BirdToken extends Token { public BirdToken() { super("Bird", "1/1 white and blue Bird creature token with flying"); diff --git a/Mage.Sets/src/mage/cards/p/PrimalClay.java b/Mage.Sets/src/mage/cards/p/PrimalClay.java index 41ab6ea2943..c5ea3586061 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalClay.java +++ b/Mage.Sets/src/mage/cards/p/PrimalClay.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -50,6 +49,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author Loki @@ -76,7 +77,7 @@ public class PrimalClay extends CardImpl { return new PrimalClay(this); } - class PrimalPlasmaReplacementEffect extends ReplacementEffectImpl { + static class PrimalPlasmaReplacementEffect extends ReplacementEffectImpl { private static final String choice33 = "a 3/3 artifact creature"; private static final String choice22 = "a 2/2 artifact creature with flying"; diff --git a/Mage.Sets/src/mage/cards/p/PrimalPlasma.java b/Mage.Sets/src/mage/cards/p/PrimalPlasma.java index a2b3642baa1..b17cb0cd28a 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalPlasma.java +++ b/Mage.Sets/src/mage/cards/p/PrimalPlasma.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -50,6 +49,8 @@ import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author LevelX2 @@ -77,7 +78,7 @@ public class PrimalPlasma extends CardImpl { return new PrimalPlasma(this); } - class PrimalPlasmaReplacementEffect extends ReplacementEffectImpl { + static class PrimalPlasmaReplacementEffect extends ReplacementEffectImpl { private static final String choice33 = "a 3/3 creature"; private static final String choice22 = "a 2/2 creature with flying"; diff --git a/Mage.Sets/src/mage/cards/p/ProteanHydra.java b/Mage.Sets/src/mage/cards/p/ProteanHydra.java index ceada0c831a..c03899b66a9 100644 --- a/Mage.Sets/src/mage/cards/p/ProteanHydra.java +++ b/Mage.Sets/src/mage/cards/p/ProteanHydra.java @@ -27,7 +27,6 @@ */ package mage.cards.p; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -49,6 +48,8 @@ import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com @@ -82,7 +83,7 @@ public class ProteanHydra extends CardImpl { return new ProteanHydra(this); } - class ProteanHydraEffect2 extends PreventionEffectImpl { + static class ProteanHydraEffect2 extends PreventionEffectImpl { public ProteanHydraEffect2() { super(Duration.WhileOnBattlefield, Integer.MAX_VALUE, false, false); @@ -161,7 +162,7 @@ public class ProteanHydra extends CardImpl { } - class ProteanHydraDelayedTriggeredAbility extends DelayedTriggeredAbility { + static class ProteanHydraDelayedTriggeredAbility extends DelayedTriggeredAbility { public ProteanHydraDelayedTriggeredAbility() { super(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2))); diff --git a/Mage.Sets/src/mage/cards/q/QuillmaneBaku.java b/Mage.Sets/src/mage/cards/q/QuillmaneBaku.java index c1e8363a301..349fe60d53f 100644 --- a/Mage.Sets/src/mage/cards/q/QuillmaneBaku.java +++ b/Mage.Sets/src/mage/cards/q/QuillmaneBaku.java @@ -27,7 +27,6 @@ */ package mage.cards.q; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -53,6 +52,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author LevelX2 */ @@ -107,7 +108,7 @@ public class QuillmaneBaku extends CardImpl { return new QuillmaneBaku(this); } - class QuillmaneBakuReturnEffect extends OneShotEffect { + static class QuillmaneBakuReturnEffect extends OneShotEffect { public QuillmaneBakuReturnEffect() { super(Outcome.ReturnToHand); diff --git a/Mage.Sets/src/mage/cards/r/RainbowVale.java b/Mage.Sets/src/mage/cards/r/RainbowVale.java index 80771d765f7..d86f08f0aea 100644 --- a/Mage.Sets/src/mage/cards/r/RainbowVale.java +++ b/Mage.Sets/src/mage/cards/r/RainbowVale.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -35,17 +34,15 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.mana.AnyColorManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.Target; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author andyfries @@ -70,7 +67,7 @@ public class RainbowVale extends CardImpl { return new RainbowVale(this); } - class RainbowValeEffect extends OneShotEffect { + static class RainbowValeEffect extends OneShotEffect { public RainbowValeEffect() { super(Outcome.PutManaInPool); diff --git a/Mage.Sets/src/mage/cards/r/RakdosCharm.java b/Mage.Sets/src/mage/cards/r/RakdosCharm.java index 8add96e2b8d..0df8a765354 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosCharm.java +++ b/Mage.Sets/src/mage/cards/r/RakdosCharm.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; @@ -45,6 +44,8 @@ import mage.players.Player; import mage.target.TargetPlayer; import mage.target.common.TargetArtifactPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -79,7 +80,7 @@ public class RakdosCharm extends CardImpl { return new RakdosCharm(this); } - private class RakdosCharmDamageEffect extends OneShotEffect { + private static class RakdosCharmDamageEffect extends OneShotEffect { public RakdosCharmDamageEffect() { super(Outcome.Detriment); diff --git a/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java b/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java index 0fa13b8bca8..c00908b7475 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java +++ b/Mage.Sets/src/mage/cards/r/RakdosKeyrune.java @@ -27,9 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -39,10 +36,13 @@ import mage.abilities.mana.BlackManaAbility; import mage.abilities.mana.RedManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * @author LevelX2 */ @@ -68,7 +68,7 @@ public class RakdosKeyrune extends CardImpl { return new RakdosKeyrune(this); } - private class RakdosKeyruneToken extends Token { + private static class RakdosKeyruneToken extends Token { RakdosKeyruneToken() { super("", "3/1 black and red Devil artifact creature with first strike"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/r/RavenFamiliar.java b/Mage.Sets/src/mage/cards/r/RavenFamiliar.java index 83406f78bb3..5d640b2a508 100644 --- a/Mage.Sets/src/mage/cards/r/RavenFamiliar.java +++ b/Mage.Sets/src/mage/cards/r/RavenFamiliar.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -36,11 +35,7 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.abilities.keyword.EchoAbility; import mage.abilities.keyword.FlyingAbility; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -49,6 +44,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; +import java.util.UUID; + /** * * @author Plopman @@ -82,7 +79,7 @@ public class RavenFamiliar extends CardImpl { } - class RavenFamiliarEffect extends OneShotEffect { + static class RavenFamiliarEffect extends OneShotEffect { public RavenFamiliarEffect() { super(Outcome.DrawCard); diff --git a/Mage.Sets/src/mage/cards/r/RelentlessRats.java b/Mage.Sets/src/mage/cards/r/RelentlessRats.java index 115c5bdca56..78014147d0c 100644 --- a/Mage.Sets/src/mage/cards/r/RelentlessRats.java +++ b/Mage.Sets/src/mage/cards/r/RelentlessRats.java @@ -28,13 +28,6 @@ package mage.cards.r; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -42,11 +35,14 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.InfoEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.NamePredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com @@ -82,7 +78,7 @@ public class RelentlessRats extends CardImpl { return new RelentlessRats(this); } - class RelentlessRatsEffect extends ContinuousEffectImpl { + static class RelentlessRatsEffect extends ContinuousEffectImpl { public RelentlessRatsEffect() { super(Duration.WhileOnBattlefield, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature); diff --git a/Mage.Sets/src/mage/cards/r/RockHydra.java b/Mage.Sets/src/mage/cards/r/RockHydra.java index b7c06ef61a2..5a6bc6e7fae 100644 --- a/Mage.Sets/src/mage/cards/r/RockHydra.java +++ b/Mage.Sets/src/mage/cards/r/RockHydra.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -51,6 +50,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author anonymous @@ -83,7 +84,7 @@ public class RockHydra extends CardImpl { return new RockHydra(this); } - class RockHydraEffect extends PreventionEffectImpl { + static class RockHydraEffect extends PreventionEffectImpl { public RockHydraEffect() { super(Duration.WhileOnBattlefield, Integer.MAX_VALUE, false, false); diff --git a/Mage.Sets/src/mage/cards/r/RoninWarclub.java b/Mage.Sets/src/mage/cards/r/RoninWarclub.java index a6684af41e4..a7ac27d2599 100644 --- a/Mage.Sets/src/mage/cards/r/RoninWarclub.java +++ b/Mage.Sets/src/mage/cards/r/RoninWarclub.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; @@ -47,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.target.Target; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -120,7 +121,7 @@ public class RoninWarclub extends CardImpl { } } - private class RoninWarclubAttachEffect extends OneShotEffect { + private static class RoninWarclubAttachEffect extends OneShotEffect { public RoninWarclubAttachEffect() { super(Outcome.BoostCreature); diff --git a/Mage.Sets/src/mage/cards/r/RootGreevil.java b/Mage.Sets/src/mage/cards/r/RootGreevil.java index f55bc585d72..365ef300dc5 100644 --- a/Mage.Sets/src/mage/cards/r/RootGreevil.java +++ b/Mage.Sets/src/mage/cards/r/RootGreevil.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -47,6 +46,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; +import java.util.UUID; + /** * * @author Derpthemeus @@ -75,7 +76,7 @@ public class RootGreevil extends CardImpl { return new RootGreevil(this); } - class RootGreevilEffect extends OneShotEffect { + static class RootGreevilEffect extends OneShotEffect { public RootGreevilEffect() { super(Outcome.DestroyPermanent); diff --git a/Mage.Sets/src/mage/cards/r/RootingKavu.java b/Mage.Sets/src/mage/cards/r/RootingKavu.java index 579ec1f2b5e..3cc714cac37 100644 --- a/Mage.Sets/src/mage/cards/r/RootingKavu.java +++ b/Mage.Sets/src/mage/cards/r/RootingKavu.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; @@ -44,6 +43,8 @@ import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author Derpthemeus @@ -69,7 +70,7 @@ public class RootingKavu extends CardImpl { return new RootingKavu(this); } - class RootingKavuEffect extends OneShotEffect { + static class RootingKavuEffect extends OneShotEffect { public RootingKavuEffect() { super(Outcome.Benefit); diff --git a/Mage.Sets/src/mage/cards/r/Rumination.java b/Mage.Sets/src/mage/cards/r/Rumination.java index 1501f15b8ca..2852708a4af 100644 --- a/Mage.Sets/src/mage/cards/r/Rumination.java +++ b/Mage.Sets/src/mage/cards/r/Rumination.java @@ -27,7 +27,6 @@ */ package mage.cards.r; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; @@ -40,6 +39,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author Styxo @@ -62,7 +63,7 @@ public class Rumination extends CardImpl { return new Rumination(this); } - class RuminationEffect extends OneShotEffect { + static class RuminationEffect extends OneShotEffect { public RuminationEffect() { super(Outcome.DrawCard); diff --git a/Mage.Sets/src/mage/cards/s/ScarredPuma.java b/Mage.Sets/src/mage/cards/s/ScarredPuma.java index 05091edd449..c6ad79f70f2 100644 --- a/Mage.Sets/src/mage/cards/s/ScarredPuma.java +++ b/Mage.Sets/src/mage/cards/s/ScarredPuma.java @@ -27,8 +27,6 @@ */ package mage.cards.s; -import java.util.Objects; -import java.util.UUID; import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; @@ -43,6 +41,9 @@ import mage.filter.common.FilterAttackingCreature; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.Objects; +import java.util.UUID; + /** * * @author Derpthemeus @@ -68,7 +69,7 @@ public class ScarredPuma extends CardImpl { return new ScarredPuma(this); } - class ScarredPumaEffect extends RestrictionEffect { + static class ScarredPumaEffect extends RestrictionEffect { private final FilterAttackingCreature filter = new FilterAttackingCreature(); diff --git a/Mage.Sets/src/mage/cards/s/SecondChance.java b/Mage.Sets/src/mage/cards/s/SecondChance.java index f5038a8b8ff..b69916d76eb 100644 --- a/Mage.Sets/src/mage/cards/s/SecondChance.java +++ b/Mage.Sets/src/mage/cards/s/SecondChance.java @@ -27,10 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -40,9 +36,13 @@ import mage.abilities.effects.common.SacrificeSourceEffect; import mage.abilities.effects.common.turn.AddExtraTurnControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.TargetController; +import mage.constants.Zone; import mage.game.Game; +import java.util.UUID; + /** * * @author Plopman @@ -69,7 +69,7 @@ public class SecondChance extends CardImpl { return new SecondChance(this); } - class FiveOrLessLifeCondition implements Condition { + static class FiveOrLessLifeCondition implements Condition { @Override public boolean apply(Game game, Ability source) { diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java b/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java index e254a88fcdb..cf83b24b45b 100644 --- a/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java +++ b/Mage.Sets/src/mage/cards/s/SelesnyaKeyrune.java @@ -27,9 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; - -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -38,10 +35,13 @@ import mage.abilities.mana.GreenManaAbility; import mage.abilities.mana.WhiteManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * @author LevelX2 */ @@ -67,7 +67,7 @@ public class SelesnyaKeyrune extends CardImpl { return new SelesnyaKeyrune(this); } - private class SelesnyaKeyruneToken extends Token { + private static class SelesnyaKeyruneToken extends Token { SelesnyaKeyruneToken() { super("", "3/3 green and white Wolf artifact creature"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/s/ShapeAnew.java b/Mage.Sets/src/mage/cards/s/ShapeAnew.java index d1c19d9a195..f80cda39ca2 100644 --- a/Mage.Sets/src/mage/cards/s/ShapeAnew.java +++ b/Mage.Sets/src/mage/cards/s/ShapeAnew.java @@ -27,15 +27,10 @@ */ package mage.cards.s; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.SacrificeTargetEffect; -import mage.cards.Card; -import mage.cards.CardImpl; -import mage.cards.CardSetInfo; -import mage.cards.Cards; -import mage.cards.CardsImpl; +import mage.cards.*; import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.Zone; @@ -46,6 +41,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author ayratn @@ -78,7 +75,7 @@ public class ShapeAnew extends CardImpl { return new ShapeAnew(this); } - private class ShapeAnewEffect extends OneShotEffect { + private static class ShapeAnewEffect extends OneShotEffect { public ShapeAnewEffect() { super(Outcome.PutCardInPlay); diff --git a/Mage.Sets/src/mage/cards/s/ShapeshiftersMarrow.java b/Mage.Sets/src/mage/cards/s/ShapeshiftersMarrow.java index 22515aa1fb8..11c7556f1db 100644 --- a/Mage.Sets/src/mage/cards/s/ShapeshiftersMarrow.java +++ b/Mage.Sets/src/mage/cards/s/ShapeshiftersMarrow.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -37,14 +36,12 @@ import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.TargetController; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * author HCrescent @@ -67,7 +64,7 @@ public class ShapeshiftersMarrow extends CardImpl { return new ShapeshiftersMarrow(this); } - class ShapeshiftersMarrowEffect extends OneShotEffect { + static class ShapeshiftersMarrowEffect extends OneShotEffect { public ShapeshiftersMarrowEffect() { super(Outcome.BecomeCreature); diff --git a/Mage.Sets/src/mage/cards/s/SiegeModification.java b/Mage.Sets/src/mage/cards/s/SiegeModification.java index db9bf8cb71b..df945c792ac 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeModification.java +++ b/Mage.Sets/src/mage/cards/s/SiegeModification.java @@ -95,7 +95,7 @@ public class SiegeModification extends CardImpl { return new SiegeModification(this); } - private class BecomesCreatureIfVehicleEffect extends ContinuousEffectImpl { + private static class BecomesCreatureIfVehicleEffect extends ContinuousEffectImpl { private CardType addedType = CardType.CREATURE; diff --git a/Mage.Sets/src/mage/cards/s/SilumgarMonument.java b/Mage.Sets/src/mage/cards/s/SilumgarMonument.java index 98b96298f06..ded32dbdc1a 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarMonument.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarMonument.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author fireshoes @@ -69,7 +70,7 @@ public class SilumgarMonument extends CardImpl { return new SilumgarMonument(this); } -private class OjutaiMonumentToken extends Token { +private static class OjutaiMonumentToken extends Token { OjutaiMonumentToken() { super("", "4/4 blue and black Dragon artifact creature with flying"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/s/SimicKeyrune.java b/Mage.Sets/src/mage/cards/s/SimicKeyrune.java index db23af8f3c1..b8444817ec7 100644 --- a/Mage.Sets/src/mage/cards/s/SimicKeyrune.java +++ b/Mage.Sets/src/mage/cards/s/SimicKeyrune.java @@ -27,10 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -40,8 +36,13 @@ import mage.abilities.mana.BlueManaAbility; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 @@ -68,7 +69,7 @@ public class SimicKeyrune extends CardImpl { return new SimicKeyrune(this); } - private class SimicKeyruneToken extends Token { + private static class SimicKeyruneToken extends Token { SimicKeyruneToken() { super("Crab", "2/3 green and blue Crab artifact creature with hexproof"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/s/SithLord.java b/Mage.Sets/src/mage/cards/s/SithLord.java index ad00c69e3f3..cdffe94fe87 100644 --- a/Mage.Sets/src/mage/cards/s/SithLord.java +++ b/Mage.Sets/src/mage/cards/s/SithLord.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldAbility; @@ -42,6 +41,8 @@ import mage.counters.CounterType; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Styxo @@ -73,7 +74,7 @@ public class SithLord extends CardImpl { return new SithLord(this); } - class SithLordEffect extends OneShotEffect { + static class SithLordEffect extends OneShotEffect { SithLordEffect() { super(Outcome.BoostCreature); diff --git a/Mage.Sets/src/mage/cards/s/SithRavager.java b/Mage.Sets/src/mage/cards/s/SithRavager.java index 990d60658e5..9bfa8927b48 100644 --- a/Mage.Sets/src/mage/cards/s/SithRavager.java +++ b/Mage.Sets/src/mage/cards/s/SithRavager.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -42,6 +41,8 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; +import java.util.UUID; + /** * * @author Styxo @@ -68,7 +69,7 @@ public class SithRavager extends CardImpl { return new SithRavager(this); } - public class LostNonCombatLifeTriggeredAbility extends TriggeredAbilityImpl { + public static class LostNonCombatLifeTriggeredAbility extends TriggeredAbilityImpl { public LostNonCombatLifeTriggeredAbility() { super(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), false); diff --git a/Mage.Sets/src/mage/cards/s/SithRuins.java b/Mage.Sets/src/mage/cards/s/SithRuins.java index 8c633009e7b..62eb95363be 100644 --- a/Mage.Sets/src/mage/cards/s/SithRuins.java +++ b/Mage.Sets/src/mage/cards/s/SithRuins.java @@ -27,8 +27,6 @@ */ package mage.cards.s; -import java.util.ArrayList; -import java.util.UUID; import mage.MageObject; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.SacrificeSourceCost; @@ -48,6 +46,9 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.ArrayList; +import java.util.UUID; + /** * * @author Styxo @@ -74,7 +75,7 @@ public class SithRuins extends CardImpl { return new SithRuins(this); } - public class SithRuinsAbility extends ActivatedAbilityImpl { + public static class SithRuinsAbility extends ActivatedAbilityImpl { public SithRuinsAbility(SithRuinsAbility ability) { super(ability); diff --git a/Mage.Sets/src/mage/cards/s/SkullRend.java b/Mage.Sets/src/mage/cards/s/SkullRend.java index 21b297aa098..956a8455ca3 100644 --- a/Mage.Sets/src/mage/cards/s/SkullRend.java +++ b/Mage.Sets/src/mage/cards/s/SkullRend.java @@ -27,19 +27,19 @@ */ package mage.cards.s; -import java.util.Objects; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; +import java.util.Objects; +import java.util.UUID; + /** * * @author LevelX2 @@ -64,7 +64,7 @@ public class SkullRend extends CardImpl { return new SkullRend(this); } - private class SkullRendEffect extends OneShotEffect { + private static class SkullRendEffect extends OneShotEffect { public SkullRendEffect() { super(Outcome.Damage); diff --git a/Mage.Sets/src/mage/cards/s/SkullmaneBaku.java b/Mage.Sets/src/mage/cards/s/SkullmaneBaku.java index e1bec632475..e63bf5ad5e3 100644 --- a/Mage.Sets/src/mage/cards/s/SkullmaneBaku.java +++ b/Mage.Sets/src/mage/cards/s/SkullmaneBaku.java @@ -28,10 +28,6 @@ package mage.cards.s; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Zone; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; @@ -46,14 +42,18 @@ import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; +import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.common.FilterSpiritOrArcaneCard; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * @author LevelX2 */ @@ -88,7 +88,7 @@ public class SkullmaneBaku extends CardImpl { return new SkullmaneBaku(this); } - class SkullmaneBakuUnboostEffect extends OneShotEffect { + static class SkullmaneBakuUnboostEffect extends OneShotEffect { public SkullmaneBakuUnboostEffect() { super(Outcome.UnboostCreature); diff --git a/Mage.Sets/src/mage/cards/s/SlumberingTora.java b/Mage.Sets/src/mage/cards/s/SlumberingTora.java index 5cfbe12df71..c28b823d00e 100644 --- a/Mage.Sets/src/mage/cards/s/SlumberingTora.java +++ b/Mage.Sets/src/mage/cards/s/SlumberingTora.java @@ -27,9 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; - -import mage.constants.*; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.Cost; @@ -38,6 +35,7 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; @@ -45,6 +43,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCardInHand; +import java.util.UUID; + /** * * @author LevelX2 @@ -75,7 +75,7 @@ public class SlumberingTora extends CardImpl { return new SlumberingTora(this); } - private class SlumberingToraEffect extends ContinuousEffectImpl { + private static class SlumberingToraEffect extends ContinuousEffectImpl { public SlumberingToraEffect() { super(Duration.EndOfTurn, Outcome.BecomeCreature); diff --git a/Mage.Sets/src/mage/cards/s/SoulbrightFlamekin.java b/Mage.Sets/src/mage/cards/s/SoulbrightFlamekin.java index ac19daf9d83..b2c3ae27dc4 100644 --- a/Mage.Sets/src/mage/cards/s/SoulbrightFlamekin.java +++ b/Mage.Sets/src/mage/cards/s/SoulbrightFlamekin.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.MageInt; import mage.Mana; import mage.abilities.Ability; @@ -47,6 +46,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -79,7 +80,7 @@ public class SoulbrightFlamekin extends CardImpl { class SoulbrightFlamekinEffect extends OneShotEffect { - class ActivationInfo { + static class ActivationInfo { public int zoneChangeCounter; public int turn; public int activations; diff --git a/Mage.Sets/src/mage/cards/s/SoulsMajesty.java b/Mage.Sets/src/mage/cards/s/SoulsMajesty.java index 91708e64c8b..4ff1f85f4b5 100644 --- a/Mage.Sets/src/mage/cards/s/SoulsMajesty.java +++ b/Mage.Sets/src/mage/cards/s/SoulsMajesty.java @@ -28,18 +28,19 @@ package mage.cards.s; -import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.common.TargetControlledCreaturePermanent; +import java.util.UUID; + /** * * @author Loki @@ -62,7 +63,7 @@ public class SoulsMajesty extends CardImpl { return new SoulsMajesty(this); } - private class SoulsMajestyEffect extends OneShotEffect { + private static class SoulsMajestyEffect extends OneShotEffect { public SoulsMajestyEffect() { super(Outcome.DrawCard); diff --git a/Mage.Sets/src/mage/cards/s/SpoilsOfEvil.java b/Mage.Sets/src/mage/cards/s/SpoilsOfEvil.java index 718821c88ad..6baf7fdcbdd 100644 --- a/Mage.Sets/src/mage/cards/s/SpoilsOfEvil.java +++ b/Mage.Sets/src/mage/cards/s/SpoilsOfEvil.java @@ -27,7 +27,6 @@ */ package mage.cards.s; -import java.util.UUID; import mage.Mana; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; @@ -42,6 +41,8 @@ import mage.game.Game; import mage.players.Player; import mage.target.common.TargetOpponent; +import java.util.UUID; + /** * * @author Blinke @@ -71,7 +72,7 @@ public class SpoilsOfEvil extends CardImpl { return new SpoilsOfEvil(this); } - class SpoilsOfEvilEffect extends OneShotEffect { + static class SpoilsOfEvilEffect extends OneShotEffect { public SpoilsOfEvilEffect() { super(Outcome.GainLife); diff --git a/Mage.Sets/src/mage/cards/s/Subversion.java b/Mage.Sets/src/mage/cards/s/Subversion.java index ae9421cc92d..dda0aa2e376 100644 --- a/Mage.Sets/src/mage/cards/s/Subversion.java +++ b/Mage.Sets/src/mage/cards/s/Subversion.java @@ -27,18 +27,18 @@ */ package mage.cards.s; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.constants.TargetController; import mage.game.Game; +import java.util.UUID; + /** * * @author Plopman @@ -63,7 +63,7 @@ public class Subversion extends CardImpl { } - class SubversionEffect extends OneShotEffect { + static class SubversionEffect extends OneShotEffect { public SubversionEffect() { super(Outcome.Damage); diff --git a/Mage.Sets/src/mage/cards/t/TerashisGrasp.java b/Mage.Sets/src/mage/cards/t/TerashisGrasp.java index 058b5fefb23..f702addaece 100644 --- a/Mage.Sets/src/mage/cards/t/TerashisGrasp.java +++ b/Mage.Sets/src/mage/cards/t/TerashisGrasp.java @@ -27,13 +27,12 @@ */ package mage.cards.t; -import java.util.UUID; -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DestroyTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.constants.Outcome; import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.game.Game; @@ -41,6 +40,8 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -67,7 +68,7 @@ public class TerashisGrasp extends CardImpl { return new TerashisGrasp(this); } - private class TerashisGraspEffect extends OneShotEffect { + private static class TerashisGraspEffect extends OneShotEffect { public TerashisGraspEffect() { super(Outcome.DestroyPermanent); diff --git a/Mage.Sets/src/mage/cards/t/ThunderTotem.java b/Mage.Sets/src/mage/cards/t/ThunderTotem.java index 0ec5d29577c..e3de3e64312 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderTotem.java +++ b/Mage.Sets/src/mage/cards/t/ThunderTotem.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; @@ -42,6 +41,8 @@ import mage.constants.Duration; import mage.constants.Zone; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author fireshoes @@ -57,7 +58,7 @@ public class ThunderTotem extends CardImpl { // {1}{W}{W}: Thunder Totem becomes a 2/2 white Spirit artifact creature with flying and first strike until end of turn. this.addAbility(new SimpleActivatedAbility( Zone.BATTLEFIELD, - new BecomesCreatureSourceEffect(new ThunderTotemToken(), "", Duration.EndOfTurn), + new BecomesCreatureSourceEffect(new ThunderTotemToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{1}{W}{W}"))); } @@ -70,7 +71,7 @@ public class ThunderTotem extends CardImpl { return new ThunderTotem(this); } -private class ThunderTotemToken extends Token { +private static class ThunderTotemToken extends Token { ThunderTotemToken() { super("", "2/2 white Spirit artifact creature with flying and first strike"); cardType.add(CardType.ARTIFACT); diff --git a/Mage.Sets/src/mage/cards/t/TimberpackWolf.java b/Mage.Sets/src/mage/cards/t/TimberpackWolf.java index a8f7ca7e8c7..3ce09b80538 100644 --- a/Mage.Sets/src/mage/cards/t/TimberpackWolf.java +++ b/Mage.Sets/src/mage/cards/t/TimberpackWolf.java @@ -27,8 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; - import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -42,6 +40,8 @@ import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -76,7 +76,7 @@ public class TimberpackWolf extends CardImpl { } - class TimberpackWolfEffect extends ContinuousEffectImpl { + static class TimberpackWolfEffect extends ContinuousEffectImpl { public TimberpackWolfEffect() { super(Duration.WhileOnBattlefield, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature); diff --git a/Mage.Sets/src/mage/cards/t/ToilsOfNightAndDay.java b/Mage.Sets/src/mage/cards/t/ToilsOfNightAndDay.java index 5ce5b0c0a05..a0d118e442f 100644 --- a/Mage.Sets/src/mage/cards/t/ToilsOfNightAndDay.java +++ b/Mage.Sets/src/mage/cards/t/ToilsOfNightAndDay.java @@ -27,20 +27,20 @@ */ package mage.cards.t; -import java.util.UUID; - -import mage.constants.CardType; -import mage.constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; import mage.filter.FilterPermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; import mage.target.TargetPermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -66,7 +66,7 @@ public class ToilsOfNightAndDay extends CardImpl { } - private class ToilsOfNightAndDayEffect extends OneShotEffect { + private static class ToilsOfNightAndDayEffect extends OneShotEffect { public ToilsOfNightAndDayEffect() { super(Outcome.Tap); diff --git a/Mage.Sets/src/mage/cards/t/TurnBurn.java b/Mage.Sets/src/mage/cards/t/TurnBurn.java index cbee3c51119..11eb1690de1 100644 --- a/Mage.Sets/src/mage/cards/t/TurnBurn.java +++ b/Mage.Sets/src/mage/cards/t/TurnBurn.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -40,6 +39,8 @@ import mage.game.permanent.token.Token; import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -74,7 +75,7 @@ public class TurnBurn extends SplitCard { return new TurnBurn(this); } - private class WeirdToken extends Token { + private static class WeirdToken extends Token { private WeirdToken() { super("Weird", "a red Weird with base power and toughness 0/1"); diff --git a/Mage.Sets/src/mage/cards/u/UncheckedGrowth.java b/Mage.Sets/src/mage/cards/u/UncheckedGrowth.java index 2ff61e4e76d..734281f09e7 100644 --- a/Mage.Sets/src/mage/cards/u/UncheckedGrowth.java +++ b/Mage.Sets/src/mage/cards/u/UncheckedGrowth.java @@ -27,23 +27,19 @@ */ package mage.cards.u; -import java.util.UUID; - -import mage.constants.CardType; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; +import mage.constants.*; import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; +import java.util.UUID; + /** * * @author LevelX2 @@ -71,7 +67,7 @@ public class UncheckedGrowth extends CardImpl { return new UncheckedGrowth(this); } - private class UncheckedGrowthTrampleEffect extends ContinuousEffectImpl { + private static class UncheckedGrowthTrampleEffect extends ContinuousEffectImpl { public UncheckedGrowthTrampleEffect() { super(Duration.EndOfTurn, Layer.AbilityAddingRemovingEffects_6, SubLayer.NA, Outcome.AddAbility); diff --git a/Mage.Sets/src/mage/cards/u/UnderworldSlums.java b/Mage.Sets/src/mage/cards/u/UnderworldSlums.java index 7a62a007c2f..163c81824f5 100644 --- a/Mage.Sets/src/mage/cards/u/UnderworldSlums.java +++ b/Mage.Sets/src/mage/cards/u/UnderworldSlums.java @@ -27,8 +27,6 @@ */ package mage.cards.u; -import java.util.ArrayList; -import java.util.UUID; import mage.MageObject; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.costs.common.SacrificeSourceCost; @@ -48,6 +46,9 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.mageobject.SupertypePredicate; import mage.target.common.TargetCardInLibrary; +import java.util.ArrayList; +import java.util.UUID; + /** * * @author Styxo @@ -74,7 +75,7 @@ public class UnderworldSlums extends CardImpl { return new UnderworldSlums(this); } - public class UnderworldSlumsAbility extends ActivatedAbilityImpl { + public static class UnderworldSlumsAbility extends ActivatedAbilityImpl { public UnderworldSlumsAbility(UnderworldSlumsAbility ability) { super(ability); diff --git a/Mage.Sets/src/mage/cards/u/UtvaraHellkite.java b/Mage.Sets/src/mage/cards/u/UtvaraHellkite.java index 86548de8edc..b4cd68ac921 100644 --- a/Mage.Sets/src/mage/cards/u/UtvaraHellkite.java +++ b/Mage.Sets/src/mage/cards/u/UtvaraHellkite.java @@ -27,18 +27,19 @@ */ package mage.cards.u; -import java.util.UUID; -import mage.constants.CardType; import mage.MageInt; import mage.abilities.common.AttacksCreatureYouControlTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.constants.CardType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.permanent.token.Token; +import java.util.UUID; + /** * * @author LevelX2 @@ -72,7 +73,7 @@ public class UtvaraHellkite extends CardImpl { public UtvaraHellkite copy() { return new UtvaraHellkite(this); } - public class UtvaraHellkiteDragonToken extends Token { + public static class UtvaraHellkiteDragonToken extends Token { private UtvaraHellkiteDragonToken() { super("Dragon", "6/6 red Dragon creature token with flying"); diff --git a/Mage.Sets/src/mage/cards/v/VolitionReins.java b/Mage.Sets/src/mage/cards/v/VolitionReins.java index c71e59cffcb..67c88f35006 100644 --- a/Mage.Sets/src/mage/cards/v/VolitionReins.java +++ b/Mage.Sets/src/mage/cards/v/VolitionReins.java @@ -28,7 +28,6 @@ package mage.cards.v; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; @@ -45,6 +44,8 @@ import mage.game.Game; import mage.game.permanent.Permanent; import mage.target.TargetPermanent; +import java.util.UUID; + /** * @author nantuko */ @@ -75,7 +76,7 @@ public class VolitionReins extends CardImpl { return new VolitionReins(this); } - public class UntapVolitionReinsEffect extends OneShotEffect { + public static class UntapVolitionReinsEffect extends OneShotEffect { public UntapVolitionReinsEffect() { super(Outcome.Untap); diff --git a/Mage.Sets/src/mage/cards/v/VulshokBattlemaster.java b/Mage.Sets/src/mage/cards/v/VulshokBattlemaster.java index 75e66437979..4c91e350389 100644 --- a/Mage.Sets/src/mage/cards/v/VulshokBattlemaster.java +++ b/Mage.Sets/src/mage/cards/v/VulshokBattlemaster.java @@ -27,7 +27,6 @@ */ package mage.cards.v; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -42,6 +41,8 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Derpthemeus @@ -70,7 +71,7 @@ public class VulshokBattlemaster extends CardImpl { return new VulshokBattlemaster(this); } - class VulshokBattlemasterEffect extends OneShotEffect { + static class VulshokBattlemasterEffect extends OneShotEffect { public VulshokBattlemasterEffect() { super(Outcome.Benefit); diff --git a/Mage.Sets/src/mage/cards/w/Wirecat.java b/Mage.Sets/src/mage/cards/w/Wirecat.java index 184ce4fdb33..1604cae4273 100644 --- a/Mage.Sets/src/mage/cards/w/Wirecat.java +++ b/Mage.Sets/src/mage/cards/w/Wirecat.java @@ -27,7 +27,6 @@ */ package mage.cards.w; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; @@ -41,6 +40,8 @@ import mage.filter.common.FilterEnchantmentPermanent; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.UUID; + /** * * @author Derpthemeus @@ -66,7 +67,7 @@ public class Wirecat extends CardImpl { return new Wirecat(this); } - class WirecatEffect extends RestrictionEffect { + static class WirecatEffect extends RestrictionEffect { public WirecatEffect() { super(Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/cards/y/YixlidJailer.java b/Mage.Sets/src/mage/cards/y/YixlidJailer.java index 0d1183f5345..3273197c47e 100644 --- a/Mage.Sets/src/mage/cards/y/YixlidJailer.java +++ b/Mage.Sets/src/mage/cards/y/YixlidJailer.java @@ -27,7 +27,6 @@ */ package mage.cards.y; -import java.util.UUID; import mage.MageInt; import mage.abilities.Abilities; import mage.abilities.Ability; @@ -36,15 +35,12 @@ import mage.abilities.effects.ContinuousEffectImpl; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.players.Player; +import java.util.UUID; + /** * * @author emerald000 @@ -72,7 +68,7 @@ public class YixlidJailer extends CardImpl { return new YixlidJailer(this); } - class YixlidJailerEffect extends ContinuousEffectImpl { + static class YixlidJailerEffect extends ContinuousEffectImpl { YixlidJailerEffect() { super(Duration.WhileOnBattlefield, Outcome.LoseAbility); diff --git a/Mage.Sets/src/mage/cards/y/YoungPyromancer.java b/Mage.Sets/src/mage/cards/y/YoungPyromancer.java index 9e706bd72bb..abe7e2040ee 100644 --- a/Mage.Sets/src/mage/cards/y/YoungPyromancer.java +++ b/Mage.Sets/src/mage/cards/y/YoungPyromancer.java @@ -27,7 +27,6 @@ */ package mage.cards.y; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -40,6 +39,8 @@ import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.permanent.token.Token; import mage.util.RandomUtil; +import java.util.UUID; + /** * * @author jeffwadsworth @@ -76,7 +77,7 @@ public class YoungPyromancer extends CardImpl { return new YoungPyromancer(this); } - class ElementalToken extends Token { + static class ElementalToken extends Token { public ElementalToken() { super("Elemental", "1/1 red Elemental creature"); diff --git a/Mage.Sets/src/mage/cards/z/ZektarShrineExpedition.java b/Mage.Sets/src/mage/cards/z/ZektarShrineExpedition.java index acfeaa1a7b1..fb61ce0e0c5 100644 --- a/Mage.Sets/src/mage/cards/z/ZektarShrineExpedition.java +++ b/Mage.Sets/src/mage/cards/z/ZektarShrineExpedition.java @@ -27,7 +27,6 @@ */ package mage.cards.z; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LandfallAbility; @@ -51,6 +50,8 @@ import mage.game.permanent.Permanent; import mage.game.permanent.token.Token; import mage.target.targetpointer.FixedTarget; +import java.util.UUID; + /** * * @author North @@ -109,7 +110,7 @@ class ZektarShrineExpeditionEffect extends OneShotEffect { return true; } - class ElementalToken extends Token { + static class ElementalToken extends Token { public ElementalToken() { super("Elemental", "7/1 red Elemental creature token with trample and haste"); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java b/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java index b4b2379e717..3bc8f574de0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/deck/DeckValidatorTest.java @@ -27,8 +27,6 @@ */ package org.mage.test.serverside.deck; -import java.util.ArrayList; -import java.util.List; import mage.cards.decks.Deck; import mage.cards.decks.DeckValidator; import mage.cards.repository.CardInfo; @@ -39,13 +37,16 @@ import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; +import java.util.ArrayList; +import java.util.List; + /** * * @author LevelX2 */ public class DeckValidatorTest extends CardTestPlayerBase { - class CardNameAmount { + static class CardNameAmount { String name; String setCode; diff --git a/Mage/src/main/java/mage/abilities/common/LimitedTimesPerTurnActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/LimitedTimesPerTurnActivatedAbility.java index 823a4ce22d3..cfbe003e571 100644 --- a/Mage/src/main/java/mage/abilities/common/LimitedTimesPerTurnActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/common/LimitedTimesPerTurnActivatedAbility.java @@ -27,7 +27,6 @@ */ package mage.abilities.common; -import java.util.UUID; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.condition.Condition; import mage.abilities.costs.Cost; @@ -37,13 +36,15 @@ import mage.constants.Zone; import mage.game.Game; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author BetaSteward_at_googlemail.com */ public class LimitedTimesPerTurnActivatedAbility extends ActivatedAbilityImpl { - class ActivationInfo { + static class ActivationInfo { public int turnNum; public int activationCounter; diff --git a/Mage/src/main/java/mage/abilities/mana/ActivateOncePerTurnManaAbility.java b/Mage/src/main/java/mage/abilities/mana/ActivateOncePerTurnManaAbility.java index 624f42164b0..56ec6843b09 100644 --- a/Mage/src/main/java/mage/abilities/mana/ActivateOncePerTurnManaAbility.java +++ b/Mage/src/main/java/mage/abilities/mana/ActivateOncePerTurnManaAbility.java @@ -28,7 +28,6 @@ package mage.abilities.mana; -import java.util.UUID; import mage.Mana; import mage.abilities.costs.Cost; import mage.abilities.effects.common.AddManaOfAnyColorEffect; @@ -37,13 +36,15 @@ import mage.constants.Zone; import mage.game.Game; import mage.util.CardUtil; +import java.util.UUID; + /** * * @author LevelX2 */ public class ActivateOncePerTurnManaAbility extends ActivatedManaAbilityImpl { - class ActivationInfo { + static class ActivationInfo { public int turnNum; public int activationCounter; diff --git a/Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java index 89efd1bfc29..45600162174 100644 --- a/Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java +++ b/Mage/src/main/java/mage/cards/decks/importer/DeckImporter.java @@ -28,11 +28,12 @@ package mage.cards.decks.importer; -import java.io.File; -import java.util.Scanner; import mage.cards.decks.DeckCardLists; import org.apache.log4j.Logger; +import java.io.File; +import java.util.Scanner; + /** * * @author BetaSteward_at_googlemail.com @@ -41,7 +42,7 @@ public abstract class DeckImporter { private static final Logger logger = Logger.getLogger(DeckImporter.class); - protected String errors; + protected StringBuilder sbMessage = new StringBuilder(); //TODO we should stop using this not garbage collectable StringBuilder. It just bloats protected int lineCount; public DeckCardLists importDeck(String file) { @@ -52,7 +53,7 @@ public abstract class DeckImporter { return deckList; } lineCount = 0; - StringBuilder sbMessage = new StringBuilder(); + sbMessage.setLength(0); try { try (Scanner scanner = new Scanner(f)) { @@ -70,12 +71,11 @@ public abstract class DeckImporter { } catch (Exception ex) { logger.fatal(null, ex); } - errors = sbMessage.toString(); return deckList; } public String getErrors(){ - return errors; + return sbMessage.toString(); } protected abstract void readLine(String line, DeckCardLists deckList); diff --git a/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingMinimalWeightMatching.java b/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingMinimalWeightMatching.java index 22040ac3a17..36f3e74bc53 100644 --- a/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingMinimalWeightMatching.java +++ b/Mage/src/main/java/mage/game/tournament/pairing/SwissPairingMinimalWeightMatching.java @@ -290,7 +290,7 @@ public class SwissPairingMinimalWeightMatching { } } - class PlayerInfo { + static class PlayerInfo { public int id; public TournamentPlayer tournamentPlayer;