Reformat and (slightly) decruft all the things.

This commit is contained in:
Petr Mrázek
2013-11-04 02:53:05 +01:00
parent d6e4fb2971
commit bb7e8985f6
208 changed files with 4492 additions and 3767 deletions

View File

@ -1,12 +1,12 @@
//
//
// Copyright 2012 MultiMC Contributors
//
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -30,94 +30,85 @@ import java.awt.image.BufferedImage;
public class MCFrame extends Frame implements WindowListener
{
private Launcher appletWrap = null;
public MCFrame(String title)
{
super(title);
BufferedImage image = null;
try
{
image = ImageIO.read(new File("icon.png"));
setIconImage(image);
}
catch (IOException e)
{
e.printStackTrace();
}
this.addWindowListener(this);
}
private Launcher appletWrap = null;
public MCFrame ( String title )
{
super ( title );
BufferedImage image = null;
try {
image = ImageIO.read ( new File ( "icon.png" ) );
setIconImage ( image );
} catch ( IOException e ) {
e.printStackTrace();
}
this.addWindowListener ( this );
}
public void start(Applet mcApplet, String user, String session, Dimension winSize, boolean maximize)
{
try
{
appletWrap = new Launcher(mcApplet, new URL("http://www.minecraft.net/game"));
}
catch (MalformedURLException ignored){}
appletWrap.setParameter("username", user);
appletWrap.setParameter("sessionid", session);
appletWrap.setParameter("stand-alone", "true"); // Show the quit button.
mcApplet.setStub(appletWrap);
this.add(appletWrap);
appletWrap.setPreferredSize(winSize);
this.pack();
this.setLocationRelativeTo(null);
this.setResizable(true);
if (maximize)
this.setExtendedState(MAXIMIZED_BOTH);
validate();
appletWrap.init();
appletWrap.start();
setVisible(true);
}
public void start ( Applet mcApplet, String user, String session, Dimension winSize, boolean maximize )
{
try {
appletWrap = new Launcher ( mcApplet, new URL ( "http://www.minecraft.net/game" ) );
} catch ( MalformedURLException ignored ) {}
@Override
public void windowActivated(WindowEvent e) {}
appletWrap.setParameter ( "username", user );
appletWrap.setParameter ( "sessionid", session );
appletWrap.setParameter ( "stand-alone", "true" ); // Show the quit button.
mcApplet.setStub ( appletWrap );
@Override
public void windowClosed(WindowEvent e) {}
this.add ( appletWrap );
appletWrap.setPreferredSize ( winSize );
this.pack();
this.setLocationRelativeTo ( null );
this.setResizable ( true );
if ( maximize ) {
this.setExtendedState ( MAXIMIZED_BOTH );
}
@Override
public void windowClosing(WindowEvent e)
{
new Thread()
{
public void run()
{
try
{
Thread.sleep(30000L);
} catch (InterruptedException localInterruptedException)
{
localInterruptedException.printStackTrace();
}
System.out.println("FORCING EXIT!");
System.exit(0);
}
}
.start();
validate();
appletWrap.init();
appletWrap.start();
setVisible ( true );
}
if (appletWrap != null)
{
appletWrap.stop();
appletWrap.destroy();
}
// old minecraft versions can hang without this >_<
System.exit(0);
}
@Override
public void windowActivated ( WindowEvent e ) {}
@Override
public void windowDeactivated(WindowEvent e) {}
@Override
public void windowClosed ( WindowEvent e ) {}
@Override
public void windowDeiconified(WindowEvent e) {}
@Override
public void windowClosing ( WindowEvent e )
{
new Thread() {
public void run() {
try {
Thread.sleep ( 30000L );
} catch ( InterruptedException localInterruptedException ) {
localInterruptedException.printStackTrace();
}
System.out.println ( "FORCING EXIT!" );
System.exit ( 0 );
}
}
.start();
@Override
public void windowIconified(WindowEvent e) {}
if ( appletWrap != null ) {
appletWrap.stop();
appletWrap.destroy();
}
// old minecraft versions can hang without this >_<
System.exit ( 0 );
}
@Override
public void windowOpened(WindowEvent e) {}
}
@Override
public void windowDeactivated ( WindowEvent e ) {}
@Override
public void windowDeiconified ( WindowEvent e ) {}
@Override
public void windowIconified ( WindowEvent e ) {}
@Override
public void windowOpened ( WindowEvent e ) {}
}