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

Cleanup - More Lambdas to method references

Browse Source
This commit is contained in:
Jetz
2024-08-10 12:54:16 -04:00
parent 4614c6c0c9
commit f7d0929ea0
29 changed files with 62 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-adventure/src/main/java/forge/adventure/editor/BiomeEdit.java
View File

@@ -51,12 +51,12 @@ public class BiomeEdit extends FormPanel {
add(terrain); add(terrain);
add(structures); add(structures);
name.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeEdit.this.updateTerrain())); name.getDocument().addDocumentListener(new DocumentChangeListener(BiomeEdit.this::updateTerrain));
tilesetName.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeEdit.this.updateTerrain())); tilesetName.getDocument().addDocumentListener(new DocumentChangeListener(BiomeEdit.this::updateTerrain));
color.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeEdit.this.updateTerrain())); color.getDocument().addDocumentListener(new DocumentChangeListener(BiomeEdit.this::updateTerrain));
collision.addChangeListener(e -> BiomeEdit.this.updateTerrain()); collision.addChangeListener(e -> BiomeEdit.this.updateTerrain());
spriteNames.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeEdit.this.updateTerrain())); spriteNames.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(BiomeEdit.this::updateTerrain));
enemies.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeEdit.this.updateTerrain())); enemies.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(BiomeEdit.this::updateTerrain));
terrain.addChangeListener(e -> BiomeEdit.this.updateTerrain()); terrain.addChangeListener(e -> BiomeEdit.this.updateTerrain());
@@ -64,7 +64,7 @@ public class BiomeEdit extends FormPanel {
startPointY.addChangeListener(e -> BiomeEdit.this.updateTerrain()); startPointY.addChangeListener(e -> BiomeEdit.this.updateTerrain());
noiseWeight.addChangeListener(e -> BiomeEdit.this.updateTerrain()); noiseWeight.addChangeListener(e -> BiomeEdit.this.updateTerrain());
distWeight.addChangeListener(e -> BiomeEdit.this.updateTerrain()); distWeight.addChangeListener(e -> BiomeEdit.this.updateTerrain());
tilesetAtlas.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeEdit.this.updateTerrain())); tilesetAtlas.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(BiomeEdit.this::updateTerrain));
width.addChangeListener(e -> BiomeEdit.this.updateTerrain()); width.addChangeListener(e -> BiomeEdit.this.updateTerrain());
height.addChangeListener(e -> BiomeEdit.this.updateTerrain()); height.addChangeListener(e -> BiomeEdit.this.updateTerrain());
refresh(); refresh();

4
forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureDataMappingEditor.java
View File

@@ -135,8 +135,8 @@ public class BiomeStructureDataMappingEditor extends JComponent {
add("color:",color); add("color:",color);
add("collision:",collision); add("collision:",collision);
name.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeStructureDataMappingEdit.this.update())); name.getDocument().addDocumentListener(new DocumentChangeListener(BiomeStructureDataMappingEdit.this::update));
color.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeStructureDataMappingEdit.this.update())); color.getDocument().addDocumentListener(new DocumentChangeListener(BiomeStructureDataMappingEdit.this::update));
collision.addChangeListener(e -> BiomeStructureDataMappingEdit.this.update()); collision.addChangeListener(e -> BiomeStructureDataMappingEdit.this.update());
refresh(); refresh();
} }

6
forge-adventure/src/main/java/forge/adventure/editor/BiomeStructureEdit.java
View File

