From 8dfa917ed10df5763af2d12730a4086141f63b9a Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 6 Oct 2017 12:21:29 +0200 Subject: [PATCH] Fixed the BitmapFont import errors, but I'm not comitting 2 of the files for now. --- build.gradle | 1 + forge-gui-mobile/src/forge/Graphics.java | 3 +-- .../src/forge/assets/TextRenderer.java | 3 +-- .../src/forge/card/CardListPreview.java | 2 +- .../src/forge/card/CardRenderer.java | 3 +-- forge-gui-mobile/src/forge/card/CardZoom.java | 2 +- .../src/forge/deck/AddBasicLandsDialog.java | 2 +- .../src/forge/deck/FDeckChooser.java | 2 +- .../src/forge/deck/FDeckEditor.java | 2 +- .../src/forge/itemmanager/DeckManager.java | 2 +- .../src/forge/itemmanager/ItemManager.java | 2 +- .../forge/itemmanager/SpellShopManager.java | 2 +- .../filters/AdvancedSearchFilter.java | 2 +- .../itemmanager/filters/FormatFilter.java | 2 +- .../itemmanager/filters/ListLabelFilter.java | 2 +- .../itemmanager/filters/TextSearchFilter.java | 2 +- .../filters/ToggleButtonsFilter.java | 2 +- .../itemmanager/filters/ValueRangeFilter.java | 2 +- .../forge/itemmanager/views/ImageView.java | 2 +- .../src/forge/menu/FMagnifyView.java | 3 +-- .../src/forge/screens/FScreen.java | 2 +- .../src/forge/screens/TabPageScreen.java | 2 +- .../screens/constructed/AvatarSelector.java | 2 +- .../screens/constructed/LobbyScreen.java | 2 +- .../screens/constructed/PlayerPanel.java | 2 +- .../src/forge/screens/home/HomeScreen.java | 2 +- .../screens/limited/LoadDraftScreen.java | 2 +- .../forge/screens/match/views/VAvatar.java | 2 +- .../src/forge/screens/match/views/VLog.java | 2 +- .../forge/screens/match/views/VManaPool.java | 2 +- .../screens/match/views/VPhaseIndicator.java | 3 +-- .../screens/match/views/VPlayerPanel.java | 2 +- .../forge/screens/match/views/VPlayers.java | 2 +- .../src/forge/screens/match/views/VStack.java | 2 +- .../screens/match/winlose/ViewWinLose.java | 2 +- .../planarconquest/ConquestAEtherScreen.java | 2 +- .../ConquestCommandersScreen.java | 2 +- .../ConquestMultiverseScreen.java | 2 +- .../planarconquest/ConquestPlaneSelector.java | 2 +- .../ConquestPlaneswalkScreen.java | 2 +- .../planarconquest/ConquestRewardDialog.java | 2 +- .../planarconquest/ConquestStatsScreen.java | 2 +- .../planarconquest/LoadConquestScreen.java | 2 +- .../forge/screens/quest/LoadQuestScreen.java | 2 +- .../screens/quest/QuestBazaarScreen.java | 2 +- .../screens/quest/QuestChallengesScreen.java | 2 +- .../forge/screens/quest/QuestDecksScreen.java | 6 +++-- .../forge/screens/quest/QuestDuelsScreen.java | 2 +- .../forge/screens/quest/QuestEventPanel.java | 2 +- .../screens/quest/QuestSpellShopScreen.java | 2 +- .../screens/quest/QuestTournamentsScreen.java | 2 +- .../src/forge/toolbox/FCheckBox.java | 2 +- .../src/forge/toolbox/FComboBox.java | 2 +- .../src/forge/toolbox/FFileChooser.java | 2 +- .../src/forge/toolbox/FGroupBox.java | 2 +- .../src/forge/toolbox/FLabel.java | 24 +++++++++---------- forge-gui-mobile/src/forge/toolbox/FList.java | 2 +- .../src/forge/toolbox/FNumericTextField.java | 2 +- .../src/forge/toolbox/FTextField.java | 3 +-- .../src/forge/toolbox/FToggleSwitch.java | 2 +- 60 files changed, 74 insertions(+), 77 deletions(-) diff --git a/build.gradle b/build.gradle index 8a839b09..84bca14f 100644 --- a/build.gradle +++ b/build.gradle @@ -124,6 +124,7 @@ project(":forge-gui-mobile-desktop") { compile project(":forge-ai") compile project(":forge-gui") compile project(":forge-gui-mobile") + compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" compile "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion" compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" compile "com.miglayout:miglayout:3.5.5" diff --git a/forge-gui-mobile/src/forge/Graphics.java b/forge-gui-mobile/src/forge/Graphics.java index d0c59daa..ff9d3a84 100644 --- a/forge-gui-mobile/src/forge/Graphics.java +++ b/forge-gui-mobile/src/forge/Graphics.java @@ -4,8 +4,7 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; -import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; diff --git a/forge-gui-mobile/src/forge/assets/TextRenderer.java b/forge-gui-mobile/src/forge/assets/TextRenderer.java index 316a719f..9226d2b6 100644 --- a/forge-gui-mobile/src/forge/assets/TextRenderer.java +++ b/forge-gui-mobile/src/forge/assets/TextRenderer.java @@ -6,8 +6,7 @@ import java.util.List; import java.util.Map; import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; -import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Graphics; import forge.card.CardFaceSymbols; diff --git a/forge-gui-mobile/src/forge/card/CardListPreview.java b/forge-gui-mobile/src/forge/card/CardListPreview.java index f311d0fd..f03d6956 100644 --- a/forge-gui-mobile/src/forge/card/CardListPreview.java +++ b/forge-gui-mobile/src/forge/card/CardListPreview.java @@ -1,6 +1,6 @@ package forge.card; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Vector2; import forge.item.PaperCard; diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java index 622e3694..2205b2bf 100644 --- a/forge-gui-mobile/src/forge/card/CardRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardRenderer.java @@ -7,8 +7,7 @@ import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.BitmapFont; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; -import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.PixmapPacker; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator; diff --git a/forge-gui-mobile/src/forge/card/CardZoom.java b/forge-gui-mobile/src/forge/card/CardZoom.java index c2015ac0..5d77d1ee 100644 --- a/forge-gui-mobile/src/forge/card/CardZoom.java +++ b/forge-gui-mobile/src/forge/card/CardZoom.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Rectangle; import forge.Forge; diff --git a/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java b/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java index f4ee9c05..5ca37425 100644 --- a/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java +++ b/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java @@ -48,7 +48,7 @@ import forge.toolbox.FTextArea; import forge.util.Callback; import forge.util.Utils; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import java.util.Map; diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java index 8842a3bc..c8d6f0d7 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java +++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java @@ -41,7 +41,7 @@ import forge.util.storage.IStorage; import org.apache.commons.lang3.StringUtils; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.google.common.collect.ImmutableList; import java.util.ArrayList; diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java index 3a510189..9d268b85 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java +++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java @@ -1,7 +1,7 @@ package forge.deck; import com.badlogic.gdx.Input.Keys; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Vector2; import com.google.common.base.Predicate; import com.google.common.base.Predicates; diff --git a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java index 32947b45..73d24b2c 100644 --- a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java @@ -20,7 +20,7 @@ import forge.toolbox.FList; import forge.toolbox.FList.CompactModeHandler; import forge.util.Utils; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import java.util.Map.Entry; diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java index 7ab24398..14c961af 100644 --- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java @@ -18,7 +18,7 @@ package forge.itemmanager; import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Rectangle; import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java b/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java index abc2a9bf..6ee69f28 100644 --- a/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java @@ -3,7 +3,7 @@ package forge.itemmanager; import java.util.Map.Entry; import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.google.common.base.Function; import forge.Graphics; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java index e53d5f88..cee37049 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java @@ -1,6 +1,6 @@ package forge.itemmanager.filters; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java index 1d96edf1..1267737c 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java @@ -28,7 +28,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; public abstract class FormatFilter extends ItemFilter { diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java index c8931371..d45bf02a 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java @@ -1,6 +1,6 @@ package forge.itemmanager.filters; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.assets.FSkinFont; import forge.item.InventoryItem; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java index 463ce5aa..5daf1af4 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java @@ -1,6 +1,6 @@ package forge.itemmanager.filters; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.google.common.base.Predicate; import com.google.common.base.Predicates; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java index 31ae7b64..62495248 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java @@ -3,7 +3,7 @@ package forge.itemmanager.filters; import java.util.ArrayList; import java.util.List; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.assets.FImage; import forge.item.InventoryItem; diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java index 0137c9a8..2ee15689 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java @@ -1,6 +1,6 @@ package forge.itemmanager.filters; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.google.common.base.Predicate; import forge.card.CardRules; diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java index 13f1b774..9186be85 100644 --- a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java +++ b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java @@ -37,7 +37,7 @@ import java.util.Map.Entry; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; diff --git a/forge-gui-mobile/src/forge/menu/FMagnifyView.java b/forge-gui-mobile/src/forge/menu/FMagnifyView.java index 01872ceb..77f3b743 100644 --- a/forge-gui-mobile/src/forge/menu/FMagnifyView.java +++ b/forge-gui-mobile/src/forge/menu/FMagnifyView.java @@ -1,7 +1,6 @@ package forge.menu; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; -import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Graphics; import forge.assets.FSkinColor; diff --git a/forge-gui-mobile/src/forge/screens/FScreen.java b/forge-gui-mobile/src/forge/screens/FScreen.java index c1a33c93..68ee4ac0 100644 --- a/forge-gui-mobile/src/forge/screens/FScreen.java +++ b/forge-gui-mobile/src/forge/screens/FScreen.java @@ -3,7 +3,7 @@ package forge.screens; import java.util.List; import com.badlogic.gdx.Input.Keys; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Rectangle; import forge.Forge; diff --git a/forge-gui-mobile/src/forge/screens/TabPageScreen.java b/forge-gui-mobile/src/forge/screens/TabPageScreen.java index 0fb29d84..689f7805 100644 --- a/forge-gui-mobile/src/forge/screens/TabPageScreen.java +++ b/forge-gui-mobile/src/forge/screens/TabPageScreen.java @@ -1,6 +1,6 @@ package forge.screens; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Forge; import forge.Graphics; diff --git a/forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java b/forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java index 34f91d38..7ce457a8 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java +++ b/forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; public class AvatarSelector extends FScreen { public static int getRandomAvatar(List usedAvatars) { diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java index 2e20886d..bc16181b 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java +++ b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java @@ -5,7 +5,7 @@ import java.util.*; import org.apache.commons.lang3.StringUtils; import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.google.common.collect.Iterables; import forge.FThreads; diff --git a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java index c8947af1..1a433f03 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java +++ b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java @@ -6,7 +6,7 @@ import java.util.Set; import org.apache.commons.lang3.StringUtils; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java index 8b83938e..54ec5a25 100644 --- a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java +++ b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java @@ -3,7 +3,7 @@ package forge.screens.home; import java.util.ArrayList; import java.util.List; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Forge; import forge.Graphics; diff --git a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java index b601a4ff..1720fde6 100644 --- a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java +++ b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java @@ -1,6 +1,6 @@ package forge.screens.limited; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.FThreads; import forge.Forge; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java b/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java index 4df8cd9e..2893629a 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java @@ -1,7 +1,7 @@ package forge.screens.match.views; import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Vector2; import forge.Graphics; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VLog.java b/forge-gui-mobile/src/forge/screens/match/views/VLog.java index ea3b9e2a..f75d362e 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VLog.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VLog.java @@ -2,7 +2,7 @@ package forge.screens.match.views; import java.util.List; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Graphics; import forge.assets.FSkinColor; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java b/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java index 68713a14..2e02ae4c 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java @@ -3,7 +3,7 @@ package forge.screens.match.views; import java.util.ArrayList; import java.util.List; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Forge; import forge.Graphics; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java b/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java index 841d2546..47155140 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java @@ -4,8 +4,7 @@ import java.util.HashMap; import java.util.Map; import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; -import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Graphics; import forge.assets.FSkinColor; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java index c2134599..53fe794e 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Forge; import forge.Graphics; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPlayers.java b/forge-gui-mobile/src/forge/screens/match/views/VPlayers.java index 82a0ae15..a75e5c66 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VPlayers.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VPlayers.java @@ -1,6 +1,6 @@ package forge.screens.match.views; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Graphics; import forge.assets.FImage; diff --git a/forge-gui-mobile/src/forge/screens/match/views/VStack.java b/forge-gui-mobile/src/forge/screens/match/views/VStack.java index 8e73b88a..3592ea97 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VStack.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VStack.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Set; import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Vector2; import forge.Forge; diff --git a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java index 75dde34a..bb8efcff 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java @@ -1,7 +1,7 @@ package forge.screens.match.winlose; import com.badlogic.gdx.Input.Keys; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.FThreads; import forge.Forge; import forge.assets.FSkinColor; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java index 4c1953e2..6b2f1b49 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Set; import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Rectangle; import com.google.common.base.Predicate; import com.google.common.base.Predicates; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java index 4de83740..ec34ecc6 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java @@ -2,7 +2,7 @@ package forge.screens.planarconquest; import java.util.Map.Entry; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.google.common.base.Predicate; import forge.Forge; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java index 06d4cc47..a771418b 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java @@ -5,7 +5,7 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java index b3a1405f..bfae5347 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java @@ -3,7 +3,7 @@ package forge.screens.planarconquest; import java.util.List; import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Rectangle; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkScreen.java index 02d69118..98f62e16 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkScreen.java @@ -1,7 +1,7 @@ package forge.screens.planarconquest; import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Forge; import forge.Graphics; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java index 149db951..e0064894 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Graphics; import forge.ImageKeys; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java index ee124970..c29088c3 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java @@ -1,6 +1,6 @@ package forge.screens.planarconquest; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.assets.FImage; import forge.assets.FSkinFont; diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java index 5694541e..4d0fa760 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.FThreads; import forge.Graphics; diff --git a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java index c8654289..a753b5fe 100644 --- a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.FThreads; import forge.Forge; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestBazaarScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestBazaarScreen.java index fa983362..1845b312 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestBazaarScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestBazaarScreen.java @@ -3,7 +3,7 @@ package forge.screens.quest; import java.util.List; import java.util.Set; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Vector2; import forge.Forge; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestChallengesScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestChallengesScreen.java index f86d83fc..08997bef 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestChallengesScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestChallengesScreen.java @@ -1,6 +1,6 @@ package forge.screens.quest; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Vector2; import forge.assets.FSkinFont; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java index 105a557a..8895102a 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java @@ -1,6 +1,7 @@ package forge.screens.quest; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; +import com.badlogic.gdx.utils.Align; import forge.FThreads; import forge.Forge; @@ -34,7 +35,7 @@ public class QuestDecksScreen extends FScreen { private final FButton btnRandom = add(new FButton("Random Deck")); private final FLabel lblInfo = add(new FLabel.Builder() - .align(HAlignment.CENTER).font(FSkinFont.get(16)) + .align(Align.center).font(FSkinFont.get(16)) .text("Build or select a deck").build()); private final FEventHandler onDeckSelectionChanged = new FEventHandler() { @@ -161,6 +162,7 @@ public class QuestDecksScreen extends FScreen { float y = startY + PADDING / 2; float w = width - 2 * PADDING; + // lblInfo.get lblInfo.setBounds(x, y, w, lblInfo.getAutoSizeBounds().height); y += lblInfo.getHeight(); diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java index 97a6ecab..c73c6d28 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java @@ -1,6 +1,6 @@ package forge.screens.quest; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Vector2; import forge.assets.FSkinFont; import forge.interfaces.IButton; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestEventPanel.java b/forge-gui-mobile/src/forge/screens/quest/QuestEventPanel.java index f492a75e..b4252fb9 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestEventPanel.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestEventPanel.java @@ -1,7 +1,7 @@ package forge.screens.quest; import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Graphics; import forge.assets.*; import forge.assets.FSkinColor.Colors; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java index 44848e99..d4f7a5b8 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.FThreads; import forge.assets.FImage; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java index 58c94b03..226c864b 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java @@ -1,6 +1,6 @@ package forge.screens.quest; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Vector2; import forge.FThreads; diff --git a/forge-gui-mobile/src/forge/toolbox/FCheckBox.java b/forge-gui-mobile/src/forge/toolbox/FCheckBox.java index b843a3d7..a1911aa5 100644 --- a/forge-gui-mobile/src/forge/toolbox/FCheckBox.java +++ b/forge-gui-mobile/src/forge/toolbox/FCheckBox.java @@ -1,6 +1,6 @@ package forge.toolbox; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Graphics; import forge.assets.FImage; diff --git a/forge-gui-mobile/src/forge/toolbox/FComboBox.java b/forge-gui-mobile/src/forge/toolbox/FComboBox.java index 8302ef2d..e4f63f14 100644 --- a/forge-gui-mobile/src/forge/toolbox/FComboBox.java +++ b/forge-gui-mobile/src/forge/toolbox/FComboBox.java @@ -3,7 +3,7 @@ package forge.toolbox; import java.util.ArrayList; import java.util.List; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Graphics; import forge.interfaces.IComboBox; diff --git a/forge-gui-mobile/src/forge/toolbox/FFileChooser.java b/forge-gui-mobile/src/forge/toolbox/FFileChooser.java index 23f36530..2431ee47 100644 --- a/forge-gui-mobile/src/forge/toolbox/FFileChooser.java +++ b/forge-gui-mobile/src/forge/toolbox/FFileChooser.java @@ -6,7 +6,7 @@ import java.io.FilenameFilter; import org.apache.commons.lang3.StringUtils; import com.badlogic.gdx.Input.Keys; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Forge; import forge.Graphics; diff --git a/forge-gui-mobile/src/forge/toolbox/FGroupBox.java b/forge-gui-mobile/src/forge/toolbox/FGroupBox.java index 10f42064..270775ce 100644 --- a/forge-gui-mobile/src/forge/toolbox/FGroupBox.java +++ b/forge-gui-mobile/src/forge/toolbox/FGroupBox.java @@ -1,6 +1,6 @@ package forge.toolbox; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Graphics; import forge.assets.FSkinColor; diff --git a/forge-gui-mobile/src/forge/toolbox/FLabel.java b/forge-gui-mobile/src/forge/toolbox/FLabel.java index 80934498..56a3953f 100644 --- a/forge-gui-mobile/src/forge/toolbox/FLabel.java +++ b/forge-gui-mobile/src/forge/toolbox/FLabel.java @@ -1,8 +1,8 @@ package forge.toolbox; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; -import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.math.Vector2; +import com.badlogic.gdx.utils.Align; import forge.Graphics; import forge.UiCommand; @@ -25,7 +25,7 @@ public class FLabel extends FDisplayObject implements IButton { private float bldIconScaleFactor = 0.8f; private FSkinFont bldFont = FSkinFont.get(14); private float bldAlphaComposite = 0.7f; - private HAlignment bldAlignment = HAlignment.LEFT; + private Align bldAlignment = Align.LEFT; private Vector2 bldInsets = new Vector2(DEFAULT_INSETS, DEFAULT_INSETS); private boolean bldSelectable = false; @@ -48,7 +48,7 @@ public class FLabel extends FDisplayObject implements IButton { // Begin builder methods. public Builder text(final String s0) { this.bldText = s0; return this; } public Builder icon(final FImage i0) { this.bldIcon = i0; return this; } - public Builder align(final HAlignment a0) { this.bldAlignment = a0; return this; } + public Builder align(final Align a0) { this.bldAlignment = a0; return this; } public Builder insets(final Vector2 v0) { this.bldInsets = v0; return this; } public Builder opaque(final boolean b0) { this.bldOpaque = b0; return this; } public Builder opaque() { opaque(true); return this; } @@ -103,7 +103,7 @@ public class FLabel extends FDisplayObject implements IButton { private float iconScaleFactor; private FSkinFont font; private float alphaComposite; - private HAlignment alignment; + private Align alignment; private Vector2 insets; private boolean selectable, selected, opaque, iconInBackground, iconScaleAuto, iconScaleWithFont, pressed; @@ -186,10 +186,10 @@ public class FLabel extends FDisplayObject implements IButton { insets = insets0; } - public HAlignment getAlignment() { + public Align getAlignment() { return alignment; } - public void setAlignment(final HAlignment alignment0) { + public void setAlignment(final Align alignment0) { alignment = alignment0; } @@ -342,13 +342,13 @@ public class FLabel extends FDisplayObject implements IButton { float iconOffset = iconWidth + insets.x + getExtraGapBetweenIconAndText(); if (iconInBackground || text.isEmpty()) { - if (alignment == HAlignment.CENTER) { + if (alignment == Align.center) { x += (w - iconWidth) / 2; } y += (h - iconHeight) / 2; } else { - if (alignment == HAlignment.CENTER) { + if (alignment == Align.center) { float dx; while (true) { dx = (w - iconOffset - getTextWidth()) / 2; @@ -362,7 +362,7 @@ public class FLabel extends FDisplayObject implements IButton { font = font.shrink(); } } - else if (alignment == HAlignment.RIGHT) { + else if (alignment == Align.right) { float dx; while (true) { dx = (w - iconWidth - getTextWidth() - insets.x); @@ -384,7 +384,7 @@ public class FLabel extends FDisplayObject implements IButton { if (!text.isEmpty()) { x += iconOffset; w -= iconOffset; - drawText(g, x, textY, w, h, HAlignment.LEFT); + drawText(g, x, textY, w, h, Align.left); } } else if (!text.isEmpty()) { @@ -392,7 +392,7 @@ public class FLabel extends FDisplayObject implements IButton { } } - private void drawText(Graphics g, float x, float y, float w, float h, HAlignment align) { + private void drawText(Graphics g, float x, float y, float w, float h, Align align) { g.startClip(x, y, w, h); if (textRenderer == null) { g.drawText(text, font, textColor, x, y, w, h, false, align, true); diff --git a/forge-gui-mobile/src/forge/toolbox/FList.java b/forge-gui-mobile/src/forge/toolbox/FList.java index ec66b8d3..f318fc8a 100644 --- a/forge-gui-mobile/src/forge/toolbox/FList.java +++ b/forge-gui-mobile/src/forge/toolbox/FList.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Graphics; import forge.assets.FSkinColor; diff --git a/forge-gui-mobile/src/forge/toolbox/FNumericTextField.java b/forge-gui-mobile/src/forge/toolbox/FNumericTextField.java index b691214c..d96d025b 100644 --- a/forge-gui-mobile/src/forge/toolbox/FNumericTextField.java +++ b/forge-gui-mobile/src/forge/toolbox/FNumericTextField.java @@ -1,6 +1,6 @@ package forge.toolbox; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; public class FNumericTextField extends FTextField { private int value; diff --git a/forge-gui-mobile/src/forge/toolbox/FTextField.java b/forge-gui-mobile/src/forge/toolbox/FTextField.java index c7dd1147..d324f54d 100644 --- a/forge-gui-mobile/src/forge/toolbox/FTextField.java +++ b/forge-gui-mobile/src/forge/toolbox/FTextField.java @@ -1,8 +1,7 @@ package forge.toolbox; import com.badlogic.gdx.Input.Keys; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; -import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Forge; import forge.Forge.KeyInputAdapter; diff --git a/forge-gui-mobile/src/forge/toolbox/FToggleSwitch.java b/forge-gui-mobile/src/forge/toolbox/FToggleSwitch.java index 1a5600ff..54192cc3 100644 --- a/forge-gui-mobile/src/forge/toolbox/FToggleSwitch.java +++ b/forge-gui-mobile/src/forge/toolbox/FToggleSwitch.java @@ -1,6 +1,6 @@ package forge.toolbox; -import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; +import com.badlogic.gdx.graphics.g2d.BitmapFont; import forge.Graphics; import forge.assets.FSkinColor;