AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-18 00:10:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed NullPointerException when minecraftArguments=null

Browse Source
This commit is contained in:
huangyuhui 2016-05-23 13:09:30 +08:00
parent 75e0fa2def
commit ab1ca18488
12 changed files with 67 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/ForgeInstaller.java
View File

@ -18,7 +18,6 @@
package org.jackhuang.hellominecraft.launcher.core.install.forge;
import org.jackhuang.hellominecraft.launcher.core.install.InstallProfile;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
@ -32,6 +31,7 @@ import org.jackhuang.hellominecraft.util.system.FileUtils;
import org.jackhuang.hellominecraft.util.NetUtils;
import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary;
import org.jackhuang.hellominecraft.util.MessageBox;
import org.jackhuang.hellominecraft.util.system.IOUtils;
/**
*
@ -79,10 +79,8 @@ public class ForgeInstaller extends Task {
File file = new File(gameDir, "libraries/" + forge.getDownloadInfo().path);
if (file.getParentFile().mkdirs())
HMCLog.warn("Failed to make library directory " + file.getParent());
try (FileOutputStream fos = new FileOutputStream(file); BufferedOutputStream bos = new BufferedOutputStream(fos)) {
int c;
while ((c = is.read()) != -1)
bos.write((byte) c);
try (FileOutputStream fos = new FileOutputStream(file)) {
IOUtils.copyStream(is, fos);
}
mp.version().refreshVersions();
}

10
HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java
View File

@ -45,8 +45,12 @@ public class MinecraftLoader extends AbstractMinecraftLoader {
protected void makeSelf(List<String> res) throws GameException {
StringBuilder library = new StringBuilder("");
for (MinecraftLibrary l : version.libraries)
if (l.allow() && !l.isRequiredToUnzip())
library.append(l.getFilePath(gameDir).getAbsolutePath()).append(File.pathSeparator);
if (l.allow() && !l.isRequiredToUnzip()) {
File f = l.getFilePath(gameDir);
if (f == null)
continue;
library.append(f.getAbsolutePath()).append(File.pathSeparator);
}
File f = version.getJar(service.baseDirectory());
if (!f.exists())
throw new GameException("Minecraft jar does not exists");
@ -55,6 +59,8 @@ public class MinecraftLoader extends AbstractMinecraftLoader {
res.add(library.toString().substring(0, library.length() - File.pathSeparator.length()));
res.add(version.mainClass);
if (version.minecraftArguments == null)
throw new GameException(new NullPointerException("Minecraft Arguments can not be null."));
String[] splitted = StrUtils.tokenize(version.minecraftArguments);
String game_assets = assetProvider.apply(version, !options.isNotCheckGame());

5
HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java
View File

@ -105,7 +105,10 @@ public class MinecraftLibrary extends IMinecraftLibrary {
@Override
public File getFilePath(File gameDir) {
return new File(gameDir, "libraries/" + getDownloadInfo().path);
LibraryDownloadInfo info = getDownloadInfo();
if (info == null)
return null;
return new File(gameDir, "libraries/" + info.path);
}
@Override

6
HMCSM/build.gradle
View File

@ -63,6 +63,12 @@ task macAppCompressed(type: Zip, dependsOn: createApp) {
from "$buildDir/macApp"
}
macAppBundle {
mainClassName = mainClass
icon = "src/main/icon.icns"
javaProperties.put("apple.laf.useScreenMenuBar", "true")
}
configure(install.repositories.mavenInstaller) {
pom.project {
groupId = mavenGroupId

BIN
HMCSM/src/main/icon.icns Executable file
View File

Binary file not shown.

12
HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/DoubleOutputStream.java
View File

@ -51,21 +51,21 @@ public class DoubleOutputStream extends OutputStream {
}
@Override
public final void write(byte[] paramArrayOfByte) throws IOException {
public final void write(byte[] arr) throws IOException {
if (this.a != null)
this.a.write(paramArrayOfByte);
this.a.write(arr);
if (this.b != null)
this.b.write(paramArrayOfByte);
this.b.write(arr);
if (this.c)
flush();
}
@Override
public final void write(int paramInt) throws IOException {
public final void write(int i) throws IOException {
if (this.a != null)
this.a.write(paramInt);
this.a.write(i);
if (this.b != null)
this.b.write(paramInt);
this.b.write(i);
if (this.c)
flush();
}

23
HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/NetUtils.java
View File

@ -37,13 +37,10 @@ import org.jackhuang.hellominecraft.util.system.IOUtils;
public final class NetUtils {
public static byte[] getBytesFromStream(InputStream is) throws IOException {
ByteArrayOutputStream localByteArrayOutputStream = new ByteArrayOutputStream();
byte[] arrayOfByte1 = new byte[1024];
int i;
while ((i = is.read(arrayOfByte1)) >= 0)
localByteArrayOutputStream.write(arrayOfByte1, 0, i);
ByteArrayOutputStream out = new ByteArrayOutputStream();
IOUtils.copyStream(is, out);
is.close();
return localByteArrayOutputStream.toByteArray();
return out.toByteArray();
}
public static String getStreamContent(InputStream is) throws IOException {
@ -83,12 +80,8 @@ public final class NetUtils {
public static String post(URL u, Map<String, String> params) throws IOException {
StringBuilder sb = new StringBuilder();
if (params != null) {
for (Map.Entry<String, String> e : params.entrySet()) {
sb.append(e.getKey());
sb.append("=");
sb.append(e.getValue());
sb.append("&");
}
for (Map.Entry<String, String> e : params.entrySet())
sb.append(e.getKey()).append("=").append(e.getValue()).append("&");
sb.deleteCharAt(sb.length() - 1);
}
return post(u, sb.toString());
@ -150,9 +143,9 @@ public final class NetUtils {
public static URL concatenateURL(URL url, String query) {
try {
if ((url.getQuery() != null) && (url.getQuery().length() > 0))
return new URL(url.getProtocol(), url.getHost(), url.getPort(), new StringBuilder().append(url.getFile()).append("&").append(query).toString());
return new URL(url.getProtocol(), url.getHost(), url.getPort(), new StringBuilder().append(url.getFile()).append("?").append(query).toString());
if (url.getQuery() != null && url.getQuery().length() > 0)
return new URL(url.getProtocol(), url.getHost(), url.getPort(), url.getFile() + "&" + query);
return new URL(url.getProtocol(), url.getHost(), url.getPort(), url.getFile() + "?" + query);
} catch (MalformedURLException ex) {
throw new IllegalArgumentException("Could not concatenate given URL with GET arguments!", ex);
}

11
HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/Compressor.java
View File

@ -109,7 +109,6 @@ public class Compressor {
}
String pathName;//存相对路径(相对于待压缩的根目录)
byte[] buf = new byte[1024];
int length;
for (File file : files)
if (file.isDirectory()) {
pathName = file.getPath().substring(basePath.length() + 1)
@ -129,8 +128,7 @@ public class Compressor {
try (InputStream is = new FileInputStream(file)) {
BufferedInputStream bis = new BufferedInputStream(is);
zos.putNextEntry(new ZipEntry(pathName));
while ((length = bis.read(buf)) > 0)
zos.write(buf, 0, length);
IOUtils.copyStream(bis, zos, buf);
}
}
}
@ -154,6 +152,7 @@ public class Compressor {
* @throws java.io.IOException 解压失败或无法写入
*/
public static void unzip(File zipFileName, File extPlace, Predicate<String> callback, boolean ignoreExistsFile) throws IOException {
byte[] buf = new byte[1024];
extPlace.mkdirs();
try (ZipInputStream zipFile = new ZipInputStream(new FileInputStream(zipFileName))) {
if (zipFileName.exists()) {
@ -184,10 +183,8 @@ public class Compressor {
}
if (ignoreExistsFile && new File(strtemp).exists())
continue;
try (FileOutputStream fos = new FileOutputStream(strtemp); BufferedOutputStream bos = new BufferedOutputStream(fos)) {
int c;
while ((c = zipFile.read()) != -1)
bos.write((byte) c);
try (FileOutputStream fos = new FileOutputStream(strtemp)) {
IOUtils.copyStream(zipFile, fos, buf);
}
}
}

10
HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/IOUtils.java
View File

@ -288,4 +288,14 @@ public class IOUtils {
}
return lines;
}
public static void copyStream(InputStream input, OutputStream output) throws IOException {
copyStream(input, output, new byte[1024]);
}
public static void copyStream(InputStream input, OutputStream output, byte[] buf) throws IOException {
int length;
while ((length = input.read(buf)) != -1)
output.write(buf, 0, length);
}
}

