4
4
*/
5
5
package net .minecraftforge .installer ;
6
6
7
- import java .awt .BorderLayout ;
8
7
import java .awt .Color ;
9
- import java .awt .Component ;
10
8
import java .awt .Desktop ;
11
9
import java .awt .EventQueue ;
12
- import java .awt .Frame ;
13
10
import java .awt .event .ActionEvent ;
14
- import java .awt .event .ActionListener ;
15
- import java .awt .event .MouseAdapter ;
16
- import java .awt .event .MouseEvent ;
17
- import java .awt .event .MouseMotionListener ;
18
11
import java .awt .image .BufferedImage ;
19
- import java .io .ByteArrayInputStream ;
20
12
import java .io .File ;
21
13
import java .io .IOException ;
22
14
import java .io .InputStream ;
23
15
import java .net .URI ;
24
- import java .util .ArrayList ;
25
16
import java .util .HashMap ;
26
- import java .util .List ;
27
17
import java .util .Map ;
28
- import java .util .Optional ;
29
18
import java .util .function .Function ;
30
- import java .util .function .Predicate ;
31
19
32
20
import javax .imageio .ImageIO ;
33
21
import javax .swing .AbstractAction ;
36
24
import javax .swing .ButtonGroup ;
37
25
import javax .swing .ImageIcon ;
38
26
import javax .swing .JButton ;
39
- import javax .swing .JCheckBox ;
40
27
import javax .swing .JDialog ;
41
28
import javax .swing .JFileChooser ;
42
29
import javax .swing .JLabel ;
43
- import javax .swing .JList ;
44
30
import javax .swing .JOptionPane ;
45
31
import javax .swing .JPanel ;
46
32
import javax .swing .JRadioButton ;
47
- import javax .swing .JScrollPane ;
48
33
import javax .swing .JTextField ;
49
- import javax .swing .ListCellRenderer ;
50
- import javax .swing .SwingConstants ;
51
34
import javax .swing .border .LineBorder ;
52
35
53
36
import net .minecraftforge .installer .actions .Action ;
54
37
import net .minecraftforge .installer .actions .ActionCanceledException ;
55
38
import net .minecraftforge .installer .actions .Actions ;
56
39
import net .minecraftforge .installer .actions .ProgressCallback ;
57
- import net .minecraftforge .installer .json .Install ;
58
40
import net .minecraftforge .installer .json .InstallV1 ;
59
- import net .minecraftforge .installer .json .Mirror ;
60
- import net .minecraftforge .installer .json .OptionalLibrary ;
61
- import net .minecraftforge .installer .json .Util ;
62
41
63
42
@ SuppressWarnings ("unused" )
64
43
public class InstallerPanel extends JPanel {
@@ -280,6 +259,7 @@ public void run(ProgressCallback monitor) {
280
259
dialog .setDefaultCloseOperation (JDialog .DISPOSE_ON_CLOSE );
281
260
dialog .setVisible (true );
282
261
int result = (Integer ) (optionPane .getValue () != null ? optionPane .getValue () : -1 );
262
+
283
263
if (result == JOptionPane .OK_OPTION ) {
284
264
ProgressFrame prog = new ProgressFrame (monitor , "Installing " + profile .getVersion (), Thread .currentThread ()::interrupt );
285
265
SimpleInstaller .hookStdOut (prog );
@@ -304,7 +284,7 @@ public void run(ProgressCallback monitor) {
304
284
"The following addresse did not have valid certificates: " + badCerts + "<br>" +
305
285
"This typically happens with an outdated java install. Try updating your java install from https://adoptium.net/" ;
306
286
}
307
- JOptionPane .showMessageDialog (null , message , "Error" , JOptionPane .ERROR_MESSAGE );
287
+ JOptionPane .showOptionDialog (null , message , "Error" , JOptionPane .DEFAULT_OPTION , JOptionPane . ERROR_MESSAGE , null , new Object []{ "Ok" , SwingUtil . createLogButton ()}, "" );
308
288
e .printStackTrace ();
309
289
} finally {
310
290
prog .dispose ();
0 commit comments