From 73a6d65118e9312f6d5f64bb6905b9885a94824f Mon Sep 17 00:00:00 2001 From: Michael Kamensky Date: Sun, 7 Mar 2021 07:42:48 +0300 Subject: [PATCH 1/2] - Update ANNOUNCEMENTS.txt - Rename a method in ChangeZoneAi --- forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java | 4 ++-- forge-gui/release-files/ANNOUNCEMENTS.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java index 59d75014b1f..cee3174323f 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java @@ -1550,7 +1550,7 @@ public class ChangeZoneAi extends SpellAbilityAi { } else { if (!sa.hasParam("Mandatory") && origin.contains(ZoneType.Battlefield) && sa.hasParam("ChangeNum")) { // exclude tokens, they won't come back, and enchanted stuff, since auras will go away - fetchList = prefilterListForBounceAnyNum(fetchList, decider); + fetchList = prefilterOwnListForBounceAnyNum(fetchList, decider); if (fetchList.isEmpty()) { return null; } @@ -1624,7 +1624,7 @@ public class ChangeZoneAi extends SpellAbilityAi { return c; } - private static CardCollection prefilterListForBounceAnyNum(CardCollection fetchList, Player decider) { + private static CardCollection prefilterOwnListForBounceAnyNum(CardCollection fetchList, Player decider) { fetchList = CardLists.filter(fetchList, new Predicate() { @Override public boolean apply(final Card card) { diff --git a/forge-gui/release-files/ANNOUNCEMENTS.txt b/forge-gui/release-files/ANNOUNCEMENTS.txt index 48a127b8455..5b711895a46 100644 --- a/forge-gui/release-files/ANNOUNCEMENTS.txt +++ b/forge-gui/release-files/ANNOUNCEMENTS.txt @@ -3,7 +3,7 @@ Get in the discord if you aren't yet. The game is now translated into Japanese (not all the messages are translated yet). Mutate is now fully implemented. The game now supports an assortment of silver-bordered cards from Unhinged, Unglued, Unstable, and other similar sets. -There are new Net Deck categories - the Standard, Modern, and Pioneer archives. +There are new Net Deck categories - the Standard, Modern, Pioneer, Legacy, and Vintage archives. Draft cubes have been updated to account for the newly supported cards, MTGO Vintage December 2020 cube was added. New Possibility Storm puzzles were added to the Puzzle Mode (IKO/M21/ZNR/KHM), including puzzles that utilize Mutate. Planar Conquest now has a new plane accessible - Eldraine. From 4ca125e0b632ace6146a9e94d59c2e3cacae728c Mon Sep 17 00:00:00 2001 From: Michael Kamensky Date: Sun, 7 Mar 2021 07:46:22 +0300 Subject: [PATCH 2/2] - Fix unused imports. --- .../forge/itemmanager/views/ImageView.java | 36 ++++++------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java index 0bfe0c90631..a4933eac065 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java @@ -1,24 +1,5 @@ package forge.itemmanager.views; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionAdapter; -import java.awt.event.MouseWheelEvent; -import java.awt.image.BufferedImage; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.TreeMap; - -import javax.swing.JComponent; -import javax.swing.JPanel; -import javax.swing.JViewport; -import javax.swing.ScrollPaneConstants; -import javax.swing.SwingUtilities; - import forge.ImageCache; import forge.assets.FSkinProp; import forge.card.ColorSet; @@ -29,12 +10,7 @@ import forge.gui.framework.ILocalRepaint; import forge.item.IPaperCard; import forge.item.InventoryItem; import forge.item.PaperCard; -import forge.itemmanager.ColumnDef; -import forge.itemmanager.GroupDef; -import forge.itemmanager.ItemManager; -import forge.itemmanager.ItemManagerConfig; -import forge.itemmanager.ItemManagerModel; -import forge.itemmanager.SItemManagerUtil; +import forge.itemmanager.*; import forge.model.FModel; import forge.properties.ForgePreferences; import forge.screens.deckeditor.CDeckEditorUI; @@ -48,7 +24,15 @@ import forge.util.ImageUtil; import forge.util.Localizer; import forge.view.arcane.CardPanel; -import static forge.ImageCache.getCroppedArt; +import javax.swing.*; +import java.awt.*; +import java.awt.event.*; +import java.awt.image.BufferedImage; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.TreeMap; public class ImageView extends ItemView { private static final int PADDING = 5;