From a11ca8b720bab85ae45237cd88bb4fe9e9d6b962 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Sat, 11 Feb 2017 21:38:10 +0800 Subject: [PATCH] Now a version setting can be linked to the global setting or its specialized setting --- .../launcher/setting/Config.java | 2 - .../launcher/setting/Profile.java | 48 ++++++++++++++++++- .../launcher/setting/VersionSetting.java | 13 +++++ .../launcher/ui/GameSettingsPanel.form | 29 ++++++++--- .../launcher/ui/GameSettingsPanel.java | 46 ++++++++++++++---- .../launcher/ui/MainPagePanel.java | 1 - .../launcher/util/HMCLMinecraftService.java | 12 ++++- .../jackhuang/hellominecraft/lang/I18N.lang | 3 ++ .../hellominecraft/lang/I18N.properties | 3 ++ .../hellominecraft/lang/I18N_vi.lang | 3 ++ .../hellominecraft/lang/I18N_vi.properties | 3 ++ .../hellominecraft/lang/I18N_zh.lang | 3 ++ .../hellominecraft/lang/I18N_zh.properties | 3 ++ .../hellominecraft/lang/I18N_zh_CN.lang | 3 ++ .../hellominecraft/lang/I18N_zh_CN.properties | 3 ++ 15 files changed, 154 insertions(+), 21 deletions(-) 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 8dd0fa45d..53685eed0 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 @@ -72,7 +72,6 @@ public final class Config implements Cloneable { @SerializedName("configurations") private TreeMap configurations; @SerializedName("auth") - @SuppressWarnings("FieldMayBeFinal") private Map auth; public List getJava() { @@ -130,7 +129,6 @@ public final class Config implements Cloneable { Settings.save(); } - /** * Last selected profile name. */ diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java index b00532e52..73c8780eb 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.setting; +import com.google.gson.annotations.SerializedName; import org.jackhuang.hellominecraft.launcher.util.HMCLGameLauncher; import org.jackhuang.hellominecraft.launcher.util.HMCLMinecraftService; import java.io.File; @@ -35,7 +36,14 @@ import org.jackhuang.hellominecraft.util.sys.OS; */ public final class Profile { - private String name, selectedMinecraftVersion = "", gameDir; + @SerializedName("name") + private String name; + @SerializedName("selectedMinecraftVersion") + private String selectedMinecraftVersion = ""; + @SerializedName("gameDir") + private String gameDir; + @SerializedName("global") + private VersionSetting global; private transient IMinecraftService service; private transient HMCLGameLauncher launcher = new HMCLGameLauncher(this); @@ -52,6 +60,7 @@ public final class Profile { public Profile(String name, String gameDir) { this.name = name; this.gameDir = gameDir; + this.global = new VersionSetting(); } public Profile(String name, Profile v) { @@ -82,7 +91,42 @@ public final class Profile { } public VersionSetting getVersionSetting(String id) { - return ((HMCLMinecraftService) service()).getVersionSetting(id); + VersionSetting vs = ((HMCLMinecraftService) service()).getVersionSetting(id); + if (vs == null || vs.isUsesGlobal()) { + global.isGlobal = true; + return global; + } else + return vs; + } + + public boolean isVersionSettingGlobe(String id) { + VersionSetting vs = ((HMCLMinecraftService) service()).getVersionSetting(id); + return vs == null || vs.isUsesGlobal(); + } + + public void makeVersionSettingSpecial(String id) { + HMCLMinecraftService s = (HMCLMinecraftService) service(); + VersionSetting vs = s.getVersionSetting(id); + if (vs == null) { + s.createVersionSetting(id); + vs = s.getVersionSetting(id); + if (vs == null) + return; + vs.setUsesGlobal(false); + } else + vs.setUsesGlobal(false); + propertyChanged.execute("selectedMinecraftVersion"); + selectedVersionChangedEvent.execute(selectedMinecraftVersion); + } + + public void makeVersionSettingGlobal(String id) { + HMCLMinecraftService s = (HMCLMinecraftService) service(); + VersionSetting vs = s.getVersionSetting(id); + if (vs == null) + return; + vs.setUsesGlobal(true); + propertyChanged.execute("selectedMinecraftVersion"); + selectedVersionChangedEvent.execute(selectedMinecraftVersion); } public String getSettingsSelectedMinecraftVersion() { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java index 9ba27169e..8f9d4157b 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java @@ -39,7 +39,10 @@ import org.jackhuang.hellominecraft.util.sys.OS; public class VersionSetting { public transient String id; + public transient boolean isGlobal = false; + @SerializedName("usesGlobal") + private boolean usesGlobal; @SerializedName("javaArgs") private String javaArgs; @SerializedName("minecraftArgs") @@ -88,6 +91,7 @@ public class VersionSetting { public VersionSetting() { fullscreen = false; + usesGlobal = true; launcherVisibility = 1; gameDirType = 0; javaDir = java = minecraftArgs = serverIp = precalledCommand = wrapper = ""; @@ -277,6 +281,15 @@ public class VersionSetting { propertyChanged.execute("notCheckGame"); } + public boolean isUsesGlobal() { + return usesGlobal; + } + + public void setUsesGlobal(boolean usesGlobal) { + this.usesGlobal = usesGlobal; + propertyChanged.execute("usesGlobal"); + } + public LaunchOptions createLaunchOptions(File gameDir) { LaunchOptions x = new LaunchOptions(); x.setFullscreen(isFullscreen()); diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.form b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.form index a55e8e82f..97e86eaf7 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.form +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.form @@ -23,9 +23,9 @@ - + - + @@ -35,6 +35,10 @@ + + + + @@ -52,6 +56,8 @@ + + @@ -63,7 +69,7 @@ - + @@ -192,7 +198,7 @@ - + @@ -449,7 +455,7 @@ - + @@ -612,7 +618,7 @@ - + @@ -970,5 +976,16 @@ + + + + + + + + + + + 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 d77353cbb..f4f61f7b4 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 @@ -56,6 +56,7 @@ import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion; import org.jackhuang.hellominecraft.launcher.setting.VersionSetting; import org.jackhuang.hellominecraft.util.MessageBox; import org.jackhuang.hellominecraft.util.AbstractSwingWorker; +import org.jackhuang.hellominecraft.util.Event; import org.jackhuang.hellominecraft.util.MinecraftVersionRequest; import org.jackhuang.hellominecraft.util.sys.OS; import org.jackhuang.hellominecraft.util.StrUtils; @@ -323,6 +324,7 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi btnShowLog = new javax.swing.JButton(); btnMakeLaunchScript = new javax.swing.JButton(); btnIncludeMinecraft = new javax.swing.JButton(); + lblUsesGlobal = new javax.swing.JLabel(); setBackground(new java.awt.Color(255, 255, 255)); setOpaque(false); @@ -513,7 +515,7 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi .addComponent(lblDimensionX, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(lblDimension) .addComponent(txtWidth, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 99, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 60, Short.MAX_VALUE) .addGroup(pnlSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(btnDownloadAllAssets) .addComponent(btnCleanGame)) @@ -644,7 +646,7 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi .addComponent(lblServerIP) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(txtServerIP, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 39, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(pnlAdvancedSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(chkNoJVMArgs) .addComponent(chkDontCheckGame)) @@ -709,7 +711,7 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(btnRemoveMod) .addGap(0, 0, Short.MAX_VALUE)) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 299, Short.MAX_VALUE)) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 259, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(lblModInfo)) ); @@ -905,22 +907,33 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi } }); + lblUsesGlobal.setText("jLabel1"); + lblUsesGlobal.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); + lblUsesGlobal.addMouseListener(new java.awt.event.MouseAdapter() { + public void mouseClicked(java.awt.event.MouseEvent evt) { + lblUsesGlobalMouseClicked(evt); + } + }); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(pnlTop, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addGroup(layout.createSequentialGroup() .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(tabVersionEdit) - .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(tabVersionEdit, javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGap(0, 0, Short.MAX_VALUE) .addComponent(btnMakeLaunchScript) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(btnShowLog) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnTestGame))) + .addComponent(btnTestGame)) + .addGroup(layout.createSequentialGroup() + .addComponent(lblUsesGlobal) + .addGap(0, 0, Short.MAX_VALUE))) .addContainerGap()) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() @@ -933,6 +946,8 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi .addGroup(layout.createSequentialGroup() .addComponent(pnlTop, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(lblUsesGlobal) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(tabVersionEdit) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) @@ -942,7 +957,7 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi .addContainerGap()) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addContainerGap(447, Short.MAX_VALUE) + .addContainerGap(421, Short.MAX_VALUE) .addComponent(btnIncludeMinecraft) .addContainerGap())) ); @@ -1183,6 +1198,16 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi loadVersions(); }//GEN-LAST:event_txtGameDirFocusLost + private void lblUsesGlobalMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_lblUsesGlobalMouseClicked + if (mcVersion == null) + return; + Profile profile = Settings.getLastProfile(); + if (profile.isVersionSettingGlobe(mcVersion)) + profile.makeVersionSettingSpecial(mcVersion); + else + profile.makeVersionSettingGlobal(mcVersion); + }//GEN-LAST:event_lblUsesGlobalMouseClicked + // // void prepareVersionSetting(VersionSetting profile) { @@ -1375,6 +1400,7 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi private javax.swing.JLabel lblProfile; private javax.swing.JLabel lblRunDirectory; private javax.swing.JLabel lblServerIP; + private javax.swing.JLabel lblUsesGlobal; private javax.swing.JLabel lblVersions; private javax.swing.JTable lstExternalMods; private javax.swing.JPanel pnlAdvancedSettings; @@ -1449,6 +1475,8 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi reloadMods(); prepareVersionSetting(Settings.getLastProfile().getVersionSetting(version)); loadMinecraftVersion(version); + + lblUsesGlobal.setText(C.i18n(Settings.getLastProfile().isVersionSettingGlobe(version) ? "settings.type.global" : "settings.type.special")); for (InstallerPanel p : installerPanels) p.loadVersions(); isLoading = false; diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java index c4573f34c..cce20f7f5 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/MainPagePanel.java @@ -533,7 +533,6 @@ public class MainPagePanel extends Page { model.setSelectedItem(selectedVersion); break; } - cboVersions.setToolTipText(selectedVersion); isLoading = false; } 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 ce8831bd2..e5a6e8175 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 @@ -93,7 +93,17 @@ public class HMCLMinecraftService extends IMinecraftService { } } if (vs == null) - vs = new VersionSetting(); + return; + initVersionSetting(id, vs); + } + + public void createVersionSetting(String id) { + if (provider.getVersionById(id) == null || versionSettings.containsKey(id)) + return; + initVersionSetting(id, new VersionSetting()); + } + + private void initVersionSetting(String id, VersionSetting vs) { vs.id = id; vs.propertyChanged.register((sender, t) -> { saveVersionSetting(((VersionSetting) sender).id); 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 e263e45f0..383e7e8e8 100755 --- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang +++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.lang @@ -223,6 +223,9 @@ settings.choose_gamedir=Choose Game Directory settings.failed_load=Failed to load settings file. Remove it? settings.test_game=Test game +settings.type.global=Click here to switch to version specialized setting. Now it is global setting. +settings.type.special=Click here to switch to global setting. Not it is version specialized setting. + modpack=Mod pack modpack.choose=Choose a modpack zip file which you want to import. If you want to update the modpack, please enter the version you want to update. modpack.export_error=Failed to export the modpack, maybe the format of your game directory is incorrect or failed to manage files. 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 e263e45f0..ed552f32f 100755 --- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties +++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N.properties @@ -223,6 +223,9 @@ settings.choose_gamedir=Choose Game Directory settings.failed_load=Failed to load settings file. Remove it? settings.test_game=Test game +settings.type.global=Click here to switch to version specialized setting. Now it is global setting. +settings.type.special=Click here to switch to global setting. Not it is version specialized setting. + modpack=Mod pack modpack.choose=Choose a modpack zip file which you want to import. If you want to update the modpack, please enter the version you want to update. modpack.export_error=Failed to export the modpack, maybe the format of your game directory is incorrect or failed to manage files. 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 43c2ffa2f..2118193c0 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 @@ -221,6 +221,9 @@ settings.choose_gamedir=Chọn thư mục game settings.failed_load=Đọc file cấu hình thất bại. Xóa nó không? settings.test_game=Chạy thử game +settings.type.global=Click here to switch to version specialized setting. Now it is global setting. +settings.type.special=Click here to switch to global setting. Not it is version specialized setting. + modpack=Mod pack modpack.choose=Chọn modpack zip file mà bạn muốn nhập vào. Nếu bạn muốn cập nhật phiên bản của modpack, Hãy nhập vào phiên bản bạn muốn cập nhật. modpack.export_error=Xuất modpack ra thất bại, có thể định dạng của thư mục chứa dữ liệu bị sai hoặc không thể quản lý file. 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 43041db27..8937e3725 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 @@ -221,6 +221,9 @@ settings.choose_gamedir=Ch\u1ecdn th\u01b0 m\u1ee5c game settings.failed_load=\u0110\u1ecdc file c\u1ea5u h\u00ecnh th\u1ea5t b\u1ea1i. X\u00f3a n\u00f3 kh\u00f4ng? settings.test_game=Ch\u1ea1y th\u1eed game +settings.type.global=Click here to switch to version specialized setting. Now it is global setting. +settings.type.special=Click here to switch to global setting. Not it is version specialized setting. + modpack=Mod pack modpack.choose=Ch\u1ecdn modpack zip file m\u00e0 b\u1ea1n mu\u1ed1n nh\u1eadp v\u00e0o. N\u1ebfu b\u1ea1n mu\u1ed1n c\u1eadp nh\u1eadt phi\u00ean b\u1ea3n c\u1ee7a modpack, H\u00e3y nh\u1eadp v\u00e0o phi\u00ean b\u1ea3n b\u1ea1n mu\u1ed1n c\u1eadp nh\u1eadt. modpack.export_error=Xu\u1ea5t modpack ra th\u1ea5t b\u1ea1i, c\u00f3 th\u1ec3 \u0111\u1ecbnh d\u1ea1ng c\u1ee7a th\u01b0 m\u1ee5c ch\u1ee9a d\u1eef li\u1ec7u b\u1ecb sai ho\u1eb7c kh\u00f4ng th\u1ec3 qu\u1ea3n l\u00fd file. diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.lang b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.lang index 3208d9484..a92d322cb 100755 --- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.lang +++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.lang @@ -223,6 +223,9 @@ settings.choose_gamedir=選擇遊戲路徑 settings.failed_load=設定資料加載失敗，可能是升級了啟動器或被人工修改造成錯誤，是否清除？ settings.test_game=測試遊戲 +settings.type.global=點擊此處切換為版本特定設定。該版本正在使用全局設定，修改以下設定會影響到其他使用全局設置的版本 +settings.type.special=點擊此處切換為全局設定。該版本正在使用版本特定設定，修改以下設定不會影響到其他版本設置 + modpack=懶人包 modpack.choose=選擇要導入的遊戲懶人包資料，如果您希望更新懶人包，請輸入要更新的版本名 modpack.export_error=導出失敗，可能是您的遊戲資料夾格式不正確或操作資料失敗 diff --git a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.properties b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.properties index 31af9d980..d3bfa2c2d 100755 --- a/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.properties +++ b/HMCUtils/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_zh.properties @@ -223,6 +223,9 @@ settings.choose_gamedir=\u9078\u64c7\u904a\u6232\u8def\u5f91 settings.failed_load=\u8a2d\u5b9a\u8cc7\u6599\u52a0\u8f09\u5931\u6557\uff0c\u53ef\u80fd\u662f\u5347\u7d1a\u4e86\u555f\u52d5\u5668\u6216\u88ab\u4eba\u5de5\u4fee\u6539\u9020\u6210\u932f\u8aa4\uff0c\u662f\u5426\u6e05\u9664\uff1f settings.test_game=\u6e2c\u8a66\u904a\u6232 +settings.type.global=\u9ede\u64ca\u6b64\u8655\u5207\u63db\u70ba\u7248\u672c\u7279\u5b9a\u8a2d\u5b9a\u3002\u8a72\u7248\u672c\u6b63\u5728\u4f7f\u7528\u5168\u5c40\u8a2d\u5b9a\uff0c\u4fee\u6539\u4ee5\u4e0b\u8a2d\u5b9a\u6703\u5f71\u97ff\u5230\u5176\u4ed6\u4f7f\u7528\u5168\u5c40\u8a2d\u7f6e\u7684\u7248\u672c +settings.type.special=\u9ede\u64ca\u6b64\u8655\u5207\u63db\u70ba\u5168\u5c40\u8a2d\u5b9a\u3002\u8a72\u7248\u672c\u6b63\u5728\u4f7f\u7528\u7248\u672c\u7279\u5b9a\u8a2d\u5b9a\uff0c\u4fee\u6539\u4ee5\u4e0b\u8a2d\u5b9a\u4e0d\u6703\u5f71\u97ff\u5230\u5176\u4ed6\u7248\u672c\u8a2d\u7f6e + modpack=\u61f6\u4eba\u5305 modpack.choose=\u9078\u64c7\u8981\u5c0e\u5165\u7684\u904a\u6232\u61f6\u4eba\u5305\u8cc7\u6599\uff0c\u5982\u679c\u60a8\u5e0c\u671b\u66f4\u65b0\u61f6\u4eba\u5305\uff0c\u8acb\u8f38\u5165\u8981\u66f4\u65b0\u7684\u7248\u672c\u540d modpack.export_error=\u5c0e\u51fa\u5931\u6557\uff0c\u53ef\u80fd\u662f\u60a8\u7684\u904a\u6232\u8cc7\u6599\u593e\u683c\u5f0f\u4e0d\u6b63\u78ba\u6216\u64cd\u4f5c\u8cc7\u6599\u5931\u6557 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 5233ccb85..68f8aaebb 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 @@ -223,6 +223,9 @@ settings.choose_gamedir=选择游戏路径 settings.failed_load=设置文件加载失败，可能是升级了启动器或被人工修改造成错误，是否清除？ settings.test_game=测试游戏 +settings.type.global=点击此处切换为版本特定设置。该版本正在使用全局设置，修改以下设置会影响到其他使用全局设置的版本 +settings.type.special=点击此处切换为全局设置。该版本正在使用版本特定设置，修改以下设置不会影响到其他版本设置 + modpack=整合包 modpack.choose=选择要导入的游戏整合包文件，如果您希望更新整合包，请输入要更新的版本名 modpack.export_error=导出失败，可能是您的游戏文件夹格式不正确或操作文件失败 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 2ba47d85d..efe6346e2 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 @@ -223,6 +223,9 @@ settings.choose_gamedir=\u9009\u62e9\u6e38\u620f\u8def\u5f84 settings.failed_load=\u8bbe\u7f6e\u6587\u4ef6\u52a0\u8f7d\u5931\u8d25\uff0c\u53ef\u80fd\u662f\u5347\u7ea7\u4e86\u542f\u52a8\u5668\u6216\u88ab\u4eba\u5de5\u4fee\u6539\u9020\u6210\u9519\u8bef\uff0c\u662f\u5426\u6e05\u9664\uff1f settings.test_game=\u6d4b\u8bd5\u6e38\u620f +settings.type.global=\u70b9\u51fb\u6b64\u5904\u5207\u6362\u4e3a\u7248\u672c\u7279\u5b9a\u8bbe\u7f6e\u3002\u8be5\u7248\u672c\u6b63\u5728\u4f7f\u7528\u5168\u5c40\u8bbe\u7f6e\uff0c\u4fee\u6539\u4ee5\u4e0b\u8bbe\u7f6e\u4f1a\u5f71\u54cd\u5230\u5176\u4ed6\u4f7f\u7528\u5168\u5c40\u8bbe\u7f6e\u7684\u7248\u672c +settings.type.special=\u70b9\u51fb\u6b64\u5904\u5207\u6362\u4e3a\u5168\u5c40\u8bbe\u7f6e\u3002\u8be5\u7248\u672c\u6b63\u5728\u4f7f\u7528\u7248\u672c\u7279\u5b9a\u8bbe\u7f6e\uff0c\u4fee\u6539\u4ee5\u4e0b\u8bbe\u7f6e\u4e0d\u4f1a\u5f71\u54cd\u5230\u5176\u4ed6\u7248\u672c\u8bbe\u7f6e + modpack=\u6574\u5408\u5305 modpack.choose=\u9009\u62e9\u8981\u5bfc\u5165\u7684\u6e38\u620f\u6574\u5408\u5305\u6587\u4ef6\uff0c\u5982\u679c\u60a8\u5e0c\u671b\u66f4\u65b0\u6574\u5408\u5305\uff0c\u8bf7\u8f93\u5165\u8981\u66f4\u65b0\u7684\u7248\u672c\u540d modpack.export_error=\u5bfc\u51fa\u5931\u8d25\uff0c\u53ef\u80fd\u662f\u60a8\u7684\u6e38\u620f\u6587\u4ef6\u5939\u683c\u5f0f\u4e0d\u6b63\u786e\u6216\u64cd\u4f5c\u6587\u4ef6\u5931\u8d25