@@ -45,7 +45,7 @@ public class BiomeStructureEdit extends FormPanel {
add(center); add(center);
add(data); add(data);
structureAtlasPath.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeStructureEdit.this.updateStructure())); structureAtlasPath.getDocument().addDocumentListener(new DocumentChangeListener(BiomeStructureEdit.this::updateStructure));
x.addChangeListener(e -> BiomeStructureEdit.this.updateStructure()); x.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
@@ -55,8 +55,8 @@ public class BiomeStructureEdit extends FormPanel {
randomPosition.addChangeListener(e -> BiomeStructureEdit.this.updateStructure()); randomPosition.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
N.addChangeListener(e -> BiomeStructureEdit.this.updateStructure()); N.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
sourcePath.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeStructureEdit.this.updateStructure())); sourcePath.getDocument().addDocumentListener(new DocumentChangeListener(BiomeStructureEdit.this::updateStructure));
maskPath.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeStructureEdit.this.updateStructure())); maskPath.getDocument().addDocumentListener(new DocumentChangeListener(BiomeStructureEdit.this::updateStructure));
periodicInput.addChangeListener(e -> BiomeStructureEdit.this.updateStructure()); periodicInput.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
ground.addChangeListener(e -> BiomeStructureEdit.this.updateStructure()); ground.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());
symmetry.addChangeListener(e -> BiomeStructureEdit.this.updateStructure()); symmetry.addChangeListener(e -> BiomeStructureEdit.this.updateStructure());

2
forge-adventure/src/main/java/forge/adventure/editor/BiomeTerrainEdit.java
View File

@@ -27,7 +27,7 @@ public class BiomeTerrainEdit extends FormPanel {
center.add("resolution:",resolution); center.add("resolution:",resolution);
add(center,preview); add(center,preview);
spriteName.getDocument().addDocumentListener(new DocumentChangeListener(() -> BiomeTerrainEdit.this.updateTerrain())); spriteName.getDocument().addDocumentListener(new DocumentChangeListener(BiomeTerrainEdit.this::updateTerrain));
min.addChangeListener(e -> BiomeTerrainEdit.this.updateTerrain()); min.addChangeListener(e -> BiomeTerrainEdit.this.updateTerrain());
max.addChangeListener(e -> BiomeTerrainEdit.this.updateTerrain()); max.addChangeListener(e -> BiomeTerrainEdit.this.updateTerrain());

4
forge-adventure/src/main/java/forge/adventure/editor/DialogOptionEdit.java
View File

@@ -40,8 +40,8 @@ public class DialogOptionEdit extends FormPanel {
add(middle); add(middle);
name.getDocument().addDocumentListener(new DocumentChangeListener(() -> DialogOptionEdit.this.updateDialog())); name.getDocument().addDocumentListener(new DocumentChangeListener(DialogOptionEdit.this::updateDialog));
text.getDocument().addDocumentListener(new DocumentChangeListener(() -> DialogOptionEdit.this.updateDialog())); text.getDocument().addDocumentListener(new DocumentChangeListener(DialogOptionEdit.this::updateDialog));
} }

2
forge-adventure/src/main/java/forge/adventure/editor/EditorMainWindow.java
View File

@@ -42,7 +42,7 @@ public class EditorMainWindow extends JFrame {
BorderLayout layout=new BorderLayout(); BorderLayout layout=new BorderLayout();
JToolBar toolBar = new JToolBar("toolbar"); JToolBar toolBar = new JToolBar("toolbar");
JButton newButton=new JButton("open ParticleEditor"); JButton newButton=new JButton("open ParticleEditor");
newButton.addActionListener(e -> EventQueue.invokeLater(() ->new ParticleEditor())); newButton.addActionListener(e -> EventQueue.invokeLater(ParticleEditor::new));
toolBar.add(newButton); toolBar.add(newButton);
setLayout(layout); setLayout(layout);
toolBar.setFloatable(false); toolBar.setFloatable(false);

4
forge-adventure/src/main/java/forge/adventure/editor/EffectEditor.java
View File

@@ -42,8 +42,8 @@ public class EffectEditor extends JComponent {
lifeModifier.addChangeListener(e -> EffectEditor.this.updateEffect()); lifeModifier.addChangeListener(e -> EffectEditor.this.updateEffect());
moveSpeed.addChangeListener(e -> EffectEditor.this.updateEffect()); moveSpeed.addChangeListener(e -> EffectEditor.this.updateEffect());
colorView.addChangeListener(e -> EffectEditor.this.updateEffect()); colorView.addChangeListener(e -> EffectEditor.this.updateEffect());
name.getDocument().addDocumentListener(new DocumentChangeListener(() -> EffectEditor.this.updateEffect())); name.getDocument().addDocumentListener(new DocumentChangeListener(EffectEditor.this::updateEffect));
startBattleWithCard.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> EffectEditor.this.updateEffect())); startBattleWithCard.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(EffectEditor.this::updateEffect));
if(opponent!=null) if(opponent!=null)
opponent.addChangeListener(e -> EffectEditor.this.updateEffect()); opponent.addChangeListener(e -> EffectEditor.this.updateEffect());

