diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java index da65b9c0d6b..0aa65acf1c3 100644 --- a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java +++ b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java @@ -396,7 +396,6 @@ public abstract class DeckGeneratorBase { * @return dual land names */ protected List getDualLandList() { - if (colors.countColors() > 3) { addCardNameToList("Rupture Spire", dLands); addCardNameToList("Undiscovered Paradise", dLands); diff --git a/forge-gui/src/main/java/forge/deck/ArchetypeDeckGenerator.java b/forge-gui/src/main/java/forge/deck/ArchetypeDeckGenerator.java index f53e5f2597b..8d60d7fdb09 100644 --- a/forge-gui/src/main/java/forge/deck/ArchetypeDeckGenerator.java +++ b/forge-gui/src/main/java/forge/deck/ArchetypeDeckGenerator.java @@ -71,7 +71,6 @@ public class ArchetypeDeckGenerator extends DeckProxy implements Comparable nonLands = Iterables.filter(rankedColorList, Predicates.compose(CardRulesPredicates.Presets.IS_NON_LAND, PaperCard.FN_GET_RULES)); @@ -692,7 +690,6 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase { } } - // do not update landsNeeded until after the loop, because the // calculation involves landsNeeded for (int i = 0; i < 5; i++) { @@ -845,7 +842,6 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase { rankedColorList.removeAll(landsToAdd); } - /** * Add random cards to the deck. * @@ -930,8 +926,6 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase { rankedColorList.removeAll(keyCardList); }*/ - - final Map creatureCosts = new HashMap<>(); for (int i = 1; i < 7; i++) { creatureCosts.put(i, 0); diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/GauntletMini.java b/forge-gui/src/main/java/forge/gamemodes/limited/GauntletMini.java index 72b906a4d66..ff7c30fdaea 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/GauntletMini.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/GauntletMini.java @@ -66,7 +66,6 @@ public class GauntletMini { currentRound = 1; } - /** * Advances the tournament to the next round. */ @@ -206,4 +205,3 @@ public class GauntletMini { } } - diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/LimitedWinLoseController.java b/forge-gui/src/main/java/forge/gamemodes/limited/LimitedWinLoseController.java index e223b6cae1a..7626ee542e2 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/LimitedWinLoseController.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/LimitedWinLoseController.java @@ -33,8 +33,7 @@ public abstract class LimitedWinLoseController { if (lastGame.isWinner(GamePlayerUtil.getGuiPlayer())) { gauntlet.addWin(); - } - else { + } else { gauntlet.addLoss(); } diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/SealedCardPoolGenerator.java b/forge-gui/src/main/java/forge/gamemodes/limited/SealedCardPoolGenerator.java index 7625c12a396..fcbf3be5eeb 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/SealedCardPoolGenerator.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/SealedCardPoolGenerator.java @@ -515,8 +515,7 @@ public class SealedCardPoolGenerator { return null; //return null if user canceled } pool.addAllFlat(cards); - } - else { + } else { pool.addAllFlat(prod.get()); } } diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputBlock.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputBlock.java index b44e6ff3d23..a9a1688d3b7 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputBlock.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputBlock.java @@ -83,8 +83,7 @@ public class InputBlock extends InputSyncronizedBase { if (currentAttacker == null) { showMessage(localizer.getMessage("lblSelectBlockTarget")); - } - else { + } else { String attackerName = currentAttacker.isFaceDown() ? localizer.getMessage("lblMorph") : currentAttacker.getName() + " (" + currentAttacker.getId() + ")"; String message = localizer.getMessage("lblSelectBlocker") + attackerName + " " + localizer.getMessage("lblOrSelectBlockTarget"); showMessage(message); @@ -104,8 +103,7 @@ public class InputBlock extends InputSyncronizedBase { // Done blocking setCurrentAttacker(null); stop(); - } - else { + } else { //must run in game thread to prevent problems for mobile game ThreadUtil.invokeInGameThread(new Runnable() { @Override @@ -124,14 +122,12 @@ public class InputBlock extends InputSyncronizedBase { combat.removeFromCombat(card); card.getGame().getMatch().fireEvent(new UiEventBlockerAssigned(CardView.get(card), null)); isCorrectAction = true; - } - else { + } else { // is attacking? if (combat.isAttacking(card)) { setCurrentAttacker(card); isCorrectAction = true; - } - else { + } else { // Make sure this card is valid to even be a blocker if (currentAttacker != null && card.isCreature() && defender.getZone(ZoneType.Battlefield).contains(card)) { if (combat.isBlocking(card, currentAttacker)) { @@ -139,8 +135,7 @@ public class InputBlock extends InputSyncronizedBase { combat.removeBlockAssignment(currentAttacker, card); card.getGame().getMatch().fireEvent(new UiEventBlockerAssigned(CardView.get(card), null)); isCorrectAction = true; - } - else { + } else { isCorrectAction = CombatUtil.canBlock(currentAttacker, card, combat); if (isCorrectAction) { combat.addBlocker(currentAttacker, card); diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputPlaybackControl.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputPlaybackControl.java index 5217ded0a16..5771add050d 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputPlaybackControl.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputPlaybackControl.java @@ -62,8 +62,7 @@ public class InputPlaybackControl extends InputSyncronizedBase { if (isPaused) { control.resume(); setPause(false); - } - else { + } else { control.pause(); setPause(true); } diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectEntitiesFromList.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectEntitiesFromList.java index 96d5984f60c..6664b6779b3 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectEntitiesFromList.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectEntitiesFromList.java @@ -100,8 +100,7 @@ public class InputSelectEntitiesFromList extends InputSele final boolean entityWasSelected = selected.contains(c); if (entityWasSelected) { selected.remove(c); - } - else { + } else { selected.add((T)c); } onSelectStateChanged(c, !entityWasSelected); @@ -124,8 +123,8 @@ public class InputSelectEntitiesFromList extends InputSele @Override protected void onStop() { - getController().getGui().hideZones(getController().getPlayer().getView(),zonesShown); - getController().getGui().clearSelectables(); - super.onStop(); + getController().getGui().hideZones(getController().getPlayer().getView(),zonesShown); + getController().getGui().clearSelectables(); + super.onStop(); } } diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectManyBase.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectManyBase.java index 88523e2cc14..6af0dd5f0d4 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectManyBase.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectManyBase.java @@ -50,8 +50,7 @@ public abstract class InputSelectManyBase extends InputSyn protected void refresh() { if (hasAllTargets()) { selectButtonOK(); - } - else { + } else { this.showMessage(); } } @@ -73,7 +72,7 @@ public abstract class InputSelectManyBase extends InputSyn sb.append("\n\n").append(getMessage()); showMessage(sb.toString(), card); } else { - if (card!=null) { + if (card != null) { showMessage(getMessage(), card); } else { showMessage(getMessage()); @@ -122,6 +121,6 @@ public abstract class InputSelectManyBase extends InputSyn } public final void setCancelAllowed(boolean allow) { - this.allowCancel = allow ; + this.allowCancel = allow; } } diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java index 40b9e87ff34..e43e267af86 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java @@ -119,7 +119,7 @@ public final class InputSelectTargets extends InputSyncronizedBase { final int maxTargets = sa.getMaxTargets(); final int targeted = sa.getTargets().size(); - if(maxTargets > 1) { + if (maxTargets > 1) { sb.append(TextUtil.concatNoSpace("\n(", String.valueOf(maxTargets - targeted), " more can be targeted)")); } @@ -131,7 +131,7 @@ public final class InputSelectTargets extends InputSyncronizedBase { if (divisionValues != null && !divisionValues.isEmpty() && sa.getMinTargets() == 0 && sa.getTargets().size() == 0) { // extra logic for Divided with min targets = 0, should only work if num targets are 0 too getController().getGui().updateButtons(getOwner(), true, true, false); - } else if (!sa.isMinTargetChosen() || (divisionValues != null && !divisionValues.isEmpty())){ + } else if (!sa.isMinTargetChosen() || (divisionValues != null && !divisionValues.isEmpty())) { // If reached Minimum targets, enable OK button if (mandatory && tgt.hasCandidates(sa)) { // Player has to click on a target diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/data/QuestAchievements.java b/forge-gui/src/main/java/forge/gamemodes/quest/data/QuestAchievements.java index e35b1b59e83..ae26c131444 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/data/QuestAchievements.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/data/QuestAchievements.java @@ -269,7 +269,6 @@ public class QuestAchievements { } FModel.getQuest().save(); - } public void addDraftToken() { diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/data/QuestAssets.java b/forge-gui/src/main/java/forge/gamemodes/quest/data/QuestAssets.java index f783536a68e..35dce6ef5f9 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/data/QuestAssets.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/data/QuestAssets.java @@ -244,8 +244,6 @@ public class QuestAssets { this.credits = credits0; } - - // Credits /** * Adds the credits. diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/data/QuestData.java b/forge-gui/src/main/java/forge/gamemodes/quest/data/QuestData.java index e63f3590f2b..390ece7a5a7 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/data/QuestData.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/data/QuestData.java @@ -180,7 +180,6 @@ public class QuestData { * the new name to set */ public void rename(final String newName) { - File newpath = new File(ForgeConstants.QUEST_SAVE_DIR, newName + ".dat"); File oldpath = new File(ForgeConstants.QUEST_SAVE_DIR, this.name + ".dat"); oldpath.renameTo(newpath); @@ -191,7 +190,6 @@ public class QuestData { this.name = newName; QuestDataIO.saveData(this); - } public QuestAssets getAssets() { diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/io/ReadPriceList.java b/forge-gui/src/main/java/forge/gamemodes/quest/io/ReadPriceList.java index 7df6706d71f..180ed91b4ec 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/io/ReadPriceList.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/io/ReadPriceList.java @@ -70,7 +70,6 @@ public class ReadPriceList { * @return a {@link java.util.HashMap} object. */ private Map readFile(final String file) { - final Map map = new HashMap<>(); final List lines = FileUtil.readFile(file); @@ -96,8 +95,7 @@ public class ReadPriceList { float ff; if (MyRandom.getRandom().nextInt(100) < 90) { ff = MyRandom.getRandom().nextInt(10) * (float) .01; - } - else { + } else { // +/- 50% ff = MyRandom.getRandom().nextInt(50) * (float) .01; } diff --git a/forge-gui/src/main/java/forge/util/AbstractGeneticAlgorithm.java b/forge-gui/src/main/java/forge/util/AbstractGeneticAlgorithm.java index c19d45f3eb0..eb30279bc36 100644 --- a/forge-gui/src/main/java/forge/util/AbstractGeneticAlgorithm.java +++ b/forge-gui/src/main/java/forge/util/AbstractGeneticAlgorithm.java @@ -70,8 +70,4 @@ public abstract class AbstractGeneticAlgorithm { protected abstract boolean shouldContinue(); - - - - }