diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/MinecraftLibraryPathEvent.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/MinecraftLibraryPathEvent.java new file mode 100644 index 000000000..f8c80af78 --- /dev/null +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/api/event/version/MinecraftLibraryPathEvent.java @@ -0,0 +1,52 @@ +/* + * Hello Minecraft! Launcher. + * Copyright (C) 2013 huangyuhui + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see {http://www.gnu.org/licenses/}. + */ +package org.jackhuang.hellominecraft.launcher.api.event.version; + +import java.io.File; +import java.util.EventObject; +import org.jackhuang.hellominecraft.util.Wrapper; + +/** + * This event gets fired when we getting minecraft library path. + *
+ * This event is fired on the {@link org.jackhuang.hellominecraft.api.HMCLAPI#EVENT_BUS} + * @param source {@link org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary} + * @param {@code Wrapper} modify this thing to change to your wanted mc lib. + * @author huangyuhui + */ +public class MinecraftLibraryPathEvent extends EventObject { + + String location; + Wrapper file; + + public MinecraftLibraryPathEvent(Object source, String location, Wrapper value) { + super(source); + this.location = location; + this.file = value; + } + + public String getLocation() { + return location; + } + + public Wrapper getFile() { + return file; + } + + +} diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java index 0a10fe205..0eddb2c5b 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsMojangLoader.java @@ -50,9 +50,9 @@ public class AssetsMojangLoader extends IAssetsHandler { public Task getList(final MinecraftVersion mv, final IMinecraftAssetService mp) { Objects.requireNonNull(mv); String assetsId = mv.getAssetsIndex().getId(); - File assets = mp.getAssets(); + File assets = mp.getAssets(assetsId); HMCLog.log("Gathering asset index: " + assetsId); - File f = IOUtils.tryGetCanonicalFile(new File(assets, "indexes/" + assetsId + ".json")); + File f = mp.getIndexFile(assetsId); return new TaskInfo("Gather asset index") { @Override public Collection getDependTasks() { @@ -72,7 +72,7 @@ public class AssetsMojangLoader extends IAssetsHandler { AssetsIndex o = C.GSON.fromJson(result, AssetsIndex.class); assetsDownloadURLs = new ArrayList<>(); assetsLocalNames = new ArrayList<>(); - contents = new ArrayList<>(); + assetsObjects = new ArrayList<>(); HashSet loadedHashes = new HashSet<>(); int pgs = 0; if (o != null && o.getFileMap() != null) @@ -80,13 +80,9 @@ public class AssetsMojangLoader extends IAssetsHandler { if (loadedHashes.contains(e.getValue().getHash())) continue; loadedHashes.add(e.getValue().getHash()); - Contents c = new Contents(); - c.eTag = e.getValue().getHash(); - c.key = c.eTag.substring(0, 2) + "/" + e.getValue().getHash(); - c.size = e.getValue().getSize(); - contents.add(c); - assetsDownloadURLs.add(c.key); - assetsLocalNames.add(new File(assets, "objects" + File.separator + c.key.replace("/", File.separator))); + assetsObjects.add(e.getValue()); + assetsDownloadURLs.add(e.getValue().getLocation()); + assetsLocalNames.add(mp.getAssetObject(assetsId, e.getValue())); if (ppl != null) ppl.setProgress(this, ++pgs, o.getFileMap().size()); } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsObject.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsObject.java index dca3c813b..5949ae620 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsObject.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsObject.java @@ -34,7 +34,9 @@ public class AssetsObject { this.size = size; } - public AssetsObject() { + public AssetsObject(String hash, long size) { + this.hash = hash; + this.size = size; } public String getHash() { @@ -44,6 +46,10 @@ public class AssetsObject { public long getSize() { return this.size; } + + public String getLocation() { + return hash.substring(0, 2) + "/" + hash; + } @Override public boolean equals(Object o) { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/Contents.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/Contents.java deleted file mode 100755 index f88a69bc2..000000000 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/Contents.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Hello Minecraft! Launcher. - * Copyright (C) 2013 huangyuhui - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see {http://www.gnu.org/licenses/}. - */ -package org.jackhuang.hellominecraft.launcher.core.asset; - -/** - * - * @author huangyuhui - */ -public class Contents { - - public String key, eTag, lastModified, storageClass; - - public Contents() { - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String geteTag() { - return eTag; - } - - public void seteTag(String eTag) { - this.eTag = eTag; - } - - public String getLastModified() { - return lastModified; - } - - public void setLastModified(String lastModified) { - this.lastModified = lastModified; - } - - public String getStorageClass() { - return storageClass; - } - - public void setStorageClass(String storageClass) { - this.storageClass = storageClass; - } - - public long getSize() { - return size; - } - - public void setSize(long size) { - this.size = size; - } - public long size; - -} diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java index e35bd0fe1..9f45b40a5 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/IAssetsHandler.java @@ -45,7 +45,7 @@ public abstract class IAssetsHandler { protected ArrayList assetsDownloadURLs; protected ArrayList assetsLocalNames; protected final String name; - protected List contents; + protected List assetsObjects; public IAssetsHandler(String name) { this.name = name; @@ -98,7 +98,7 @@ public abstract class IAssetsHandler { @Override public void executeTask(boolean areDependTasksSucceeded) { - if (assetsDownloadURLs == null || assetsLocalNames == null || contents == null) + if (assetsDownloadURLs == null || assetsLocalNames == null || assetsObjects == null) throw new IllegalStateException(C.i18n("assets.not_refreshed")); int max = assetsDownloadURLs.size(); al = new ArrayList<>(); @@ -117,7 +117,7 @@ public abstract class IAssetsHandler { FileInputStream fis = FileUtils.openInputStream(location); String sha = DigestUtils.sha1Hex(IOUtils.toByteArray(fis)); IOUtils.closeQuietly(fis); - if (contents.get(i).geteTag().equals(sha)) { + if (assetsObjects.get(i).getHash().equals(sha)) { ++hasDownloaded; HMCLog.log("File " + assetsLocalNames.get(i) + " has been downloaded successfully, skipped downloading."); if (ppl != null) @@ -130,7 +130,7 @@ public abstract class IAssetsHandler { need = !location.exists(); } if (need) - al.add(new FileDownloadTask(url, location).setTag(contents.get(i).geteTag())); + al.add(new FileDownloadTask(url, location).setTag(assetsObjects.get(i).getHash())); } } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java index 89a751fcb..7b4138fba 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/MinecraftAssetService.java @@ -70,7 +70,7 @@ public class MinecraftAssetService extends IMinecraftAssetService { @Override public Task downloadMinecraftAssetsIndex(AssetIndexDownloadInfo assetIndex) { - File assetsLocation = getAssets(); + File assetsLocation = getAssets(assetIndex.getId()); if (!FileUtils.makeDirectory(assetsLocation)) HMCLog.warn("Failed to make directories: " + assetsLocation); File assetsIndex = getIndexFile(assetIndex.getId()); @@ -100,7 +100,7 @@ public class MinecraftAssetService extends IMinecraftAssetService { @Override public boolean downloadMinecraftAssetsIndexAsync(AssetIndexDownloadInfo assetIndex) { - File assetsDir = getAssets(); + File assetsDir = getAssets(assetIndex.getId()); if (!FileUtils.makeDirectory(assetsDir)) HMCLog.warn("Failed to make directories: " + assetsDir); File assetsIndex = getIndexFile(assetIndex.getId()); @@ -111,8 +111,8 @@ public class MinecraftAssetService extends IMinecraftAssetService { HMCLog.warn("Failed to rename " + assetsIndex + " to " + renamed); } if (TaskWindow.factory() - .append(new FileDownloadTask(assetIndex.getUrl(service.getDownloadType()), IOUtils.tryGetCanonicalFile(assetsIndex), assetIndex.sha1).setTag(assetIndex.getId() + ".json")) - .execute()) { + .append(new FileDownloadTask(assetIndex.getUrl(service.getDownloadType()), IOUtils.tryGetCanonicalFile(assetsIndex), assetIndex.sha1).setTag(assetIndex.getId() + ".json")) + .execute()) { if (renamed != null && !renamed.delete()) HMCLog.warn("Failed to delete " + renamed + ", maybe you should do it."); return true; @@ -123,30 +123,31 @@ public class MinecraftAssetService extends IMinecraftAssetService { } @Override - public File getAssets() { + public File getAssets(String assetId) { return new File(service.baseDirectory(), "assets"); } - - private File getIndexFile(String assetVersion) { - return new File(getAssets(), "indexes/" + assetVersion + ".json"); - } @Override - public File getAssetObject(String assetVersion, String name) throws IOException { - try { - AssetsIndex index = (AssetsIndex) C.GSON.fromJson(FileUtils.read(getIndexFile(assetVersion), "UTF-8"), AssetsIndex.class); + public File getIndexFile(String assetId) { + return new File(getAssets(assetId), "indexes/" + assetId + ".json"); + } - String hash = ((AssetsObject) index.getFileMap().get(name)).getHash(); - return new File(getAssets(), "objects/" + hash.substring(0, 2) + "/" + hash); + @Override + public File getAssetObject(String assetId, String name) throws IOException { + try { + AssetsIndex index = (AssetsIndex) C.GSON.fromJson(FileUtils.read(getIndexFile(assetId), "UTF-8"), AssetsIndex.class); + return getAssetObject(assetId, (AssetsObject) index.getFileMap().get(name)); } catch (JsonSyntaxException e) { throw new IOException("Assets file format malformed.", e); } } - private boolean checkAssetsExistance(AssetIndexDownloadInfo assetIndex) { - File indexFile = getIndexFile(assetIndex.getId()); + protected boolean checkAssetsExistance(AssetIndexDownloadInfo assetIndex) { + String assetId = assetIndex.getId(); + File indexFile = getIndexFile(assetId); + File assetDir = getAssets(assetId); - if (!getAssets().exists() || !indexFile.isFile()) + if (!getAssets(assetId).exists() || !indexFile.isFile()) return false; try { @@ -156,7 +157,7 @@ public class MinecraftAssetService extends IMinecraftAssetService { if (index == null) return false; for (Map.Entry entry : index.getFileMap().entrySet()) - if (!new File(getAssets(), "objects/" + ((AssetsObject) entry.getValue()).getHash().substring(0, 2) + "/" + ((AssetsObject) entry.getValue()).getHash()).exists()) + if (!assetObjectPath(assetDir, (AssetsObject) entry.getValue()).exists()) return false; return true; } catch (IOException | JsonSyntaxException e) { @@ -164,8 +165,8 @@ public class MinecraftAssetService extends IMinecraftAssetService { } } - private File reconstructAssets(AssetIndexDownloadInfo assetIndex) { - File assetsDir = getAssets(); + protected File reconstructAssets(AssetIndexDownloadInfo assetIndex) { + File assetsDir = getAssets(assetIndex.getId()); String assetVersion = assetIndex.getId(); File indexFile = getIndexFile(assetVersion); File virtualRoot = new File(new File(assetsDir, "virtual"), assetVersion); @@ -187,7 +188,7 @@ public class MinecraftAssetService extends IMinecraftAssetService { int tot = index.getFileMap().entrySet().size(); for (Map.Entry entry : index.getFileMap().entrySet()) { File target = new File(virtualRoot, (String) entry.getKey()); - File original = new File(assetsDir, "objects/" + ((AssetsObject) entry.getValue()).getHash().substring(0, 2) + "/" + ((AssetsObject) entry.getValue()).getHash()); + File original = assetObjectPath(assetsDir, (AssetsObject) entry.getValue()); if (original.exists()) { cnt++; if (!target.isFile()) @@ -205,6 +206,15 @@ public class MinecraftAssetService extends IMinecraftAssetService { return virtualRoot; } + @Override + public File getAssetObject(String assetId, AssetsObject object) { + return assetObjectPath(getAssets(assetId), object); + } + + public File assetObjectPath(File assetDir, AssetsObject object) { + return new File(assetDir, "objects/" + object.getLocation()); + } + public final IAssetProvider ASSET_PROVIDER_IMPL = (t, allow) -> { if (allow && !checkAssetsExistance(t.getAssetsIndex())) if (MessageBox.show(C.i18n("assets.no_assets"), MessageBox.YES_NO_OPTION) == MessageBox.YES_OPTION) diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java index 268e5984d..80422cb78 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/launch/MinecraftLoader.java @@ -85,7 +85,7 @@ public class MinecraftLoader extends AbstractMinecraftLoader { t = t.replace("${version_type}", options.getType()); t = t.replace("${game_directory}", service.version().getRunDirectory(version.id).getAbsolutePath()); t = t.replace("${game_assets}", game_assets); - t = t.replace("${assets_root}", service.asset().getAssets().getAbsolutePath()); + t = t.replace("${assets_root}", service.asset().getAssets(version.getAssetsIndex().getId()).getAbsolutePath()); t = t.replace("${auth_access_token}", lr.getAccessToken()); t = t.replace("${user_type}", lr.getUserType()); t = t.replace("${assets_index_name}", version.getAssetsIndex().getId()); diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java index 1801e1bcf..56f234775 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftAssetService.java @@ -20,6 +20,7 @@ package org.jackhuang.hellominecraft.launcher.core.service; import java.io.File; import java.io.IOException; import org.jackhuang.hellominecraft.launcher.core.GameException; +import org.jackhuang.hellominecraft.launcher.core.asset.AssetsObject; import org.jackhuang.hellominecraft.launcher.core.version.AssetIndexDownloadInfo; import org.jackhuang.hellominecraft.util.task.Task; @@ -35,20 +36,24 @@ public abstract class IMinecraftAssetService extends IMinecraftBasicService { public abstract Task downloadAssets(String mcVersion) throws GameException; - public abstract File getAssets(); + public abstract File getAssets(String assetId); + + public abstract File getIndexFile(String assetId); /** * Redownload the Asset index json of the given version. * - * @param a the given version name + * @param mcVersion the given version name * * @return Is the action successful? */ - public abstract boolean refreshAssetsIndex(String a) throws GameException; + public abstract boolean refreshAssetsIndex(String mcVersion) throws GameException; - public abstract boolean downloadMinecraftAssetsIndexAsync(AssetIndexDownloadInfo assetsId); + public abstract boolean downloadMinecraftAssetsIndexAsync(AssetIndexDownloadInfo assetId); - public abstract Task downloadMinecraftAssetsIndex(AssetIndexDownloadInfo assetsId); + public abstract Task downloadMinecraftAssetsIndex(AssetIndexDownloadInfo assetId); public abstract File getAssetObject(String assetVersion, String name) throws IOException; + + public abstract File getAssetObject(String assetId, AssetsObject assetsObject); } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/AssetIndexDownloadInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/AssetIndexDownloadInfo.java index 751d6ab59..7d6bf460f 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/AssetIndexDownloadInfo.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/AssetIndexDownloadInfo.java @@ -40,10 +40,6 @@ public class AssetIndexDownloadInfo extends GameDownloadInfo { return dt.getProvider().getIndexesDownloadURL() + id + ".json"; } - public String getId() { - return id; - } - public int getTotalSize() { return totalSize; } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java index bbd0b4b91..75b3ccb6d 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java @@ -36,7 +36,7 @@ public class GameDownloadInfo implements Cloneable { /** * Ready for AssetIndexDownloadInfo, and GameDownloadInfo also need this. */ - public String id = null; + protected String id; /** * Get the game download url. @@ -68,6 +68,10 @@ public class GameDownloadInfo implements Cloneable { return dt.getProvider().getVersionsDownloadURL() + id + "/" + id + ".jar"; } + public String getId() { + return id; + } + @Override public Object clone() { try { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java index b523b27d9..b3af1a0be 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java @@ -21,9 +21,12 @@ import com.google.gson.annotations.SerializedName; import java.io.File; import java.util.ArrayList; import java.util.HashMap; +import org.jackhuang.hellominecraft.api.HMCLAPI; +import org.jackhuang.hellominecraft.launcher.api.event.version.MinecraftLibraryPathEvent; import org.jackhuang.hellominecraft.util.sys.OS; import org.jackhuang.hellominecraft.util.sys.Platform; import org.jackhuang.hellominecraft.util.StrUtils; +import org.jackhuang.hellominecraft.util.Wrapper; /** * @@ -104,7 +107,9 @@ public class MinecraftLibrary extends IMinecraftLibrary { LibraryDownloadInfo info = getDownloadInfo(); if (info == null) return null; - return new File(gameDir, "libraries/" + info.path); + MinecraftLibraryPathEvent event = new MinecraftLibraryPathEvent(this, "libraries/" + info.path, new Wrapper<>(new File(gameDir, "libraries/" + info.path))); + HMCLAPI.EVENT_BUS.fireChannel(event); + return event.getFile().getValue(); } @Override diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java index 1d6060000..039b53242 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java @@ -31,6 +31,7 @@ import org.jackhuang.hellominecraft.api.HMCLAPI; import org.jackhuang.hellominecraft.launcher.api.event.config.AuthenticatorChangedEvent; import org.jackhuang.hellominecraft.launcher.api.event.config.DownloadTypeChangedEvent; import org.jackhuang.hellominecraft.launcher.api.event.config.ThemeChangedEvent; +import org.jackhuang.hellominecraft.launcher.core.MCUtils; import org.jackhuang.hellominecraft.util.sys.JdkVersion; import org.jackhuang.hellominecraft.util.sys.OS; @@ -44,6 +45,8 @@ public final class Config implements Cloneable { private String last; @SerializedName("bgpath") private String bgpath; + @SerializedName("commonpath") + private String commonpath; @SerializedName("clientToken") private final String clientToken; @SerializedName("proxyHost") @@ -152,6 +155,15 @@ public final class Config implements Cloneable { Settings.save(); } + public String getCommonpath() { + return commonpath; + } + + public void setCommonpath(String commonpath) { + this.commonpath = commonpath; + Settings.save(); + } + public String getClientToken() { return clientToken; } @@ -210,6 +222,7 @@ public final class Config implements Cloneable { theme = 4; decorated = OS.os() == OS.LINUX; auth = new HashMap<>(); + commonpath = MCUtils.getWorkingDirectory("hmcl").getAbsolutePath(); } public DownloadType getDownloadSource() { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java index d04fab2be..79af086d1 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java @@ -87,7 +87,7 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi public GameSettingsPanel() { HMCLAPI.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(t -> { - if (Settings.getLastProfile().service() == t.getValue()) + if (Settings.getLastProfile().service() == t.getValue() && t.getValue().version().getVersions().isEmpty()) if (!showedNoVersion && Settings.getLastProfile().service().checkingModpack) { showedNoVersion = true; SwingUtilities.invokeLater(() -> { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.form index e1602a0ae..274b60515 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.form +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.form @@ -19,7 +19,7 @@ - + @@ -38,35 +38,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -74,10 +48,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -86,6 +92,12 @@ + + + + + + @@ -127,7 +139,7 @@ - + @@ -138,7 +150,7 @@ - + @@ -367,5 +379,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java index 049bcf92e..f74b7c552 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/LauncherSettingsPanel.java @@ -64,6 +64,7 @@ public class LauncherSettingsPanel extends RepaintPage { cboLang.setSelectedIndex(id); txtBackgroundPath.setText(Settings.getInstance().getBgpath()); + txtCommonPath.setText(Settings.getInstance().getCommonpath()); txtProxyHost.setText(Settings.getInstance().getProxyHost()); txtProxyPort.setText(Settings.getInstance().getProxyPort()); txtProxyUsername.setText(Settings.getInstance().getProxyUserName()); @@ -118,6 +119,9 @@ public class LauncherSettingsPanel extends RepaintPage { btnMCBBS = new javax.swing.JButton(); chkEnableBlur = new javax.swing.JCheckBox(); chkEnableAnimation = new javax.swing.JCheckBox(); + lblCommonPath = new javax.swing.JLabel(); + txtCommonPath = new javax.swing.JTextField(); + btnSetCommonPath = new javax.swing.JButton(); cboDownloadSource.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) { @@ -252,6 +256,17 @@ public class LauncherSettingsPanel extends RepaintPage { } }); + lblCommonPath.setText(C.i18n("launcher.common_location")); // NOI18N + + txtCommonPath.setToolTipText(C.i18n("launcher.commpath_tooltip")); // NOI18N + + btnSetCommonPath.setText(C.i18n("ui.button.explore")); // NOI18N + btnSetCommonPath.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + btnSetCommonPathActionPerformed(evt); + } + }); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( @@ -259,7 +274,7 @@ public class LauncherSettingsPanel extends RepaintPage { .addGroup(layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addComponent(lblProxy) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(lblProxyHost) @@ -279,42 +294,52 @@ public class LauncherSettingsPanel extends RepaintPage { .addComponent(txtProxyPassword, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGroup(layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(lblDownloadSource) - .addComponent(lblTheme) - .addComponent(lblBackground) - .addComponent(lblLang)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(cboLang, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addComponent(txtBackgroundPath, javax.swing.GroupLayout.DEFAULT_SIZE, 664, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnSelBackgroundPath)) - .addComponent(cboDownloadSource, javax.swing.GroupLayout.Alignment.TRAILING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(cboTheme, javax.swing.GroupLayout.Alignment.TRAILING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(btnCheckUpdate) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnMCBBS)) - .addComponent(lblAbout, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(lblModpack, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(lblRestart) + .addComponent(chkDecorated) .addGroup(layout.createSequentialGroup() .addComponent(chkEnableShadow) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(chkEnableBlur) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(chkEnableAnimation)) - .addComponent(chkDecorated)) - .addGap(0, 0, Short.MAX_VALUE))) + .addComponent(lblAbout, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(layout.createSequentialGroup() + .addComponent(btnCheckUpdate) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(btnMCBBS)) + .addComponent(lblModpack, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(lblRestart)) + .addGap(0, 0, Short.MAX_VALUE)) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(lblDownloadSource) + .addComponent(lblTheme) + .addComponent(lblBackground) + .addComponent(lblLang) + .addComponent(lblCommonPath)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addComponent(txtCommonPath) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(btnSetCommonPath)) + .addComponent(cboLang, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addComponent(txtBackgroundPath, javax.swing.GroupLayout.DEFAULT_SIZE, 585, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(btnSelBackgroundPath)) + .addComponent(cboDownloadSource, javax.swing.GroupLayout.Alignment.TRAILING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(cboTheme, javax.swing.GroupLayout.Alignment.TRAILING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) .addContainerGap()) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(lblCommonPath) + .addComponent(txtCommonPath, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(btnSetCommonPath, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(lblBackground) .addComponent(btnSelBackgroundPath, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE) @@ -349,7 +374,7 @@ public class LauncherSettingsPanel extends RepaintPage { .addComponent(chkEnableAnimation)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(chkDecorated) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 6, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(btnCheckUpdate, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(btnMCBBS, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) @@ -447,10 +472,29 @@ public class LauncherSettingsPanel extends RepaintPage { Settings.getInstance().setEnableAnimation(chkEnableAnimation.isSelected()); }//GEN-LAST:event_chkEnableAnimationItemStateChanged + private void btnSetCommonPathActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSetCommonPathActionPerformed + JSystemFileChooser fc = new JSystemFileChooser(); + fc.setFileSelectionMode(JSystemFileChooser.DIRECTORIES_ONLY); + fc.setDialogTitle(C.i18n("launcher.choose_commonpath")); + fc.setMultiSelectionEnabled(false); + fc.showOpenDialog(this); + if (fc.getSelectedFile() == null) + return; + try { + String path = fc.getSelectedFile().getCanonicalPath(); + txtCommonPath.setText(path); + Settings.getInstance().setCommonpath(path); + } catch (IOException e) { + HMCLog.warn("Failed to set common path.", e); + MessageBox.show(C.i18n("ui.label.failed_set") + e.getMessage()); + } + }//GEN-LAST:event_btnSetCommonPathActionPerformed + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton btnCheckUpdate; private javax.swing.JButton btnMCBBS; private javax.swing.JButton btnSelBackgroundPath; + private javax.swing.JButton btnSetCommonPath; private javax.swing.JComboBox cboDownloadSource; private javax.swing.JComboBox cboLang; private javax.swing.JComboBox cboTheme; @@ -460,6 +504,7 @@ public class LauncherSettingsPanel extends RepaintPage { private javax.swing.JCheckBox chkEnableShadow; private javax.swing.JLabel lblAbout; private javax.swing.JLabel lblBackground; + private javax.swing.JLabel lblCommonPath; private javax.swing.JLabel lblDownloadSource; private javax.swing.JLabel lblLang; private javax.swing.JLabel lblModpack; @@ -471,6 +516,7 @@ public class LauncherSettingsPanel extends RepaintPage { private javax.swing.JLabel lblRestart; private javax.swing.JLabel lblTheme; private javax.swing.JTextField txtBackgroundPath; + private javax.swing.JTextField txtCommonPath; private javax.swing.JTextField txtProxyHost; private javax.swing.JTextField txtProxyPassword; private javax.swing.JTextField txtProxyPort; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLAssetService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLAssetService.java new file mode 100644 index 000000000..15b4718b2 --- /dev/null +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLAssetService.java @@ -0,0 +1,47 @@ +/* + * Hello Minecraft! Launcher. + * Copyright (C) 2013 huangyuhui + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see {http://www.gnu.org/licenses/}. + */ +package org.jackhuang.hellominecraft.launcher.util; + +import java.io.File; +import org.jackhuang.hellominecraft.launcher.core.asset.MinecraftAssetService; +import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService; +import org.jackhuang.hellominecraft.launcher.setting.Settings; + +/** + * + * @author huang + */ +public class HMCLAssetService extends MinecraftAssetService { + + public HMCLAssetService(IMinecraftService service) { + super(service); + } + + private boolean useSelf(String assetId) { + return new File(service.baseDirectory(), "assets/indexes/" + assetId + ",json").exists(); + } + + @Override + public File getAssets(String assetId) { + if (useSelf(assetId)) + return new File(service.baseDirectory(), "assets"); + else + return new File(Settings.getInstance().getCommonpath(), "assets"); + } + +} diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLGameProvider.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLGameProvider.java index 852523de1..2f4272459 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLGameProvider.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLGameProvider.java @@ -18,8 +18,11 @@ package org.jackhuang.hellominecraft.launcher.util; import java.io.File; +import org.jackhuang.hellominecraft.api.HMCLAPI; +import org.jackhuang.hellominecraft.launcher.api.event.version.MinecraftLibraryPathEvent; import org.jackhuang.hellominecraft.launcher.core.version.GameDirType; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager; +import org.jackhuang.hellominecraft.launcher.setting.Settings; import org.jackhuang.hellominecraft.launcher.setting.VersionSetting; /** @@ -30,6 +33,11 @@ public class HMCLGameProvider extends MinecraftVersionManager { public HMCLGameProvider(HMCLMinecraftService p) { super(p); + + HMCLAPI.EVENT_BUS.channel(MinecraftLibraryPathEvent.class).register(t -> { + if (!t.getFile().getValue().exists()) + t.getFile().setValue(new File(Settings.getInstance().getCommonpath(), t.getLocation())); + }); } @Override diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLMinecraftService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLMinecraftService.java index 329e0d542..b159b95ed 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLMinecraftService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/util/HMCLMinecraftService.java @@ -75,7 +75,7 @@ public class HMCLMinecraftService extends IMinecraftService { HMCLAPI.EVENT_BUS.channel(LoadedOneVersionEvent.class).register(e -> loadVersionSetting(e.getValue())); this.mms = new MinecraftModService(this); this.mds = new MinecraftDownloadService(this); - this.mas = new MinecraftAssetService(this); + this.mas = new HMCLAssetService(this); this.mis = new MinecraftInstallerService(this); } diff --git a/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Wrapper.java b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Wrapper.java new file mode 100644 index 000000000..49192df2c --- /dev/null +++ b/HMCUtils/src/main/java/org/jackhuang/hellominecraft/util/Wrapper.java @@ -0,0 +1,39 @@ +/* + * Hello Minecraft! Launcher. + * Copyright (C) 2013 huangyuhui + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see {http://www.gnu.org/licenses/}. + */ +package org.jackhuang.hellominecraft.util; + +/** + * + * @author huang + */ +public class Wrapper { + T value; + + public Wrapper(T value) { + this.value = value; + } + + public T getValue() { + return value; + } + + public void setValue(T value) { + this.value = value; + } + +} diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang index 383e7e8e8..3c3810ed5 100755 --- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang +++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang @@ -308,11 +308,14 @@ mainwindow.no_version=No version found. Switch to Game Downloads Tab? launcher.about=About Author
Minecraft Forum ID: klkl6523
Copyright (c) 2013 huangyuhui
Opened source under GPL v3 license:http://github.com/huanghongxun/HMCL/
This software used project Gson which is under Apache License 2.0, thanks contributors. launcher.download_source=Download Source launcher.background_location=Background Location +launcher.common_location=Common Location launcher.exit_failed=Failed to shutdown. launcher.versions_json_not_matched=The version %s is malformed! There are a json:%s in this version. Do you want to fix this problem? launcher.versions_json_not_matched_cannot_auto_completion=The version %s lost version information file, delete it? launcher.versions_json_not_formatted=The version information of %s is malformed! Redownload it? launcher.choose_bgpath=Choose background path. +launcher.choose_commonpath=Choose common path. +launcher.commpath_tooltip=This app will save all game libraries and assets here unless there are existant files in game folder. launcher.background_tooltip=The laucher uses a default background.
If you use custom background.png, link it and it will be used.
If there is "bg" subdirectory, this app will chooses one picture in "bgskin" randomly.
If you set the background setting, this app will use it. launcher.update_launcher=Check for update launcher.enable_shadow=Enable Window Shadow diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties index ed552f32f..dfaca3fb2 100755 --- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties +++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties @@ -308,11 +308,14 @@ mainwindow.no_version=No version found. Switch to Game Downloads Tab? launcher.about=About Author
Minecraft Forum ID: klkl6523
Copyright (c) 2013 huangyuhui
Opened source under GPL v3 license:http://github.com/huanghongxun/HMCL/
This software used project Gson which is under Apache License 2.0, thanks contributors. launcher.download_source=Download Source launcher.background_location=Background Location +launcher.common_location=Common Location launcher.exit_failed=Failed to shutdown. launcher.versions_json_not_matched=The version %s is malformed! There are a json:%s in this version. Do you want to fix this problem? launcher.versions_json_not_matched_cannot_auto_completion=The version %s lost version information file, delete it? launcher.versions_json_not_formatted=The version information of %s is malformed! Redownload it? launcher.choose_bgpath=Choose background path. +launcher.choose_commonpath=Choose common path. +launcher.commpath_tooltip=This app will save all game libraries and assets here unless there are existant files in game folder. launcher.background_tooltip=The laucher uses a default background.
If you use custom background.png, link it and it will be used.
If there is "bg" subdirectory, this app will chooses one picture in "bgskin" randomly.
If you set the background setting, this app will use it. launcher.update_launcher=Check for update launcher.enable_shadow=Enable Window Shadow diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.lang b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.lang index 2118193c0..87c0eb17d 100644 --- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.lang +++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.lang @@ -306,11 +306,14 @@ mainwindow.no_version=Không có phiên bản minecraft nào được tìm thấ launcher.about=Về tác giả
Minecraft Forum ID: klkl6523
Copyright (c) 2013 huangyuhui
http://github.com/huanghongxun/HMCL/
Phần mềm này dùng project Gson, cảm ơn người đóng góp. launcher.download_source=Download Source launcher.background_location=Background Location +launcher.common_location=Common Location launcher.exit_failed=Tắt launcher thất bại. launcher.versions_json_not_matched=The version %s is malformed! There are a json:%s in this version. Do you want to fix this problem? launcher.versions_json_not_matched_cannot_auto_completion=The version %s lost version information file, delete it? launcher.versions_json_not_formatted=The version information of %s is malformed! Redownload it? launcher.choose_bgpath=Choose background path. +launcher.choose_commonpath=Choose common path. +launcher.commpath_tooltip=This app will save all game libraries and assets here unless there are existant files in game folder. launcher.background_tooltip=This app uses the default background at first.
If there is background.png in the directory, it will be used.
If there is "bg" subdirectory, this app will chooses one picture in "bgskin" randomly.
If you set the background setting, this app will use it. launcher.update_launcher=Check for update launcher.enable_shadow=Enable Window Shadow diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.properties b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.properties index 8937e3725..8ab185534 100644 --- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.properties +++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_vi.properties @@ -306,11 +306,14 @@ mainwindow.no_version=Kh\u00f4ng c\u00f3 phi\u00ean b\u1ea3n minecraft n\u00e0o launcher.about=V\u1ec1 t\u00e1c gi\u1ea3
Minecraft Forum ID: klkl6523
Copyright (c) 2013 huangyuhui
http://github.com/huanghongxun/HMCL/
Ph\u1ea7n m\u1ec1m n\u00e0y d\u00f9ng project Gson, c\u1ea3m \u01a1n ng\u01b0\u1eddi \u0111\u00f3ng g\u00f3p. launcher.download_source=Download Source launcher.background_location=Background Location +launcher.common_location=Common Location launcher.exit_failed=T\u1eaft launcher th\u1ea5t b\u1ea1i. launcher.versions_json_not_matched=The version %s is malformed! There are a json:%s in this version. Do you want to fix this problem? launcher.versions_json_not_matched_cannot_auto_completion=The version %s lost version information file, delete it? launcher.versions_json_not_formatted=The version information of %s is malformed! Redownload it? launcher.choose_bgpath=Choose background path. +launcher.choose_commonpath=Choose common path. +launcher.commpath_tooltip=This app will save all game libraries and assets here unless there are existant files in game folder. launcher.background_tooltip=This app uses the default background at first.
If there is background.png in the directory, it will be used.
If there is "bg" subdirectory, this app will chooses one picture in "bgskin" randomly.
If you set the background setting, this app will use it. launcher.update_launcher=Check for update launcher.enable_shadow=Enable Window Shadow diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.lang b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.lang index 68f8aaebb..ad4a89dcf 100755 --- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.lang +++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.lang @@ -308,11 +308,14 @@ mainwindow.no_version=未找到任何版本，是否进入游戏下载？ launcher.about=默认背景图感谢gamerteam提供。
关于作者：
百度ID：huanghongxun20
mcbbs：huanghongxun
Minecraft Forum ID: klkl6523
欢迎提交Bug哦
Copyright (c) 2013-2017 huangyuhui.
免责声明：Minecraft软件版权归Mojang AB所有，使用本软件产生的版权问题本软件制作方概不负责。
本启动器在GPLv3协议下开源:https://github.com/huanghongxun/HMCL/ ,感谢issues和pull requests贡献者
本软件使用了基于Apache License 2.0的Gson项目，感谢贡献者。 launcher.download_source=下载源 launcher.background_location=背景地址 +launcher.common_location=公共文件夹 launcher.exit_failed=强制退出失败，可能是Forge 1.7.10及更高版本导致的，无法解决。 launcher.versions_json_not_matched=版本%s格式不规范！该版本文件夹下有json:%s，是否更名这个文件来规范格式？ launcher.versions_json_not_matched_cannot_auto_completion=版本%s缺失必要的版本信息文件，是否删除该版本？ launcher.versions_json_not_formatted=版本%s信息文件格式错误，是否重新下载？ launcher.choose_bgpath=选择背景路径 +launcher.choose_commonpath=选择公共路径 +launcher.commpath_tooltip=启动器将所有游戏资源及依赖库文件放于此集中管理，如果游戏文件夹内有现成的将不会使用公共库文件 launcher.background_tooltip=启动器默认使用自带的背景
如果当前目录有background.png，则会使用该文件作为背景
如果当前目录有bg子目录，则会随机使用里面的一张图作为背景
如果该背景地址被修改，则会使用背景地址里的一张图作为背景
背景地址允许有多个地址，使用半角分号";"(不包含双引号)分隔 launcher.update_launcher=检查更新 launcher.enable_shadow=启用窗口阴影 diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.properties b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.properties index efe6346e2..eaa140eac 100755 --- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.properties +++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh_CN.properties @@ -308,11 +308,14 @@ mainwindow.no_version=\u672a\u627e\u5230\u4efb\u4f55\u7248\u672c\uff0c\u662f\u54 launcher.about=\u9ed8\u8ba4\u80cc\u666f\u56fe\u611f\u8c22gamerteam\u63d0\u4f9b\u3002
\u5173\u4e8e\u4f5c\u8005\uff1a
\u767e\u5ea6ID\uff1ahuanghongxun20
mcbbs\uff1ahuanghongxun
Minecraft Forum ID: klkl6523
\u6b22\u8fce\u63d0\u4ea4Bug\u54e6
Copyright (c) 2013-2017 huangyuhui.
\u514d\u8d23\u58f0\u660e\uff1aMinecraft\u8f6f\u4ef6\u7248\u6743\u5f52Mojang AB\u6240\u6709\uff0c\u4f7f\u7528\u672c\u8f6f\u4ef6\u4ea7\u751f\u7684\u7248\u6743\u95ee\u9898\u672c\u8f6f\u4ef6\u5236\u4f5c\u65b9\u6982\u4e0d\u8d1f\u8d23\u3002
\u672c\u542f\u52a8\u5668\u5728GPLv3\u534f\u8bae\u4e0b\u5f00\u6e90:https://github.com/huanghongxun/HMCL/ ,\u611f\u8c22issues\u548cpull requests\u8d21\u732e\u8005
\u672c\u8f6f\u4ef6\u4f7f\u7528\u4e86\u57fa\u4e8eApache License 2.0\u7684Gson\u9879\u76ee\uff0c\u611f\u8c22\u8d21\u732e\u8005\u3002 launcher.download_source=\u4e0b\u8f7d\u6e90 launcher.background_location=\u80cc\u666f\u5730\u5740 +launcher.common_location=\u516c\u5171\u6587\u4ef6\u5939 launcher.exit_failed=\u5f3a\u5236\u9000\u51fa\u5931\u8d25\uff0c\u53ef\u80fd\u662fForge 1.7.10\u53ca\u66f4\u9ad8\u7248\u672c\u5bfc\u81f4\u7684\uff0c\u65e0\u6cd5\u89e3\u51b3\u3002 launcher.versions_json_not_matched=\u7248\u672c%s\u683c\u5f0f\u4e0d\u89c4\u8303\uff01\u8be5\u7248\u672c\u6587\u4ef6\u5939\u4e0b\u6709json:%s\uff0c\u662f\u5426\u66f4\u540d\u8fd9\u4e2a\u6587\u4ef6\u6765\u89c4\u8303\u683c\u5f0f\uff1f launcher.versions_json_not_matched_cannot_auto_completion=\u7248\u672c%s\u7f3a\u5931\u5fc5\u8981\u7684\u7248\u672c\u4fe1\u606f\u6587\u4ef6\uff0c\u662f\u5426\u5220\u9664\u8be5\u7248\u672c\uff1f launcher.versions_json_not_formatted=\u7248\u672c%s\u4fe1\u606f\u6587\u4ef6\u683c\u5f0f\u9519\u8bef\uff0c\u662f\u5426\u91cd\u65b0\u4e0b\u8f7d\uff1f launcher.choose_bgpath=\u9009\u62e9\u80cc\u666f\u8def\u5f84 +launcher.choose_commonpath=\u9009\u62e9\u516c\u5171\u8def\u5f84 +launcher.commpath_tooltip=\u542f\u52a8\u5668\u5c06\u6240\u6709\u6e38\u620f\u8d44\u6e90\u53ca\u4f9d\u8d56\u5e93\u6587\u4ef6\u653e\u4e8e\u6b64\u96c6\u4e2d\u7ba1\u7406\uff0c\u5982\u679c\u6e38\u620f\u6587\u4ef6\u5939\u5185\u6709\u73b0\u6210\u7684\u5c06\u4e0d\u4f1a\u4f7f\u7528\u516c\u5171\u5e93\u6587\u4ef6 launcher.background_tooltip=\u542f\u52a8\u5668\u9ed8\u8ba4\u4f7f\u7528\u81ea\u5e26\u7684\u80cc\u666f
\u5982\u679c\u5f53\u524d\u76ee\u5f55\u6709background.png\uff0c\u5219\u4f1a\u4f7f\u7528\u8be5\u6587\u4ef6\u4f5c\u4e3a\u80cc\u666f
\u5982\u679c\u5f53\u524d\u76ee\u5f55\u6709bg\u5b50\u76ee\u5f55\uff0c\u5219\u4f1a\u968f\u673a\u4f7f\u7528\u91cc\u9762\u7684\u4e00\u5f20\u56fe\u4f5c\u4e3a\u80cc\u666f
\u5982\u679c\u8be5\u80cc\u666f\u5730\u5740\u88ab\u4fee\u6539\uff0c\u5219\u4f1a\u4f7f\u7528\u80cc\u666f\u5730\u5740\u91cc\u7684\u4e00\u5f20\u56fe\u4f5c\u4e3a\u80cc\u666f
\u80cc\u666f\u5730\u5740\u5141\u8bb8\u6709\u591a\u4e2a\u5730\u5740\uff0c\u4f7f\u7528\u534a\u89d2\u5206\u53f7";"(\u4e0d\u5305\u542b\u53cc\u5f15\u53f7)\u5206\u9694 launcher.update_launcher=\u68c0\u67e5\u66f4\u65b0 launcher.enable_shadow=\u542f\u7528\u7a97\u53e3\u9634\u5f71