2
forge-adventure/src/main/java/forge/adventure/editor/EnemyEdit.java
View File

@@ -289,7 +289,7 @@ public class EnemyEdit extends FormPanel {
tags.add(e.nextElement()); tags.add(e.nextElement());
} }
tags.removeIf(q -> q.isEmpty()); tags.removeIf(String::isEmpty);
currentData.questTags = tags.toArray(currentData.questTags); currentData.questTags = tags.toArray(currentData.questTags);
QuestController.getInstance().refresh(); QuestController.getInstance().refresh();
filterExisting(enemyModel); filterExisting(enemyModel);

8
forge-adventure/src/main/java/forge/adventure/editor/ItemEdit.java
View File

@@ -38,10 +38,10 @@ public class ItemEdit extends JComponent {
add(effect); add(effect);
add(new Box.Filler(new Dimension(0,0),new Dimension(0,Integer.MAX_VALUE),new Dimension(0,Integer.MAX_VALUE))); add(new Box.Filler(new Dimension(0,0),new Dimension(0,Integer.MAX_VALUE),new Dimension(0,Integer.MAX_VALUE)));
nameField.getDocument().addDocumentListener(new DocumentChangeListener(() -> ItemEdit.this.updateItem())); nameField.getDocument().addDocumentListener(new DocumentChangeListener(ItemEdit.this::updateItem));
equipmentSlot.getDocument().addDocumentListener(new DocumentChangeListener(() -> ItemEdit.this.updateItem())); equipmentSlot.getDocument().addDocumentListener(new DocumentChangeListener(ItemEdit.this::updateItem));
description.getDocument().addDocumentListener(new DocumentChangeListener(() -> ItemEdit.this.updateItem())); description.getDocument().addDocumentListener(new DocumentChangeListener(ItemEdit.this::updateItem));
iconName.getDocument().addDocumentListener(new DocumentChangeListener(() -> ItemEdit.this.updateItem())); iconName.getDocument().addDocumentListener(new DocumentChangeListener(ItemEdit.this::updateItem));
cost.addChangeListener(e -> ItemEdit.this.updateItem()); cost.addChangeListener(e -> ItemEdit.this.updateItem());
questItem.addChangeListener(e -> ItemEdit.this.updateItem()); questItem.addChangeListener(e -> ItemEdit.this.updateItem());
effect.addChangeListener(e -> ItemEdit.this.updateItem()); effect.addChangeListener(e -> ItemEdit.this.updateItem());

22
forge-adventure/src/main/java/forge/adventure/editor/RewardEdit.java
View File

@@ -58,18 +58,18 @@ public class RewardEdit extends FormPanel {
probability.addChangeListener(e -> RewardEdit.this.updateReward()); probability.addChangeListener(e -> RewardEdit.this.updateReward());
count.addChangeListener(e -> RewardEdit.this.updateReward()); count.addChangeListener(e -> RewardEdit.this.updateReward());
addMaxCount.addChangeListener(e -> RewardEdit.this.updateReward()); addMaxCount.addChangeListener(e -> RewardEdit.this.updateReward());
cardName.getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward())); cardName.getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
itemName.getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward())); itemName.getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
editions.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward())); editions.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
colors.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward())); colors.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
rarity.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward())); rarity.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
subTypes.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward())); subTypes.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
cardTypes.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward())); cardTypes.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
superTypes.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward())); superTypes.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
manaCosts.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward())); manaCosts.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
keyWords.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward())); keyWords.getEdit().getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
colorType.addActionListener((e -> RewardEdit.this.updateReward())); colorType.addActionListener((e -> RewardEdit.this.updateReward()));
cardText.getDocument().addDocumentListener(new DocumentChangeListener(() -> RewardEdit.this.updateReward())); cardText.getDocument().addDocumentListener(new DocumentChangeListener(RewardEdit.this::updateReward));
} }

