From 8702e299cd69ef0835be1c6e656460ff38b16a77 Mon Sep 17 00:00:00 2001 From: Jetz Date: Mon, 2 Sep 2024 17:38:28 -0400 Subject: [PATCH] Guava migration - Migrate Functions --- forge-ai/src/main/java/forge/ai/ComputerUtilCard.java | 2 +- forge-ai/src/main/java/forge/ai/CreatureEvaluator.java | 3 +-- forge-core/src/main/java/forge/card/DeckHints.java | 3 +-- forge-core/src/main/java/forge/item/SealedTemplate.java | 2 +- forge-core/src/main/java/forge/util/Aggregates.java | 2 +- forge-core/src/main/java/forge/util/ItemPoolSorter.java | 3 +-- forge-core/src/main/java/forge/util/Lang.java | 2 +- .../java/forge/util/storage/StorageImmediatelySerialized.java | 3 +-- .../src/main/java/forge/util/storage/StorageNestedFolders.java | 3 +-- .../src/main/java/forge/util/storage/StorageReaderBase.java | 2 +- .../src/main/java/forge/util/storage/StorageReaderFile.java | 3 +-- .../java/forge/util/storage/StorageReaderFileSections.java | 3 +-- .../src/main/java/forge/util/storage/StorageReaderFolder.java | 3 +-- .../storage/StorageReaderRecursiveFolderWithUserFolder.java | 3 +-- forge-game/src/main/java/forge/game/GameType.java | 2 +- .../src/main/java/forge/game/player/PlayerCollection.java | 3 +-- forge-gui-desktop/src/main/java/forge/GuiDesktop.java | 3 +-- forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java | 3 +-- forge-gui-desktop/src/main/java/forge/gui/ListChooser.java | 2 +- .../src/main/java/forge/itemmanager/views/ItemTableColumn.java | 3 +-- .../forge/screens/deckeditor/controllers/CEditorQuest.java | 2 +- .../screens/deckeditor/controllers/CEditorQuestLimited.java | 2 +- .../src/main/java/forge/screens/match/CMatchUI.java | 2 +- .../src/main/java/forge/screens/match/controllers/CField.java | 3 +-- .../main/java/forge/toolbox/special/PlayerDetailsPanel.java | 3 +-- forge-gui-mobile/src/forge/GuiMobile.java | 2 +- .../src/forge/adventure/scene/AdventureDeckEditor.java | 2 +- forge-gui-mobile/src/forge/itemmanager/ItemManager.java | 2 +- forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java | 2 +- forge-gui-mobile/src/forge/screens/match/MatchController.java | 2 +- forge-gui-mobile/src/forge/toolbox/GuiChoose.java | 3 +-- forge-gui-mobile/src/forge/toolbox/ListChooser.java | 2 +- .../src/main/java/forge/gamemodes/net/ProtocolMethod.java | 3 +-- .../src/main/java/forge/gamemodes/net/server/NetGuiGame.java | 3 +-- .../main/java/forge/gamemodes/planarconquest/ConquestData.java | 3 +-- .../src/main/java/forge/gamemodes/quest/QuestSpellShop.java | 3 +-- .../src/main/java/forge/gamemodes/quest/QuestUtilCards.java | 2 +- forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java | 3 +-- forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java | 3 +-- forge-gui/src/main/java/forge/gui/util/SGuiChoose.java | 3 +-- forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java | 2 +- forge-gui/src/main/java/forge/itemmanager/ColumnDef.java | 2 +- forge-gui/src/main/java/forge/itemmanager/GroupDef.java | 2 +- forge-gui/src/main/java/forge/itemmanager/ItemColumn.java | 3 +-- .../src/main/java/forge/itemmanager/ItemColumnConfig.java | 3 +-- forge-gui/src/main/java/forge/model/FModel.java | 2 +- .../src/main/java/forge/player/PlayerControllerHuman.java | 2 +- 47 files changed, 47 insertions(+), 72 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java index cf4b579281d..3ac13df9815 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java +++ b/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.*; diff --git a/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java b/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java index f35c873f368..f69bb8d5d49 100644 --- a/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java +++ b/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 { @Override diff --git a/forge-core/src/main/java/forge/card/DeckHints.java b/forge-core/src/main/java/forge/card/DeckHints.java index 50d39c533be..a422313f480 100644 --- a/forge-core/src/main/java/forge/card/DeckHints.java +++ b/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; diff --git a/forge-core/src/main/java/forge/item/SealedTemplate.java b/forge-core/src/main/java/forge/item/SealedTemplate.java index 9633ca3be55..bf2dceaaac3 100644 --- a/forge-core/src/main/java/forge/item/SealedTemplate.java +++ b/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 { diff --git a/forge-core/src/main/java/forge/util/Aggregates.java b/forge-core/src/main/java/forge/util/Aggregates.java index d4d707410e2..9a81d1f6309 100644 --- a/forge-core/src/main/java/forge/util/Aggregates.java +++ b/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; /** diff --git a/forge-core/src/main/java/forge/util/ItemPoolSorter.java b/forge-core/src/main/java/forge/util/ItemPoolSorter.java index 49aa6441055..f0a9212df9a 100644 --- a/forge-core/src/main/java/forge/util/ItemPoolSorter.java +++ b/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 com.google.common.base.Function; +import java.util.function.Function; import forge.item.PaperCard; diff --git a/forge-core/src/main/java/forge/util/Lang.java b/forge-core/src/main/java/forge/util/Lang.java index 1e0dbb0e82c..cfd0053b4e2 100644 --- a/forge-core/src/main/java/forge/util/Lang.java +++ b/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; diff --git a/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java b/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java index 0956b307b96..02bb126e038 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java +++ b/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java @@ -18,8 +18,7 @@ package forge.util.storage; import java.io.File; - -import com.google.common.base.Function; +import java.util.function.Function; import forge.util.IItemSerializer; import forge.util.TextUtil; diff --git a/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java b/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java index 7746ce16cb6..97005b23b2e 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java +++ b/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 com.google.common.base.Function; +import java.util.function.Function; public class StorageNestedFolders extends StorageBase> { private final File thisFolder; diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderBase.java b/forge-core/src/main/java/forge/util/storage/StorageReaderBase.java index 27f2296498c..6f602c6aafc 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageReaderBase.java +++ b/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; diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderFile.java b/forge-core/src/main/java/forge/util/storage/StorageReaderFile.java index 44ca561d31c..10f8ce9493e 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageReaderFile.java +++ b/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; /** diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java b/forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java index 6e90d54e6ef..b20a8006548 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java +++ b/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; /** diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java b/forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java index 0128ed734af..9eb5db24ff3 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java +++ b/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 com.google.common.base.Function; +import java.util.function.Function; import forge.util.TextUtil; diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderRecursiveFolderWithUserFolder.java b/forge-core/src/main/java/forge/util/storage/StorageReaderRecursiveFolderWithUserFolder.java index af9d9e1d59a..12d22fc43e0 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageReaderRecursiveFolderWithUserFolder.java +++ b/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 com.google.common.base.Function; +import java.util.function.Function; import forge.util.TextUtil; diff --git a/forge-game/src/main/java/forge/game/GameType.java b/forge-game/src/main/java/forge/game/GameType.java index 87aebe39cc7..73522612ed1 100644 --- a/forge-game/src/main/java/forge/game/GameType.java +++ b/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; diff --git a/forge-game/src/main/java/forge/game/player/PlayerCollection.java b/forge-game/src/main/java/forge/game/player/PlayerCollection.java index 9bf5da78ba4..adbd323760d 100644 --- a/forge-game/src/main/java/forge/game/player/PlayerCollection.java +++ b/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; diff --git a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java b/forge-gui-desktop/src/main/java/forge/GuiDesktop.java index aa014356e91..11a3a2d86c2 100644 --- a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java +++ b/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; diff --git a/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java b/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java index 243f33ff111..a23e06dc9a8 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java +++ b/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; diff --git a/forge-gui-desktop/src/main/java/forge/gui/ListChooser.java b/forge-gui-desktop/src/main/java/forge/gui/ListChooser.java index b18e247897d..9a9c5c6fdf8 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/ListChooser.java +++ b/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; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemTableColumn.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemTableColumn.java index 9e7dd780491..73fc2fdfcdd 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemTableColumn.java +++ b/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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java index c04ce187f76..628e2f0ab2e 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java +++ b/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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java index 5fcec2205d6..400f10274f5 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java +++ b/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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java index 2702fa4ed7c..d086a053132 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java +++ b/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; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CField.java b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CField.java index de0fd786af8..2bb49c8c518 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CField.java +++ b/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 com.google.common.base.Function; +import java.util.function.Function; import forge.game.player.PlayerView; import forge.game.zone.ZoneType; diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java b/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java index b93c68cc303..61ca9821d8a 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java +++ b/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; diff --git a/forge-gui-mobile/src/forge/GuiMobile.java b/forge-gui-mobile/src/forge/GuiMobile.java index ded55baea98..1b0ef7f1e70 100644 --- a/forge-gui-mobile/src/forge/GuiMobile.java +++ b/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; diff --git a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java b/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java index 528fc3a1fa3..5c30836fa13 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java +++ b/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 { diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java index 4e6e059dafb..e79add651a8 100644 --- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java +++ b/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; diff --git a/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java b/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java index 6202cff5591..20010bf7357 100644 --- a/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java +++ b/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; diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java index d8fe73d5ab8..ed63a73b1bb 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchController.java +++ b/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; diff --git a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java index a1805aac4af..8f762fad64d 100644 --- a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java +++ b/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; diff --git a/forge-gui-mobile/src/forge/toolbox/ListChooser.java b/forge-gui-mobile/src/forge/toolbox/ListChooser.java index be3c84e5ab2..3c39bd4ee95 100644 --- a/forge-gui-mobile/src/forge/toolbox/ListChooser.java +++ b/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; diff --git a/forge-gui/src/main/java/forge/gamemodes/net/ProtocolMethod.java b/forge-gui/src/main/java/forge/gamemodes/net/ProtocolMethod.java index dc768de2cd8..b79ab45e7eb 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/ProtocolMethod.java +++ b/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 com.google.common.base.Function; +import java.util.function.Function; import forge.deck.CardPool; import forge.game.GameEntityView; diff --git a/forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java b/forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java index 424a3345e36..4cfb1ffca80 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java +++ b/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 com.google.common.base.Function; +import java.util.function.Function; import forge.LobbyPlayer; import forge.ai.GameState; diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java index ae7bee33b20..544a57e84db 100644 --- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java +++ b/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 com.google.common.base.Function; +import java.util.function.Function; import forge.card.CardDb; import forge.gamemodes.planarconquest.ConquestPreferences.CQPref; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestSpellShop.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestSpellShop.java index 5f7c155944b..6d886fb7406 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestSpellShop.java +++ b/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; diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java index 461a867f00e..c25b131dc44 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java +++ b/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; /** diff --git a/forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java b/forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java index 98920318ef1..2d59447c630 100644 --- a/forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java +++ b/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 com.google.common.base.Function; +import java.util.function.Function; import forge.gamemodes.match.HostedMatch; import forge.gui.download.GuiDownloadService; diff --git a/forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java b/forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java index bc435c703e1..935ec605a3d 100644 --- a/forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java +++ b/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 com.google.common.base.Function; +import java.util.function.Function; import forge.LobbyPlayer; import forge.ai.GameState; diff --git a/forge-gui/src/main/java/forge/gui/util/SGuiChoose.java b/forge-gui/src/main/java/forge/gui/util/SGuiChoose.java index 54393930cc1..cbb78bfc42b 100644 --- a/forge-gui/src/main/java/forge/gui/util/SGuiChoose.java +++ b/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 { diff --git a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java index 960fecbcb6e..43e4ab7ab2b 100644 --- a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java +++ b/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; diff --git a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java b/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java index 50de4b41fbb..024717c3586 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java +++ b/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 { /** diff --git a/forge-gui/src/main/java/forge/itemmanager/GroupDef.java b/forge-gui/src/main/java/forge/itemmanager/GroupDef.java index ba557ea993c..38a0ad87a24 100644 --- a/forge-gui/src/main/java/forge/itemmanager/GroupDef.java +++ b/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; diff --git a/forge-gui/src/main/java/forge/itemmanager/ItemColumn.java b/forge-gui/src/main/java/forge/itemmanager/ItemColumn.java index 1dc39740e31..3bb9a379ae9 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ItemColumn.java +++ b/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 com.google.common.base.Function; +import java.util.function.Function; import forge.item.InventoryItem; import forge.itemmanager.ItemColumnConfig.SortState; diff --git a/forge-gui/src/main/java/forge/itemmanager/ItemColumnConfig.java b/forge-gui/src/main/java/forge/itemmanager/ItemColumnConfig.java index c4c8c550464..941d8cc0c8c 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ItemColumnConfig.java +++ b/forge-gui/src/main/java/forge/itemmanager/ItemColumnConfig.java @@ -1,8 +1,7 @@ package forge.itemmanager; import java.util.Map.Entry; - -import com.google.common.base.Function; +import java.util.function.Function; import forge.item.InventoryItem; diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java index eb341aad3d4..54a355fda21 100644 --- a/forge-gui/src/main/java/forge/model/FModel.java +++ b/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. diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 8fad25844d8..6b3542d9119 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/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;