4
HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/system/ZipEngine.java
View File

@ -121,11 +121,9 @@ public class ZipEngine {
}
public void putStream(InputStream is, String pathName) throws IOException {
int length;
try (BufferedInputStream bis = new BufferedInputStream(is)) {
put(new ZipEntry(pathName));
while ((length = bis.read(buf)) > 0)
zos.write(buf, 0, length);
IOUtils.copyStream(bis, zos, buf);
}
}

10
HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/tasks/download/HTTPGetTask.java
View File

@ -62,12 +62,12 @@ public class HTTPGetTask extends TaskInfo implements PreviousResult<String> {
URLConnection conn = new URL(url).openConnection();
InputStream is = conn.getInputStream();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
int i;
int size = conn.getContentLength(), read = 0;
byte[] buf = new byte[1024];
int size = conn.getContentLength(), read = 0, len;
long lastTime = System.currentTimeMillis();
while ((i = is.read()) != -1) {
baos.write(i);
++read;
while ((len = is.read(buf)) != -1) {
baos.write(buf, 0, len);
read += len;
long now = System.currentTimeMillis();
if (ppl != null && (now - lastTime) >= 1000) {
ppl.setProgress(this, read, size);

21
HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/ui/LogWindowOutputStream.java
View File

@ -18,6 +18,7 @@
package org.jackhuang.hellominecraft.util.ui;
import java.io.OutputStream;
import java.util.Objects;
import java.util.Timer;
import javax.swing.SwingUtilities;
import org.jackhuang.hellominecraft.util.logging.Level;
@ -34,24 +35,26 @@ public class LogWindowOutputStream extends OutputStream {
private final Level sas;
public LogWindowOutputStream(LogWindow logWindow, Level l) {
Objects.nonNull(logWindow);
Objects.nonNull(l);
txt = logWindow;
this.sas = l;
sas = l;
}
@Override
public final void write(byte[] paramArrayOfByte) {
write(paramArrayOfByte, 0, paramArrayOfByte.length);
public final void write(byte[] arr) {
write(arr, 0, arr.length);
}
@Override
public final void write(byte[] paramArrayOfByte, int off, int len) {
append(new String(paramArrayOfByte, off, len));
public final void write(byte[] arr, int off, int len) {
append(new String(arr, off, len));
}
private void append(final String newString) {
private void append(final String str) {
try {
SwingUtilities.invokeLater(() -> {
txt.log(newString, Level.guessLevel(newString, sas));
txt.log(str, Level.guessLevel(str, sas));
});
} catch (Throwable e) {
e.printStackTrace();
@ -59,8 +62,8 @@ public class LogWindowOutputStream extends OutputStream {
}
@Override
public final void write(int paramInt) {
append(new String(new byte[] { (byte) paramInt }));
public final void write(int i) {
append(new String(new byte[] { (byte) i }));
}
public static void dispose() {