diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java index 2ab3358a9f0..3a601829df9 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java @@ -184,7 +184,6 @@ public class ListCardArea extends CardArea { //update index of dragged card in hand zone to match new index within hand area final int index = getCardPanels().indexOf(dragPanel); if (validIndex(dragCard,index)) { - System.out.print("Really move card to index "); System.out.println(index); synchronized (cardList) { cardList.remove(dragCard); cardList.add(index, dragCard); @@ -195,10 +194,8 @@ public class ListCardArea extends CardArea { } private void loadLocation() { - System.out.println("loadlocation"); if (locPref != null) { String value = prefs.getPref(locPref); - System.out.print(locPref); System.out.println(value); if (value.length() > 0) { String[] coords = value.split(COORD_DELIM); if (coords.length == 4) { diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java index 5a361c87e49..789fa67d32c 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchController.java +++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java @@ -523,7 +523,8 @@ public class MatchController extends AbstractGuiGame { @Override public List manipulateCardList(final String title, final List cards, final List manipulable, final boolean toTop, final boolean toBottom, final boolean toAnywhere) { - return null; // pfps not implemented yet + System.err.println("Not implemented yet - should never be called"); + return null; } @Override diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 8874ca43c9a..8526c486a62 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -349,9 +349,9 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont } private boolean useSelectCardsInput(final FCollectionView sourceList) { + if ( FThreads.isGuiThread() ) { return false; } // can't use InputSelect from GUI thread (e.g., DevMode Tutor) // if UI_SELECT_FROM_CARD_DISPLAYS not set use InputSelect only for battlefield and player hand - // if UI_SELECT_FROM_CARD_DISPLAYS set use InputSelect for any zone that can be shown - if ( FThreads.isGuiThread() ) { return false; } // also can't use InputSelect from GUI thread (e.g., DevMode Tutor) + // if UI_SELECT_FROM_CARD_DISPLAYS set and using desktop GUI use InputSelect for any zone that can be shown for (final GameEntity c : sourceList) { if (c instanceof Player) { continue; @@ -362,7 +362,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont final Zone cz = ((Card) c).getZone(); final boolean useUiPointAtCard = cz != null && - FModel.getPreferences().getPrefBoolean(FPref.UI_SELECT_FROM_CARD_DISPLAYS) ? + (FModel.getPreferences().getPrefBoolean(FPref.UI_SELECT_FROM_CARD_DISPLAYS) && (!GuiBase.getInterface().isLibgdxPort()) ) ? (cz.is(ZoneType.Battlefield) || cz.is(ZoneType.Hand) || cz.is(ZoneType.Library) || cz.is(ZoneType.Graveyard) || cz.is(ZoneType.Exile) || cz.is(ZoneType.Flashback) || cz.is(ZoneType.Command)) : (cz.is(ZoneType.Hand) && cz.getPlayer() == player || cz.is(ZoneType.Battlefield)); @@ -758,14 +758,14 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont CardCollection toTop = null; tempShowCards(topN); - if ( FModel.getPreferences().getPrefBoolean(FPref.UI_SELECT_FROM_CARD_DISPLAYS) ) { + if ( FModel.getPreferences().getPrefBoolean(FPref.UI_SELECT_FROM_CARD_DISPLAYS) && + (!GuiBase.getInterface().isLibgdxPort()) ) { ArrayList cardList = new ArrayList(); // pfps there must be a better way for (final Card card : player.getCardsIn(ZoneType.Library)) { cardList.add(card); } ImmutablePair result = arrangeForMove("Move cards to top or bottom of library", cardList, topN, true, true); - System.out.print("Arrange "); System.out.println(result); toTop = result.getLeft(); toBottom = result.getRight(); } else {