Fix launcher part for legacy in onesix.

2 files changed, 1 insertions, 116 deletions

diff --git a/depends/launcher/org/multimc/legacy/LegacyFrame.java b/depends/launcher/org/multimc/legacy/LegacyFrame.java
deleted file mode 100644
index c3c0cafc..00000000
--- a/depends/launcher/org/multimc/legacy/LegacyFrame.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.multimc.legacy;/*
- * Copyright 2012-2014 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import net.minecraft.Launcher;
-
-import javax.imageio.ImageIO;
-import java.applet.Applet;
-import java.awt.*;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-public class LegacyFrame extends Frame implements WindowListener
-{
-    private Launcher appletWrap = null;
-    public LegacyFrame(String title)
-    {
-        super ( title );
-        BufferedImage image;
-        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.
-		appletWrap.setParameter ( "demo", "false" );
-		appletWrap.setParameter("fullscreen", "false");
-        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 );
-    }
-
-    @Override
-    public void windowActivated ( WindowEvent e ) {}
-
-    @Override
-    public void windowClosed ( 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();
-
-        if ( appletWrap != null ) {
-            appletWrap.stop();
-            appletWrap.destroy();
-        }
-        // old minecraft versions can hang without this >_<
-        System.exit ( 0 );
-    }
-
-    @Override
-    public void windowDeactivated ( WindowEvent e ) {}
-
-    @Override
-    public void windowDeiconified ( WindowEvent e ) {}
-
-    @Override
-    public void windowIconified ( WindowEvent e ) {}
-
-    @Override
-    public void windowOpened ( WindowEvent e ) {}
-}
diff --git a/depends/launcher/org/multimc/legacy/LegacyLauncher.java b/depends/launcher/org/multimc/legacy/LegacyLauncher.java
index 1ca37c4a..347bb1a2 100644
--- a/depends/launcher/org/multimc/legacy/LegacyLauncher.java
+++ b/depends/launcher/org/multimc/legacy/LegacyLauncher.java
@@ -14,10 +14,7 @@ package org.multimc.legacy;/*
  * limitations under the License.
  */
 
-import org.multimc.Launcher;
-import org.multimc.NotFoundException;
-import org.multimc.ParamBucket;
-import org.multimc.Utils;
+import org.multimc.*;
 
 import java.applet.Applet;
 import java.awt.*;