4
forge-ai/src/main/java/forge/ai/ability/EffectAi.java
View File

@@ -427,7 +427,7 @@ public class EffectAi extends SpellAbilityAi {
if (sa.usesTargeting() && !sa.getTargetRestrictions().canTgtPlayer()) { if (sa.usesTargeting() && !sa.getTargetRestrictions().canTgtPlayer()) {
// try to target the opponent's best targetable permanent, if able // try to target the opponent's best targetable permanent, if able
CardCollection oppPerms = CardLists.getValidCards(aiPlayer.getOpponents().getCardsIn(sa.getTargetRestrictions().getZone()), sa.getTargetRestrictions().getValidTgts(), aiPlayer, sa.getHostCard(), sa); CardCollection oppPerms = CardLists.getValidCards(aiPlayer.getOpponents().getCardsIn(sa.getTargetRestrictions().getZone()), sa.getTargetRestrictions().getValidTgts(), aiPlayer, sa.getHostCard(), sa);
oppPerms = CardLists.filter(oppPerms, card -> sa.canTarget(card)); oppPerms = CardLists.filter(oppPerms, sa::canTarget);
if (!oppPerms.isEmpty()) { if (!oppPerms.isEmpty()) {
sa.resetTargets(); sa.resetTargets();
sa.getTargets().add(ComputerUtilCard.getBestAI(oppPerms)); sa.getTargets().add(ComputerUtilCard.getBestAI(oppPerms));
@@ -437,7 +437,7 @@ public class EffectAi extends SpellAbilityAi {
if (mandatory) { if (mandatory) {
// try to target the AI's worst targetable permanent, if able // try to target the AI's worst targetable permanent, if able
CardCollection aiPerms = CardLists.getValidCards(aiPlayer.getCardsIn(sa.getTargetRestrictions().getZone()), sa.getTargetRestrictions().getValidTgts(), aiPlayer, sa.getHostCard(), sa); CardCollection aiPerms = CardLists.getValidCards(aiPlayer.getCardsIn(sa.getTargetRestrictions().getZone()), sa.getTargetRestrictions().getValidTgts(), aiPlayer, sa.getHostCard(), sa);
aiPerms = CardLists.filter(aiPerms, card -> sa.canTarget(card)); aiPerms = CardLists.filter(aiPerms, sa::canTarget);
if (!aiPerms.isEmpty()) { if (!aiPerms.isEmpty()) {
sa.resetTargets(); sa.resetTargets();
sa.getTargets().add(ComputerUtilCard.getWorstAI(aiPerms)); sa.getTargets().add(ComputerUtilCard.getWorstAI(aiPerms));

2
forge-core/src/main/java/forge/ImageKeys.java
View File

@@ -323,7 +323,7 @@ public final class ImageKeys {
} }
public static boolean hasSetLookup(String filename) { public static boolean hasSetLookup(String filename) {
if (!StaticData.instance().getSetLookup().isEmpty()) { if (!StaticData.instance().getSetLookup().isEmpty()) {
return StaticData.instance().getSetLookup().keySet().stream().anyMatch(setKey -> filename.startsWith(setKey)); return StaticData.instance().getSetLookup().keySet().stream().anyMatch(filename::startsWith);
} }
return false; return false;

2
forge-game/src/main/java/forge/game/card/CardProperty.java
View File

@@ -1602,7 +1602,7 @@ public class CardProperty {
if (!(property.contains("LKI") ? lki : card).isAttacking()) return false; if (!(property.contains("LKI") ? lki : card).isAttacking()) return false;
if (property.equals("attacking")) return true; if (property.equals("attacking")) return true;
if (property.endsWith("Alone")) { if (property.endsWith("Alone")) {
return CardLists.count(card.getGame().getLastStateBattlefield(), c -> c.isAttacking()) == 1; return CardLists.count(card.getGame().getLastStateBattlefield(), Card::isAttacking) == 1;
} }
if (property.equals("attackingYou")) return combat.isAttacking(card, sourceController); if (property.equals("attackingYou")) return combat.isAttacking(card, sourceController);
if (property.equals("attackingSame")) { if (property.equals("attackingSame")) {

4
forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java
View File

@@ -52,8 +52,8 @@ public class DeckSelectScene extends UIScene {
back = ui.findActor("return"); back = ui.findActor("return");
edit = ui.findActor("edit"); edit = ui.findActor("edit");
rename = ui.findActor("rename"); rename = ui.findActor("rename");
ui.onButtonPress("return", () -> DeckSelectScene.this.back()); ui.onButtonPress("return", DeckSelectScene.this::back);
ui.onButtonPress("edit", () -> DeckSelectScene.this.edit()); ui.onButtonPress("edit", DeckSelectScene.this::edit);
ui.onButtonPress("rename", () -> { ui.onButtonPress("rename", () -> {
textInput.setText(Current.player().getSelectedDeck().getName()); textInput.setText(Current.player().getSelectedDeck().getName());
showRenameDialog(); showRenameDialog();

8
forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java
View File

@@ -173,10 +173,10 @@ public class NewGameScene extends MenuScene {
gender.setCurrentIndex(rand.nextInt()); gender.setCurrentIndex(rand.nextInt());
colorId.setCurrentIndex(rand.nextInt()); colorId.setCurrentIndex(rand.nextInt());
race.setCurrentIndex(rand.nextInt()); race.setCurrentIndex(rand.nextInt());
ui.onButtonPress("back", () -> NewGameScene.this.back()); ui.onButtonPress("back", NewGameScene.this::back);
ui.onButtonPress("start", () -> NewGameScene.this.start()); ui.onButtonPress("start", NewGameScene.this::start);
ui.onButtonPress("leftAvatar", () -> NewGameScene.this.leftAvatar()); ui.onButtonPress("leftAvatar", NewGameScene.this::leftAvatar);
ui.onButtonPress("rightAvatar", () -> NewGameScene.this.rightAvatar()); ui.onButtonPress("rightAvatar", NewGameScene.this::rightAvatar);
difficultyHelp.addListener(new ClickListener(){ public void clicked(InputEvent e, float x, float y){ showDifficultyHelp(); }}); difficultyHelp.addListener(new ClickListener(){ public void clicked(InputEvent e, float x, float y){ showDifficultyHelp(); }});
modeHelp.addListener(new ClickListener(){ public void clicked(InputEvent e, float x, float y){ showModeHelp(); }}); modeHelp.addListener(new ClickListener(){ public void clicked(InputEvent e, float x, float y){ showModeHelp(); }});
} }

2
forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java
View File

@@ -114,7 +114,7 @@ public class SpellSmithScene extends UIScene {
} }
} }
ui.onButtonPress("done", () -> SpellSmithScene.this.done()); ui.onButtonPress("done", SpellSmithScene.this::done);
ui.onButtonPress("pullUsingGold", () -> SpellSmithScene.this.pullCard(false)); ui.onButtonPress("pullUsingGold", () -> SpellSmithScene.this.pullCard(false));
ui.onButtonPress("pullUsingShards", () -> SpellSmithScene.this.pullCard(true)); ui.onButtonPress("pullUsingShards", () -> SpellSmithScene.this.pullCard(true));
ui.onButtonPress("BReset", () -> { ui.onButtonPress("BReset", () -> {

6
forge-gui-mobile/src/forge/adventure/util/KeyBoardDialog.java
View File

@@ -123,11 +123,11 @@ public class KeyBoardDialog extends Dialog {
key0 = Controls.newTextButton("0", () -> kbLabel.setText(kbLabel.getText()+"0")); key0 = Controls.newTextButton("0", () -> kbLabel.setText(kbLabel.getText()+"0"));
keyDot = Controls.newTextButton(".", () -> kbLabel.setText(kbLabel.getText()+".")); keyDot = Controls.newTextButton(".", () -> kbLabel.setText(kbLabel.getText()+"."));
keyComma = Controls.newTextButton(",", () -> kbLabel.setText(kbLabel.getText()+",")); keyComma = Controls.newTextButton(",", () -> kbLabel.setText(kbLabel.getText()+","));
keyShift = Controls.newTextButton("Aa", () -> shiftKey()); keyShift = Controls.newTextButton("Aa", this::shiftKey);
keyBackspace = Controls.newTextButton("<<", () -> kbLabel.setText(removeLastChar(String.valueOf(kbLabel.getText())))); keyBackspace = Controls.newTextButton("<<", () -> kbLabel.setText(removeLastChar(String.valueOf(kbLabel.getText()))));
keySpace = Controls.newTextButton("SPACE", () -> kbLabel.setText(kbLabel.getText()+" ")); keySpace = Controls.newTextButton("SPACE", () -> kbLabel.setText(kbLabel.getText()+" "));
keyOK = Controls.newTextButton("OK", () -> setKeyboardDialogText()); keyOK = Controls.newTextButton("OK", this::setKeyboardDialogText);
keyAbort = Controls.newTextButton("Abort", () -> abortKeyInput()); keyAbort = Controls.newTextButton("Abort", this::abortKeyInput);
this.getContentTable().add(kbLabel).width(220).height(20).colspan(10).expandX().align(Align.center); this.getContentTable().add(kbLabel).width(220).height(20).colspan(10).expandX().align(Align.center);
this.getButtonTable().row(); this.getButtonTable().row();
this.getButtonTable().add(key1).width(20).height(20); this.getButtonTable().add(key1).width(20).height(20);

8
forge-gui-mobile/src/forge/adventure/world/SimpleTiledModel.java
View File

@@ -143,18 +143,14 @@ public class SimpleTiledModel extends Model {
for (int t = 0; t < cardinality; t++) { for (int t = 0; t < cardinality; t++) {
ColorMap xtileData = tileData.get(tilename); ColorMap xtileData = tileData.get(tilename);
this.tiles.add( this.tiles.add(
tile.apply( tile.apply(xtileData::getColor)
(Integer x, Integer y) -> (xtileData.getColor(x, y))
)
); );
this.tilenames.add(String.format("%s %s", tilename, t)); this.tilenames.add(String.format("%s %s", tilename, t));
} }
} else { } else {
ColorMap xtileData = tileData.get(tilename); ColorMap xtileData = tileData.get(tilename);
this.tiles.add( this.tiles.add(
tile.apply( tile.apply(xtileData::getColor)
(Integer x, Integer y) -> (xtileData.getColor(x, y))
)
); );
this.tilenames.add(String.format("%s 0", tilename)); this.tilenames.add(String.format("%s 0", tilename));

2
forge-gui-mobile/src/forge/screens/LoadingOverlay.java
View File

@@ -57,7 +57,7 @@ public class LoadingOverlay extends FOverlay {
loader.show(); loader.show();
FThreads.invokeInBackgroundThread(() -> { FThreads.invokeInBackgroundThread(() -> {
task.run(); task.run();
FThreads.invokeInEdtLater(() -> loader.hide()); FThreads.invokeInEdtLater(loader::hide);
}); });
} }

2
forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java
View File

@@ -115,7 +115,7 @@ public class OnlineLobbyScreen extends LobbyScreen implements IOnlineLobby {
} }
chatInterface.addMessage(result); chatInterface.addMessage(result);
if (!joinServer) { if (!joinServer) {
FThreads.invokeInBackgroundThread(() -> NetConnectUtil.copyHostedServerUrl()); FThreads.invokeInBackgroundThread(NetConnectUtil::copyHostedServerUrl);
} }
//update menu buttons //update menu buttons
OnlineScreen.Lobby.update(); OnlineScreen.Lobby.update();

2
forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java
View File

@@ -37,7 +37,7 @@ public class NewConquestScreen extends MultiStepWizardScreen<NewConquestScreenMo
@Override @Override
protected void finish() { protected void finish() {
//create new quest in game thread so option panes can wait for input //create new quest in game thread so option panes can wait for input
ThreadUtil.invokeInGameThread(() -> newConquest()); ThreadUtil.invokeInGameThread(this::newConquest);
} }
private void newConquest() { private void newConquest() {

2
forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
View File

@@ -181,7 +181,7 @@ public class NewQuestScreen extends FScreen {
private final FLabel btnEmbark = add(new FLabel.ButtonBuilder() private final FLabel btnEmbark = add(new FLabel.ButtonBuilder()
.font(FSkinFont.get(22)).text(Forge.getLocalizer().getMessage("lblEmbark")).icon(FSkinImage.QUEST_ZEP).command(event -> { .font(FSkinFont.get(22)).text(Forge.getLocalizer().getMessage("lblEmbark")).icon(FSkinImage.QUEST_ZEP).command(event -> {
//create new quest in game thread so option panes can wait for input //create new quest in game thread so option panes can wait for input
ThreadUtil.invokeInGameThread(() -> newQuest()); ThreadUtil.invokeInGameThread(this::newQuest);
}).build()); }).build());
public NewQuestScreen() { public NewQuestScreen() {

2
forge-gui-mobile/src/forge/screens/quest/QuestLaunchScreen.java
View File

@@ -24,7 +24,7 @@ public abstract class QuestLaunchScreen extends LaunchScreen {
protected void startMatch() { protected void startMatch() {
FThreads.invokeInBackgroundThread(() -> { FThreads.invokeInBackgroundThread(() -> {
if (QuestUtil.canStartGame()) { if (QuestUtil.canStartGame()) {
FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), true, () -> QuestUtil.finishStartingGame())); FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), true, QuestUtil::finishStartingGame));
return; return;
} }
}); });

4
forge-gui-mobile/src/forge/screens/quest/QuestMenu.java
View File

@@ -51,14 +51,14 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats {
//invoke in background thread so prompts can work //invoke in background thread so prompts can work
ThreadUtil.invokeInGameThread(() -> { ThreadUtil.invokeInGameThread(() -> {
QuestUtil.chooseAndUnlockEdition(); QuestUtil.chooseAndUnlockEdition();
FThreads.invokeInEdtLater(() -> updateCurrentQuestScreen()); FThreads.invokeInEdtLater(QuestMenu::updateCurrentQuestScreen);
}); });
}); });
private static final FMenuItem travelItem = new FMenuItem(Forge.getLocalizer().getMessage("btnTravel"), FSkinImage.QUEST_MAP, event -> { private static final FMenuItem travelItem = new FMenuItem(Forge.getLocalizer().getMessage("btnTravel"), FSkinImage.QUEST_MAP, event -> {
//invoke in background thread so prompts can work //invoke in background thread so prompts can work
ThreadUtil.invokeInGameThread(() -> { ThreadUtil.invokeInGameThread(() -> {
QuestUtil.travelWorld(); QuestUtil.travelWorld();
FThreads.invokeInEdtLater(() -> updateCurrentQuestScreen()); FThreads.invokeInEdtLater(QuestMenu::updateCurrentQuestScreen);
}); });
}); });
private static final FMenuItem prefsItem = new FMenuItem(Forge.getLocalizer().getMessage("Preferences"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS, event -> setCurrentScreen(prefsScreen)); private static final FMenuItem prefsItem = new FMenuItem(Forge.getLocalizer().getMessage("Preferences"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS, event -> setCurrentScreen(prefsScreen));

2
forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
View File

@@ -64,7 +64,7 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
else { else {
inventoryPage.activateItems(items); inventoryPage.activateItems(items);
} }
FThreads.invokeInEdtLater(() -> updateCreditsLabel()); FThreads.invokeInEdtLater(this::updateCreditsLabel);
}); });
}); });
} }

6
forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
View File

@@ -84,19 +84,19 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
controller = new QuestTournamentController(this); controller = new QuestTournamentController(this);
btnSpendToken.setCommand(event -> { btnSpendToken.setCommand(event -> {
//must run in background thread to handle alerts //must run in background thread to handle alerts
FThreads.invokeInBackgroundThread(() -> controller.spendToken()); FThreads.invokeInBackgroundThread(controller::spendToken);
}); });
btnEditDeck.setCommand(event -> editDeck(true)); btnEditDeck.setCommand(event -> editDeck(true));
btnLeaveTournament.setCommand(event -> { btnLeaveTournament.setCommand(event -> {
//must run in background thread to handle alerts //must run in background thread to handle alerts
FThreads.invokeInBackgroundThread(() -> controller.endTournamentAndAwardPrizes()); FThreads.invokeInBackgroundThread(controller::endTournamentAndAwardPrizes);
}); });
// TODO: is it possible to somehow reuse the original btnEditDeck/btnLeaveTournament // TODO: is it possible to somehow reuse the original btnEditDeck/btnLeaveTournament
btnEditDeckInTourn.setCommand(event -> editDeck(true)); btnEditDeckInTourn.setCommand(event -> editDeck(true));
btnLeaveTournamentInTourn.setCommand(event -> { btnLeaveTournamentInTourn.setCommand(event -> {
//must run in background thread to handle alerts //must run in background thread to handle alerts
FThreads.invokeInBackgroundThread(() -> controller.endTournamentAndAwardPrizes()); FThreads.invokeInBackgroundThread(controller::endTournamentAndAwardPrizes);
}); });
pnlPrepareDeck.add(btnEditDeck); pnlPrepareDeck.add(btnEditDeck);

2
forge-gui/src/main/java/forge/deck/DeckProxy.java
View File

@@ -35,8 +35,6 @@ public class DeckProxy implements InventoryItem {
protected final String deckType; protected final String deckType;
protected final IStorage<? extends IHasName> storage; protected final IStorage<? extends IHasName> storage;
public static final Function<DeckProxy, String> FN_GET_NAME = arg0 -> arg0.getName();
// cached values // cached values
protected ColorSet color; protected ColorSet color;
protected ColorSet colorIdentity; protected ColorSet colorIdentity;

2
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -2589,7 +2589,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
final Card card = gameCacheCounters.get(cv); final Card card = gameCacheCounters.get(cv);
final ImmutableList<CounterType> counters = subtract ? ImmutableList.copyOf(card.getCounters().keySet()) final ImmutableList<CounterType> counters = subtract ? ImmutableList.copyOf(card.getCounters().keySet())
: ImmutableList.copyOf(Collections2.transform(CounterEnumType.values, input -> CounterType.get(input))); : ImmutableList.copyOf(Collections2.transform(CounterEnumType.values, CounterType::get));
final CounterType counter = getGui().oneOrNone(localizer.getMessage("lblWhichTypeofCounter"), counters); final CounterType counter = getGui().oneOrNone(localizer.getMessage("lblWhichTypeofCounter"), counters);
if (counter == null) { if (counter == null) {

2
forge-lda/src/forge/lda/lda/inference/internal/Documents.java
View File

@@ -45,7 +45,7 @@ class Documents {
//System.out.println(docID); //System.out.println(docID);
//System.out.println(bow.getWords(docID).toString()); //System.out.println(bow.getWords(docID).toString());
return bow.getWords(docID).stream() return bow.getWords(docID).stream()
.map(id -> vocabs.get(id)) .map(vocabs::get)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }