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

Fix Build Errors

Browse Source
This commit is contained in:
Jetz
2024-12-04 08:27:37 -05:00
parent 44cf7dbbea
commit db2764f1ce
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-core/src/main/java/forge/item/IPaperCard.java
View File

@@ -5,6 +5,7 @@ import forge.card.CardRules;
import forge.card.ICardFace; import forge.card.ICardFace;
import java.io.Serializable; import java.io.Serializable;
import java.util.Set;
public interface IPaperCard extends InventoryItem, Serializable { public interface IPaperCard extends InventoryItem, Serializable {

4
forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java
View File

@@ -1,6 +1,5 @@
package forge.game.ability.effects; package forge.game.ability.effects;
import com.google.common.base.Functions;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import forge.game.ability.AbilityKey; import forge.game.ability.AbilityKey;
@@ -13,7 +12,6 @@ import forge.game.player.PlayerCollection;
import forge.game.replacement.ReplacementType; import forge.game.replacement.ReplacementType;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.trigger.TriggerType; import forge.game.trigger.TriggerType;
import forge.util.Aggregates;
import forge.util.Lang; import forge.util.Lang;
import forge.util.Localizer; import forge.util.Localizer;
import forge.util.MyRandom; import forge.util.MyRandom;
@@ -197,7 +195,7 @@ public class RollDiceEffect extends SpellAbilityEffect {
runParams.put(AbilityKey.RolledToVisitAttractions, toVisitAttractions); runParams.put(AbilityKey.RolledToVisitAttractions, toVisitAttractions);
player.getGame().getTriggerHandler().runTrigger(TriggerType.RolledDieOnce, runParams, false); player.getGame().getTriggerHandler().runTrigger(TriggerType.RolledDieOnce, runParams, false);
return Aggregates.sum(rolls, Functions.identity()); return rolls.stream().reduce(0, Integer::sum);
} }
private static void resolveSub(SpellAbility sa, int num) { private static void resolveSub(SpellAbility sa, int num) {

7
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
View File

@@ -30,8 +30,6 @@ import javax.swing.JPopupMenu;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import com.google.common.collect.Iterables;
import forge.card.MagicColor; import forge.card.MagicColor;
import forge.deck.CardPool; import forge.deck.CardPool;
import forge.deck.Deck; import forge.deck.Deck;
@@ -66,10 +64,7 @@ import forge.toolbox.ContextMenuBuilder;
import forge.toolbox.FComboBox; import forge.toolbox.FComboBox;
import forge.toolbox.FLabel; import forge.toolbox.FLabel;
import forge.toolbox.FSkin; import forge.toolbox.FSkin;
import forge.util.Aggregates; import forge.util.*;
import forge.util.ItemPool;
import forge.util.Lang;
import forge.util.Localizer;
import forge.view.FView; import forge.view.FView;
/** /**