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

Merge branch 'master' into historicformats

Browse Source 
# Conflicts:
#	forge-game/src/main/java/forge/game/GameFormat.java
This commit is contained in:
maustin
2018-04-18 23:00:56 +01:00
parent f2ae137947 77da5c973b
commit 53a03b94d4
86 changed files with 343 additions and 9847 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-gui-desktop/src/main/java/forge/screens/deckeditor/SEditorIO.java
View File

@@ -14,7 +14,6 @@ import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.ImmutableList;
import forge.model.FModel;
import forge.quest.data.QuestPreferences.QPref;
/**
* Handles editor preferences saving and loading.

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

@@ -500,7 +500,6 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
* @param qty a negative quantity will prompt the user for a number
*/
private void addMakeFoil(final int qty) {
final int shortcutModifiers = 0;
String label = "Foil " + SItemManagerUtil.getItemDisplayString(getItemManager().getSelectedItems(), qty, false);
GuiUtils.addMenuItem(menu, label, null, new Runnable() {
@@ -526,7 +525,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
cardManager.addItem(foiledCard, quantity);
cardManager.setSelectedItem(foiledCard);
}
}, true, shortcutModifiers == 0);
}, true, true);
}
private void addItem(final String verb, final String dest, final boolean toAlternate, final int qty, final int shortcutModifiers) {

1
forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java
View File

@@ -8,7 +8,6 @@ import javax.swing.SwingUtilities;
import com.google.common.collect.Iterables;
import forge.deck.CommanderDeckGenerator;
import forge.deck.DeckProxy;
import forge.deck.DeckType;
import forge.deckchooser.DecksComboBoxEvent;

1
forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
View File

@@ -19,7 +19,6 @@ import javax.swing.SwingConstants;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import forge.deckchooser.DecksComboBoxEvent;
import net.miginfocom.swing.MigLayout;
import com.google.common.collect.ImmutableList;

1
forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/VSubmenuGauntletQuick.java
View File

@@ -7,7 +7,6 @@ import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab;
import forge.gui.framework.EDocID;
import forge.model.FModel;
import forge.properties.ForgePreferences;
import forge.screens.home.EMenuGroup;
import forge.screens.home.IVSubmenu;
import forge.screens.home.StartButton;

2
forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
View File

@@ -932,7 +932,7 @@ public final class CMatchUI
if (delayedReveal != null) {
reveal(delayedReveal.getMessagePrefix(), delayedReveal.getCards()); //TODO: Merge this into search dialog
}
return (List) order(title,"Selected", 0, optionList.size(), optionList, null, null, false);
return (List<GameEntityView>) order(title,"Selected", 0, optionList.size(), optionList, null, null, false);
}
@Override

15
forge-gui-desktop/src/main/java/forge/view/FView.java
View File

@@ -287,6 +287,11 @@ public enum FView {
updateWarningOverlay.add(updateWarningContentPanel, constraints);
btnRemindMeLater.setCommand(new UiCommand() {
/**
*
*/
private static final long serialVersionUID = 1L;
@Override
public void run() {
SOverlayUtils.hideOverlay();
@@ -294,6 +299,11 @@ public enum FView {
});
btnDoNotRemindMe.setCommand(new UiCommand() {
/**
*
*/
private static final long serialVersionUID = 1L;
@Override
public void run() {
if (FOptionPane.showConfirmDialog("Are you sure? You can re-enable this warning in Forge's general preferences.")) {
@@ -305,6 +315,11 @@ public enum FView {
});
btnDownloadLatestJava.setCommand(new UiCommand() {
/**
*
*/
private static final long serialVersionUID = 1L;
@Override
public void run() {
try {

2
forge-gui-desktop/src/main/java/forge/view/Main.java
View File

@@ -28,7 +28,7 @@ import forge.error.ExceptionHandler;
*/
public final class Main {
/**
* Main entrypoint for Forge
* Main entry point for Forge
*/
public static void main(final String[] args) {
// HACK - temporary solution to "Comparison method violates it's general contract!" crash