external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup - Statement lambda -> expression lambda

Browse Source
This commit is contained in:
Jetz
2024-08-10 12:58:32 -04:00
parent a7e1338eea
commit 2fb7ad0c7b
4 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseSets.java
View File

@@ -183,30 +183,28 @@ public class DialogChooseSets {
spinnersEditionTypeMap.put(editionType, spinner); spinnersEditionTypeMap.put(editionType, spinner);
} }
// == SPINNERS ACTION PERFORMED == // == SPINNERS ACTION PERFORMED ==
editionTypeSpinners.forEach(spinner -> { editionTypeSpinners.forEach(spinner -> spinner.addChangeListener(e -> {
spinner.addChangeListener(e -> { // As soon as the value of a spinner becomes different from zero,
// As soon as the value of a spinner becomes different from zero, // enabled the random selection button.
// enabled the random selection button. int spinValue = (int) spinner.getValue();
int spinValue = (int) spinner.getValue(); if (spinValue > 0) {
if (spinValue > 0) { if (!randomSelectionButton.isEnabled())
if (!randomSelectionButton.isEnabled()) randomSelectionButton.setEnabled(true);
randomSelectionButton.setEnabled(true); } else {
} else { // Similarly, when all spinners are set to zero,
// Similarly, when all spinners are set to zero, // disable the random selection button
// disable the random selection button boolean allZeros = true;
boolean allZeros = true; for (FSpinner spin : editionTypeSpinners) {
for (FSpinner spin : editionTypeSpinners) { int value = (int) spin.getValue();
int value = (int) spin.getValue(); if (value != 0) {
if (value != 0) { allZeros = false;
allZeros = false; break;
break; }
} }
} if (allZeros)
if (allZeros) randomSelectionButton.setEnabled(false);
randomSelectionButton.setEnabled(false); }
} }));
});
});
// == ADD SPINNERS AND LABELS TO THE PANEL == // == ADD SPINNERS AND LABELS TO THE PANEL ==
JPanel typeFieldsPanel = null; JPanel typeFieldsPanel = null;

4
forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java
View File

@@ -412,9 +412,7 @@ public enum CSubmenuPreferences implements ICDoc {
final FComboBox<String> comboBox = createComboBox(new String[] {"Off", "AI", "Human For AI"}, userSetting); final FComboBox<String> comboBox = createComboBox(new String[] {"Off", "AI", "Human For AI"}, userSetting);
final String selectedItem = this.prefs.getPref(userSetting); final String selectedItem = this.prefs.getPref(userSetting);
panel.setComboBox(comboBox, selectedItem); panel.setComboBox(comboBox, selectedItem);
comboBox.addActionListener(actionEvent -> { comboBox.addActionListener(actionEvent -> AiProfileUtil.setAiSideboardingMode(AiProfileUtil.AISideboardingMode.normalizedValueOf(comboBox.getSelectedItem())));
AiProfileUtil.setAiSideboardingMode(AiProfileUtil.AISideboardingMode.normalizedValueOf(comboBox.getSelectedItem()));
});
} }
private void initializeSoundSetsComboBox() { private void initializeSoundSetsComboBox() {

12
forge-gui-mobile/src/forge/adventure/scene/ArenaScene.java
View File

@@ -246,13 +246,11 @@ public class ArenaScene extends UIScene implements IAfterMatch {
started = true; started = true;
DuelScene duelScene = DuelScene.instance(); DuelScene duelScene = DuelScene.instance();
EnemySprite enemy = enemies.get(enemies.size - 1); EnemySprite enemy = enemies.get(enemies.size - 1);
FThreads.invokeInEdtNowOrLater(() -> { FThreads.invokeInEdtNowOrLater(() -> Forge.setTransitionScreen(new TransitionScreen(() -> {
Forge.setTransitionScreen(new TransitionScreen(() -> { started = false;
started = false; duelScene.initDuels(WorldStage.getInstance().getPlayerSprite(), enemy, true, null);
duelScene.initDuels(WorldStage.getInstance().getPlayerSprite(), enemy, true, null); Forge.switchScene(duelScene);
Forge.switchScene(duelScene); }, Forge.takeScreenshot(), true, false, false, false, "", Current.player().avatar(), enemy.getAtlasPath(), Current.player().getName(), enemy.getName())));
}, Forge.takeScreenshot(), true, false, false, false, "", Current.player().avatar(), enemy.getAtlasPath(), Current.player().getName(), enemy.getName()));
});
} }
public boolean start() { public boolean start() {

10
forge-gui-mobile/src/forge/adventure/scene/EventScene.java
View File

@@ -547,12 +547,10 @@ public class EventScene extends MenuScene implements IAfterMatch {
DuelScene duelScene = DuelScene.instance(); DuelScene duelScene = DuelScene.instance();
EnemySprite enemy = humanMatch.p2.getSprite(); EnemySprite enemy = humanMatch.p2.getSprite();
currentEvent.nextOpponent = humanMatch.p2; currentEvent.nextOpponent = humanMatch.p2;
FThreads.invokeInEdtNowOrLater(() -> { FThreads.invokeInEdtNowOrLater(() -> Forge.setTransitionScreen(new TransitionScreen(() -> {
Forge.setTransitionScreen(new TransitionScreen(() -> { duelScene.initDuels(WorldStage.getInstance().getPlayerSprite(), enemy, false, currentEvent);
duelScene.initDuels(WorldStage.getInstance().getPlayerSprite(), enemy, false, currentEvent); Forge.switchScene(duelScene);
Forge.switchScene(duelScene); }, Forge.takeScreenshot(), true, false, false, false, "", Current.player().avatar(), enemy.getAtlasPath(), Current.player().getName(), enemy.getName(), humanMatch.p1.getRecord(), humanMatch.p2.getRecord())));
}, Forge.takeScreenshot(), true, false, false, false, "", Current.player().avatar(), enemy.getAtlasPath(), Current.player().getName(), enemy.getName(), humanMatch.p1.getRecord(), humanMatch.p2.getRecord()));
});
} }
else else
{ {