Guava migration - Migrate Functions

forge-ai/src/main/java/forge/ai/ComputerUtilCard.java

@@ -2,9 +2,9 @@ package forge.ai;
 
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.function.Function;
 import java.util.function.Predicate;
 
-import com.google.common.base.Function;
 import forge.ai.simulation.GameStateEvaluator;
 import forge.card.mana.ManaCost;
 import forge.game.card.*;

forge-ai/src/main/java/forge/ai/CreatureEvaluator.java

@@ -1,7 +1,5 @@
 package forge.ai;
 
-import com.google.common.base.Function;
-
 import forge.game.GameEntity;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
@@ -15,6 +13,7 @@ import forge.game.staticability.StaticAbilityCantAttackBlock;
 import forge.game.staticability.StaticAbilityMustAttack;
 
 import java.util.List;
+import java.util.function.Function;
 
 public class CreatureEvaluator implements Function<Card, Integer> {
     @Override

forge-core/src/main/java/forge/card/DeckHints.java

@@ -4,14 +4,13 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.function.Predicate;
 
 import forge.util.Iterables;
 import forge.util.Predicates;
 import org.apache.commons.lang3.tuple.Pair;
 
-import com.google.common.base.Function;
-
 import forge.StaticData;
 import forge.item.PaperCard;
 import forge.token.TokenDb;

forge-core/src/main/java/forge/item/SealedTemplate.java

@@ -1,6 +1,5 @@
 package forge.item;
 
-import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 import forge.item.generation.BoosterSlots;
 import forge.util.TextUtil;
@@ -11,6 +10,7 @@ import org.apache.commons.lang3.tuple.Pair;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Function;
 
 public class SealedTemplate {
 

forge-core/src/main/java/forge/util/Aggregates.java

@@ -2,8 +2,8 @@ package forge.util;
 
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.function.Function;
 
-import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 
 /** 

forge-core/src/main/java/forge/util/ItemPoolSorter.java

@@ -19,8 +19,7 @@ package forge.util;
 
 import java.util.Comparator;
 import java.util.Map.Entry;
-
+import java.util.function.Function;
-import com.google.common.base.Function;
 
 import forge.item.PaperCard;
 

forge-core/src/main/java/forge/util/Lang.java

@@ -2,11 +2,11 @@ package forge.util;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Function;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 
 import forge.util.lang.LangChinese;

forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java

@@ -18,8 +18,7 @@
 package forge.util.storage;
 
 import java.io.File;
-
+import java.util.function.Function;
-import com.google.common.base.Function;
 
 import forge.util.IItemSerializer;
 import forge.util.TextUtil;

forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java

@@ -2,8 +2,7 @@ package forge.util.storage;
 
 import java.io.File;
 import java.util.HashMap;
-
+import java.util.function.Function;
-import com.google.common.base.Function;
 
 public class StorageNestedFolders<T> extends StorageBase<IStorage<T>> {
     private final File thisFolder;

forge-core/src/main/java/forge/util/storage/StorageReaderBase.java

@@ -3,8 +3,8 @@ package forge.util.storage;
 import java.io.File;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.function.Function;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 
 import forge.util.IItemReader;

forge-core/src/main/java/forge/util/storage/StorageReaderFile.java

@@ -19,11 +19,10 @@ package forge.util.storage;
 
 import java.io.File;
 import java.util.Map;
+import java.util.function.Function;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.base.Function;
-
 import forge.util.FileUtil;
 
 /**

forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java

@@ -21,11 +21,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.base.Function;
-
 import forge.util.FileUtil;
 
 /**

forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java

@@ -25,8 +25,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
-
+import java.util.function.Function;
-import com.google.common.base.Function;
 
 import forge.util.TextUtil;
 

forge-core/src/main/java/forge/util/storage/StorageReaderRecursiveFolderWithUserFolder.java

@@ -28,8 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
-
+import java.util.function.Function;
-import com.google.common.base.Function;
 
 import forge.util.TextUtil;
 

forge-game/src/main/java/forge/game/GameType.java

@@ -2,9 +2,9 @@ package forge.game;
 
 import java.util.EnumSet;
 import java.util.Set;
+import java.util.function.Function;
 
 import com.google.common.base.Enums;
-import com.google.common.base.Function;
 
 import forge.StaticData;
 import forge.deck.CardPool;

forge-game/src/main/java/forge/game/player/PlayerCollection.java

@@ -2,10 +2,9 @@ package forge.game.player;
 
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.function.Function;
 import java.util.function.Predicate;
 
-import com.google.common.base.Function;
-
 import forge.game.card.CardCollection;
 import forge.game.zone.ZoneType;
 import forge.util.Aggregates;

forge-gui-desktop/src/main/java/forge/GuiDesktop.java

@@ -15,6 +15,7 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Function;
 
 import javax.swing.ImageIcon;
 import javax.swing.JFileChooser;
@@ -22,8 +23,6 @@ import javax.swing.SwingUtilities;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.base.Function;
-
 import forge.download.GuiDownloader;
 import forge.error.BugReportDialog;
 import forge.gamemodes.match.HostedMatch;

forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java

@@ -7,14 +7,13 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.FutureTask;
+import java.util.function.Function;
 
 import javax.swing.JList;
 import javax.swing.WindowConstants;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.base.Function;
-
 import forge.card.CardStateName;
 import forge.card.ICardFace;
 import forge.game.card.Card;

forge-gui-desktop/src/main/java/forge/gui/ListChooser.java

@@ -25,6 +25,7 @@ import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Function;
 
 import javax.swing.AbstractListModel;
 import javax.swing.DefaultListCellRenderer;
@@ -36,7 +37,6 @@ import javax.swing.WindowConstants;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 

forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemTableColumn.java

@@ -19,11 +19,10 @@ package forge.itemmanager.views;
 
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.function.Function;
 
 import javax.swing.table.TableColumn;
 
-import com.google.common.base.Function;
-
 import forge.item.InventoryItem;
 import forge.itemmanager.ColumnDef;
 import forge.itemmanager.ItemColumn;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java

@@ -22,11 +22,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.function.Function;
 import java.util.function.Predicate;
 
 import javax.swing.KeyStroke;
 
-import com.google.common.base.Function;
 import com.google.common.base.Supplier;
 
 import forge.card.CardRules;

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java

@@ -22,8 +22,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.function.Function;
 
-import com.google.common.base.Function;
 import com.google.common.base.Supplier;
 
 import forge.deck.Deck;

forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java

@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 
 import javax.swing.JMenu;
 import javax.swing.JOptionPane;
@@ -38,7 +39,6 @@ import javax.swing.KeyStroke;
 import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.PopupMenuListener;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;

forge-gui-desktop/src/main/java/forge/screens/match/controllers/CField.java

@@ -20,8 +20,7 @@ package forge.screens.match.controllers;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-
+import java.util.function.Function;
-import com.google.common.base.Function;
 
 import forge.game.player.PlayerView;
 import forge.game.zone.ZoneType;

forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java

@@ -6,6 +6,7 @@ import java.awt.Graphics;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Function;
 
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
@@ -13,8 +14,6 @@ import javax.swing.SwingConstants;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
-import com.google.common.base.Function;
-
 import forge.card.mana.ManaAtom;
 import forge.game.player.PlayerView;
 import forge.localinstance.skin.FSkinProp;

forge-gui-mobile/src/forge/GuiMobile.java

@@ -3,7 +3,6 @@ package forge;
 import com.badlogic.gdx.Application.ApplicationType;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.Texture;
-import com.google.common.base.Function;
 import forge.adventure.stage.MapStage;
 import forge.assets.*;
 import forge.card.CardRenderer;
@@ -32,6 +31,7 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Function;
 
 public class GuiMobile implements IGuiBase {
     private final String assetsDir;

forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java

@@ -4,7 +4,6 @@ import com.badlogic.gdx.Input;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Align;
-import com.google.common.base.Function;
 import forge.Forge;
 import forge.Graphics;
 import forge.adventure.data.AdventureEventData;
@@ -40,6 +39,7 @@ import forge.util.Utils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.*;
+import java.util.function.Function;
 
 public class AdventureDeckEditor extends TabPageScreen<AdventureDeckEditor> {
 

forge-gui-mobile/src/forge/itemmanager/ItemManager.java

@@ -19,12 +19,12 @@ package forge.itemmanager;
 
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.function.Function;
 import java.util.function.Predicate;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.utils.Align;
-import com.google.common.base.Function;
 
 import forge.Forge;
 import forge.Graphics;

forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java

@@ -1,10 +1,10 @@
 package forge.itemmanager;
 
 import java.util.Map.Entry;
+import java.util.function.Function;
 
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.utils.Align;
-import com.google.common.base.Function;
 
 import forge.Forge;
 import forge.Graphics;

forge-gui-mobile/src/forge/screens/match/MatchController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 
 import forge.adventure.scene.DuelScene;
 import forge.adventure.util.Config;
@@ -15,7 +16,6 @@ import forge.util.Iterables;
 import forge.util.collect.FCollection;
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 

forge-gui-mobile/src/forge/toolbox/GuiChoose.java

@@ -5,13 +5,12 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
+import java.util.function.Function;
 
 import forge.Forge;
 import forge.util.Iterables;
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.base.Function;
-
 import forge.game.card.CardView;
 import forge.util.Callback;
 

forge-gui-mobile/src/forge/toolbox/ListChooser.java

@@ -21,10 +21,10 @@ package forge.toolbox;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Function;
 import java.util.function.Predicate;
 
 import com.badlogic.gdx.Input;
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 
 import forge.Forge;

forge-gui/src/main/java/forge/gamemodes/net/ProtocolMethod.java

@@ -4,8 +4,7 @@ import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-
+import java.util.function.Function;
-import com.google.common.base.Function;
 
 import forge.deck.CardPool;
 import forge.game.GameEntityView;

forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java

@@ -3,8 +3,7 @@ package forge.gamemodes.net.server;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-
+import java.util.function.Function;
-import com.google.common.base.Function;
 
 import forge.LobbyPlayer;
 import forge.ai.GameState;

forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java

@@ -26,8 +26,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
+import java.util.function.Function;
-import com.google.common.base.Function;
 
 import forge.card.CardDb;
 import forge.gamemodes.planarconquest.ConquestPreferences.CQPref;

forge-gui/src/main/java/forge/gamemodes/quest/QuestSpellShop.java

@@ -5,11 +5,10 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.function.Function;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import com.google.common.base.Function;
-
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckFormat;

forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java

@@ -17,7 +17,6 @@
  */
 package forge.gamemodes.quest;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import forge.card.CardEdition;
@@ -46,6 +45,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.function.Function;
 import java.util.function.Predicate;
 
 /**

forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java

@@ -5,8 +5,7 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.List;
-
+import java.util.function.Function;
-import com.google.common.base.Function;
 
 import forge.gamemodes.match.HostedMatch;
 import forge.gui.download.GuiDownloadService;

forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java

@@ -3,8 +3,7 @@ package forge.gui.interfaces;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-
+import java.util.function.Function;
-import com.google.common.base.Function;
 
 import forge.LobbyPlayer;
 import forge.ai.GameState;

forge-gui/src/main/java/forge/gui/util/SGuiChoose.java

@@ -4,12 +4,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Function;
 
 import forge.util.Iterables;
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.base.Function;
-
 import forge.gui.GuiBase;
 
 public class SGuiChoose {

forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java

@@ -10,10 +10,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 

forge-gui/src/main/java/forge/itemmanager/ColumnDef.java

@@ -17,7 +17,6 @@
  */
 package forge.itemmanager;
 
-import com.google.common.base.Function;
 import forge.card.*;
 import forge.card.mana.ManaCost;
 import forge.deck.DeckProxy;
@@ -43,6 +42,7 @@ import java.math.RoundingMode;
 import java.util.HashSet;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.function.Function;
 
 public enum ColumnDef {
     /**

forge-gui/src/main/java/forge/itemmanager/GroupDef.java

@@ -4,8 +4,8 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 
-import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 
 import forge.card.CardEdition;

forge-gui/src/main/java/forge/itemmanager/ItemColumn.java

@@ -19,8 +19,7 @@ package forge.itemmanager;
 
 import java.util.Map;
 import java.util.Map.Entry;
-
+import java.util.function.Function;
-import com.google.common.base.Function;
 
 import forge.item.InventoryItem;
 import forge.itemmanager.ItemColumnConfig.SortState;

forge-gui/src/main/java/forge/itemmanager/ItemColumnConfig.java

@@ -1,8 +1,7 @@
 package forge.itemmanager;
 
 import java.util.Map.Entry;
-
+import java.util.function.Function;
-import com.google.common.base.Function;
 
 import forge.item.InventoryItem;
 

forge-gui/src/main/java/forge/model/FModel.java

@@ -17,7 +17,6 @@
  */
 package forge.model;
 
-import com.google.common.base.Function;
 import com.google.common.collect.Maps;
 import forge.CardStorageReader;
 import forge.CardStorageReader.ProgressObserver;
@@ -62,6 +61,7 @@ import forge.util.storage.StorageBase;
 
 import java.io.File;
 import java.util.*;
+import java.util.function.Function;
 
 /**
  * The default Model implementation for Forge.

forge-gui/src/main/java/forge/player/PlayerControllerHuman.java

@@ -1,6 +1,5 @@
 package forge.player;
 
-import com.google.common.base.Function;
 import com.google.common.collect.*;
 import forge.LobbyPlayer;
 import forge.StaticData;
@@ -76,6 +75,7 @@ import org.apache.commons.lang3.tuple.Pair;
 import java.io.*;
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;