diff options
| -rw-r--r-- | src/net/minecraft/GameUpdater.java | 4 | ||||
| -rw-r--r-- | src/net/minecraft/Launcher.java | 6 | ||||
| -rw-r--r-- | src/net/minecraft/LoginForm.java | 22 | ||||
| -rw-r--r-- | src/net/minecraft/MinecraftLauncher.java | 4 | ||||
| -rw-r--r-- | src/net/minecraft/Util.java | 5 |
5 files changed, 34 insertions, 7 deletions
diff --git a/src/net/minecraft/GameUpdater.java b/src/net/minecraft/GameUpdater.java index 1fb7f50..be2f532 100644 --- a/src/net/minecraft/GameUpdater.java +++ b/src/net/minecraft/GameUpdater.java @@ -174,7 +174,7 @@ public class GameUpdater implements Runnable { loadJarURLs(); String path = AccessController.doPrivileged(new PrivilegedExceptionAction<String>() { - public Object run() throws Exception { + public String run() throws Exception { return Util.getWorkingDirectory() + File.separator + "bin" + File.separator; } }); @@ -681,7 +681,7 @@ public class GameUpdater implements Runnable { public boolean canPlayOffline() { try { String path = AccessController.doPrivileged(new PrivilegedExceptionAction<String>() { - public Object run() throws Exception { + public String run() throws Exception { return Util.getWorkingDirectory() + File.separator + "bin" + File.separator; } }); diff --git a/src/net/minecraft/Launcher.java b/src/net/minecraft/Launcher.java index d2275df..c6aeed0 100644 --- a/src/net/minecraft/Launcher.java +++ b/src/net/minecraft/Launcher.java @@ -1,14 +1,18 @@ package net.minecraft; +import javax.imageio.ImageIO; import java.applet.Applet; +import java.applet.AppletStub; import java.awt.*; +import java.awt.image.VolatileImage; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.util.HashMap; +import java.util.Map; public class Launcher extends Applet implements Runnable, AppletStub { - public Map<String, String> customParameters = new HashMap<String, String>(); + public Map<String, String> customParameters = new HashMap<>(); private static final long serialVersionUID = 1L; private GameUpdater gameUpdater; private boolean gameUpdaterStarted = false; diff --git a/src/net/minecraft/LoginForm.java b/src/net/minecraft/LoginForm.java index d8f6873..856538c 100644 --- a/src/net/minecraft/LoginForm.java +++ b/src/net/minecraft/LoginForm.java @@ -1,10 +1,27 @@ package net.minecraft; import javax.crypto.Cipher; +import javax.crypto.CipherInputStream; +import javax.crypto.CipherOutputStream; +import javax.crypto.SecretKey; +import javax.crypto.SecretKeyFactory; +import javax.crypto.spec.PBEKeySpec; +import javax.crypto.spec.PBEParameterSpec; +import javax.imageio.ImageIO; import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.image.VolatileImage; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URL; +import java.util.Random; public class LoginForm extends Panel { private static final long serialVersionUID = 1L; @@ -21,6 +38,7 @@ public class LoginForm extends Panel { private VolatileImage img; public LoginForm(final LauncherFrame launcherFrame) { + Image bgImage1; this.launcherFrame = launcherFrame; GridBagLayout gbl = new GridBagLayout(); @@ -28,12 +46,14 @@ public class LoginForm extends Panel { add(buildLoginPanel()); + bgImage1 = null; try { - this.bgImage = ImageIO.read(LoginForm.class.getResource("dirt.png")).getScaledInstance(32, 32, 16); + bgImage1 = ImageIO.read(LoginForm.class.getResource("dirt.png")).getScaledInstance(32, 32, 16); } catch (IOException e) { e.printStackTrace(); } + this.bgImage = bgImage1; readUsername(); this.retryButton.addActionListener(new ActionListener() { diff --git a/src/net/minecraft/MinecraftLauncher.java b/src/net/minecraft/MinecraftLauncher.java index 14d2e5f..7b2fead 100644 --- a/src/net/minecraft/MinecraftLauncher.java +++ b/src/net/minecraft/MinecraftLauncher.java @@ -7,9 +7,9 @@ public class MinecraftLauncher { private static final int RECOMMENDED_HEAP = 1024; public static void main(String[] args) throws Exception { - float heapSizeMegs = (float) (Runtime.getRuntime().maxMemory() / 1024L / 1024L); + float heapSizeMegs = (float) (Runtime.getRuntime().maxMemory() / RECOMMENDED_HEAP / RECOMMENDED_HEAP); - if (heapSizeMegs > 511.0F) { + if (heapSizeMegs > MIN_HEAP) { LauncherFrame.main(args); } else { try { diff --git a/src/net/minecraft/Util.java b/src/net/minecraft/Util.java index 9b21f9c..4be7387 100644 --- a/src/net/minecraft/Util.java +++ b/src/net/minecraft/Util.java @@ -1,8 +1,12 @@ package net.minecraft; +import java.io.BufferedReader; import java.io.DataOutputStream; import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; import java.net.HttpURLConnection; +import java.net.URL; public class Util { private enum OS { @@ -21,7 +25,6 @@ public class Util { String applicationData, userHome = System.getProperty("user.home", "."); switch (getPlatform()) { - case null: case solaris: workingDirectory = new File(userHome, '.' + applicationName + '/'); break; |