lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix snapshot version wrong gathering

Browse Source
This commit is contained in:
huangyuhui
2016-02-02 19:12:05 +08:00
parent 0f18e7c1a1
commit 0821b67019
11 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionList.java
View File

@@ -63,6 +63,8 @@ public class LiteLoaderVersionList extends InstallerVersionList {
for (Map.Entry<String, LiteLoaderMCVersions> arr : root.versions.entrySet()) { for (Map.Entry<String, LiteLoaderMCVersions> arr : root.versions.entrySet()) {
ArrayList<InstallerVersion> al = new ArrayList<>(); ArrayList<InstallerVersion> al = new ArrayList<>();
LiteLoaderMCVersions mcv = arr.getValue(); LiteLoaderMCVersions mcv = arr.getValue();
if (mcv == null || mcv.artefacts == null || mcv.artefacts.get("com.mumfrey:liteloader") == null)
continue;
for (Map.Entry<String, LiteLoaderVersion> entry : mcv.artefacts.get("com.mumfrey:liteloader").entrySet()) { for (Map.Entry<String, LiteLoaderVersion> entry : mcv.artefacts.get("com.mumfrey:liteloader").entrySet()) {
if ("latest".equals(entry.getKey())) if ("latest".equals(entry.getKey()))
continue; continue;

5
HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Profile.java
View File

@@ -60,7 +60,12 @@ public final class Profile {
return service; return service;
} }
private transient final VersionSetting defaultVersionSetting = new VersionSetting();
public VersionSetting getSelectedVersionSetting() { public VersionSetting getSelectedVersionSetting() {
String s = getSelectedVersion();
if (s == null)
return defaultVersionSetting;
return getVersionSetting(getSelectedVersion()); return getVersionSetting(getSelectedVersion());
} }

7
HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.form
View File

@@ -17,13 +17,12 @@
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="jScrollPane2" pref="352" max="32767" attributes="0"/> <Component id="jScrollPane2" pref="350" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0"> <Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="btnRefreshGameDownloads" alignment="0" max="32767" attributes="0"/> <Component id="btnDownload" max="32767" attributes="0"/>
<Component id="btnDownload" alignment="0" min="-2" max="-2" attributes="0"/> <Component id="btnRefreshGameDownloads" max="32767" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>

7
HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameDownloadPanel.java
View File

@@ -78,12 +78,11 @@ public class GameDownloadPanel extends AnimatedPanel implements Selectable {
layout.setHorizontalGroup( layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 352, Short.MAX_VALUE) .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 350, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(btnRefreshGameDownloads, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(btnDownload, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(btnDownload)) .addComponent(btnRefreshGameDownloads, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
.addGap(0, 0, 0))
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)

61
HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.form
View File

@@ -23,7 +23,11 @@
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="pnlTop" alignment="0" max="32767" attributes="0"/> <Component id="pnlTop" alignment="0" max="32767" attributes="0"/>
<Component id="tabVersionEdit" alignment="0" max="32767" attributes="0"/> <Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="tabVersionEdit" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
<DimensionLayout dim="1"> <DimensionLayout dim="1">
@@ -31,8 +35,8 @@
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="pnlTop" min="-2" max="-2" attributes="0"/> <Component id="pnlTop" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="tabVersionEdit" min="-2" pref="338" max="-2" attributes="0"/> <Component id="tabVersionEdit" max="32767" attributes="0"/>
<EmptySpace max="32767" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@@ -68,7 +72,7 @@
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/> <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
@@ -88,7 +92,7 @@
<Component id="lblDimensionX" min="-2" max="-2" attributes="0"/> <Component id="lblDimensionX" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="txtHeight" min="-2" pref="100" max="-2" attributes="0"/> <Component id="txtHeight" min="-2" pref="100" max="-2" attributes="0"/>
<EmptySpace pref="414" max="32767" attributes="0"/> <EmptySpace pref="402" max="32767" attributes="0"/>
<Component id="chkFullscreen" min="-2" max="-2" attributes="0"/> <Component id="chkFullscreen" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
@@ -355,7 +359,7 @@
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/> <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="txtPrecalledCommand" alignment="0" max="32767" attributes="0"/> <Component id="txtPrecalledCommand" alignment="0" max="32767" attributes="0"/>
<Component id="txtServerIP" alignment="0" max="32767" attributes="0"/> <Component id="txtServerIP" alignment="0" max="32767" attributes="0"/>
@@ -559,21 +563,16 @@
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0"> <Component id="jScrollPane1" pref="889" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0"> <EmptySpace max="-2" attributes="0"/>
<Component id="jScrollPane1" pref="913" max="32767" attributes="0"/> <Group type="103" groupAlignment="0" max="-2" attributes="0">
<EmptySpace max="-2" attributes="0"/> <Component id="btnRemoveMod" max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Component id="btnAddMod" max="32767" attributes="0"/>
<Component id="btnRemoveMod" min="-2" max="-2" attributes="0"/>
<Component id="btnAddMod" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="lblModInfo" pref="1009" max="32767" attributes="0"/>
</Group>
</Group> </Group>
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/> </Group>
<Group type="102" alignment="1" attributes="0">
<Component id="lblModInfo" pref="985" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@@ -587,11 +586,10 @@
<Component id="btnRemoveMod" min="-2" max="-2" attributes="0"/> <Component id="btnRemoveMod" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/> <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group> </Group>
<Component id="jScrollPane1" pref="272" max="32767" attributes="0"/> <Component id="jScrollPane1" pref="284" max="32767" attributes="0"/>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="lblModInfo" min="-2" max="-2" attributes="0"/> <Component id="lblModInfo" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@@ -731,16 +729,13 @@
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Component id="lblVersions" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="lblProfile" min="-2" max="-2" attributes="0"/> <Component id="lblProfile" alignment="0" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> </Group>
<Component id="cboProfiles" max="32767" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Component id="cboProfiles" max="32767" attributes="0"/>
<Component id="lblVersions" min="-2" max="-2" attributes="0"/> <Component id="cboVersions" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cboVersions" max="32767" attributes="0"/>
</Group>
</Group> </Group>
</Group> </Group>
</Group> </Group>

54
HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/GameSettingsPanel.java
View File

@@ -405,7 +405,7 @@ public final class GameSettingsPanel extends AnimatedPanel implements DropTarget
pnlSettingsLayout.setHorizontalGroup( pnlSettingsLayout.setHorizontalGroup(
pnlSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) pnlSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(pnlSettingsLayout.createSequentialGroup() .addGroup(pnlSettingsLayout.createSequentialGroup()
.addContainerGap() .addGap(0, 0, 0)
.addGroup(pnlSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(pnlSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(pnlSettingsLayout.createSequentialGroup() .addGroup(pnlSettingsLayout.createSequentialGroup()
.addGroup(pnlSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(pnlSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -424,7 +424,7 @@ public final class GameSettingsPanel extends AnimatedPanel implements DropTarget
.addComponent(lblDimensionX) .addComponent(lblDimensionX)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(txtHeight, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(txtHeight, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 414, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 402, Short.MAX_VALUE)
.addComponent(chkFullscreen)) .addComponent(chkFullscreen))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnlSettingsLayout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnlSettingsLayout.createSequentialGroup()
.addComponent(txtMaxMemory) .addComponent(txtMaxMemory)
@@ -557,7 +557,7 @@ public final class GameSettingsPanel extends AnimatedPanel implements DropTarget
pnlAdvancedSettingsLayout.setHorizontalGroup( pnlAdvancedSettingsLayout.setHorizontalGroup(
pnlAdvancedSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) pnlAdvancedSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(pnlAdvancedSettingsLayout.createSequentialGroup() .addGroup(pnlAdvancedSettingsLayout.createSequentialGroup()
.addContainerGap() .addGap(0, 0, 0)
.addGroup(pnlAdvancedSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(pnlAdvancedSettingsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(txtPrecalledCommand) .addComponent(txtPrecalledCommand)
.addComponent(txtServerIP) .addComponent(txtServerIP)
@@ -655,17 +655,14 @@ public final class GameSettingsPanel extends AnimatedPanel implements DropTarget
pnlModManagementContentLayout.setHorizontalGroup( pnlModManagementContentLayout.setHorizontalGroup(
pnlModManagementContentLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) pnlModManagementContentLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(pnlModManagementContentLayout.createSequentialGroup() .addGroup(pnlModManagementContentLayout.createSequentialGroup()
.addGroup(pnlModManagementContentLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 889, Short.MAX_VALUE)
.addGroup(pnlModManagementContentLayout.createSequentialGroup() .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 913, Short.MAX_VALUE) .addGroup(pnlModManagementContentLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(btnRemoveMod, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(pnlModManagementContentLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(btnAddMod, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
.addComponent(btnRemoveMod) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnlModManagementContentLayout.createSequentialGroup()
.addComponent(btnAddMod))) .addComponent(lblModInfo, javax.swing.GroupLayout.DEFAULT_SIZE, 985, Short.MAX_VALUE)
.addGroup(pnlModManagementContentLayout.createSequentialGroup() .addContainerGap())
.addContainerGap()
.addComponent(lblModInfo, javax.swing.GroupLayout.DEFAULT_SIZE, 1009, Short.MAX_VALUE)))
.addGap(0, 0, 0))
); );
pnlModManagementContentLayout.setVerticalGroup( pnlModManagementContentLayout.setVerticalGroup(
pnlModManagementContentLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) pnlModManagementContentLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -676,10 +673,9 @@ public final class GameSettingsPanel extends AnimatedPanel implements DropTarget
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(btnRemoveMod) .addComponent(btnRemoveMod)
.addGap(0, 0, Short.MAX_VALUE)) .addGap(0, 0, Short.MAX_VALUE))
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 272, Short.MAX_VALUE)) .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 284, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(lblModInfo) .addComponent(lblModInfo))
.addContainerGap())
); );
javax.swing.GroupLayout pnlModManagementLayout = new javax.swing.GroupLayout(pnlModManagement); javax.swing.GroupLayout pnlModManagementLayout = new javax.swing.GroupLayout(pnlModManagement);
@@ -733,14 +729,12 @@ public final class GameSettingsPanel extends AnimatedPanel implements DropTarget
.addGroup(pnlSelectionLayout.createSequentialGroup() .addGroup(pnlSelectionLayout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addGroup(pnlSelectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(pnlSelectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(pnlSelectionLayout.createSequentialGroup() .addComponent(lblVersions)
.addComponent(lblProfile) .addComponent(lblProfile))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(cboProfiles, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addGroup(pnlSelectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(pnlSelectionLayout.createSequentialGroup() .addComponent(cboProfiles, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(lblVersions) .addComponent(cboVersions, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(cboVersions, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
); );
pnlSelectionLayout.setVerticalGroup( pnlSelectionLayout.setVerticalGroup(
pnlSelectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) pnlSelectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -852,15 +846,18 @@ public final class GameSettingsPanel extends AnimatedPanel implements DropTarget
layout.setHorizontalGroup( layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(pnlTop, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(pnlTop, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(tabVersionEdit) .addGroup(layout.createSequentialGroup()
.addContainerGap()
.addComponent(tabVersionEdit)
.addContainerGap())
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(pnlTop, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(pnlTop, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(tabVersionEdit, javax.swing.GroupLayout.PREFERRED_SIZE, 338, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(tabVersionEdit)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addContainerGap())
); );
((NewTabPane)tabVersionEdit).initializing = false; ((NewTabPane)tabVersionEdit).initializing = false;
@@ -1235,6 +1232,7 @@ public final class GameSettingsPanel extends AnimatedPanel implements DropTarget
public void versionChanged(String version) { public void versionChanged(String version) {
this.mcVersion = version; this.mcVersion = version;
prepareVersionSetting(getProfile().getVersionSetting(version)); prepareVersionSetting(getProfile().getVersionSetting(version));
loadMinecraftVersion(version);
for (InstallerPanel p : installerPanels) for (InstallerPanel p : installerPanels)
p.loadVersions(); p.loadVersions();
} }

6
HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.form
View File

@@ -19,9 +19,9 @@
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="jScrollPane12" pref="292" max="32767" attributes="0"/> <Component id="jScrollPane12" pref="292" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="btnInstall" alignment="1" min="-2" max="-2" attributes="0"/> <Component id="btnRefresh" max="32767" attributes="0"/>
<Component id="btnRefresh" alignment="1" min="-2" max="-2" attributes="0"/> <Component id="btnInstall" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</Group> </Group>

6
HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/ui/InstallerPanel.java
View File

@@ -95,9 +95,9 @@ public class InstallerPanel extends AnimatedPanel implements Selectable {
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(jScrollPane12, javax.swing.GroupLayout.DEFAULT_SIZE, 292, Short.MAX_VALUE) .addComponent(jScrollPane12, javax.swing.GroupLayout.DEFAULT_SIZE, 292, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(btnInstall, javax.swing.GroupLayout.Alignment.TRAILING) .addComponent(btnRefresh, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(btnRefresh, javax.swing.GroupLayout.Alignment.TRAILING))) .addComponent(btnInstall, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)

4
HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/version/MinecraftVersionRequest.java
View File

@@ -139,7 +139,9 @@ public class MinecraftVersionRequest {
return r; return r;
} }
int k = i; int k = i;
while (tmp[k] >= 48 && tmp[k] <= 57 || tmp[k] == 46) if (tmp[i + 1] >= (int) 'a' && tmp[i + 1] <= (int) 'z')
i++;
while (tmp[k] >= 48 && tmp[k] <= 57 || tmp[k] == (int) '.' || tmp[k] == (int) 'w')
k--; k--;
k++; k++;
r.version = new String(tmp, k, i - k + 1); r.version = new String(tmp, k, i - k + 1);

8
HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.lang
View File

@@ -239,14 +239,14 @@ mods.default_information=<html><font color=#c0392b>Please ensure that you have i
advancedsettings=Advanced advancedsettings=Advanced
advancedsettings.launcher_visible=Launcher Visibility advancedsettings.launcher_visible=Launcher Visibility
advancedsettings.debug_mode=Debug Mode advancedsettings.debug_mode=Debug Mode
advancedsettings.java_permanent_generation_space=Permanent Generation Space/MB advancedsettings.java_permanent_generation_space=PermGen Space/MB
advancedsettings.jvm_args=Java VM Arguments advancedsettings.jvm_args=Java VM Arguments
advancedsettings.Minecraft_arguments=Minecraft Arguments advancedsettings.Minecraft_arguments=Minecraft Arguments
advancedsettings.launcher_visibility.close=Close the launcher when the game launched. advancedsettings.launcher_visibility.close=Close the launcher when the game launched.
advancedsettings.launcher_visibility.hide=Hide the launcher when the game launched. advancedsettings.launcher_visibility.hide=Hide the launcher when the game launched.
advancedsettings.launcher_visibility.keep=Keep the launcher visible. advancedsettings.launcher_visibility.keep=Keep the launcher visible.
advancedsettings.game_dir.default=Default (.minecraft/) advancedsettings.game_dir.default=Default (.minecraft/)
advancedsettings.game_dir.independent=Independent (.minecraft/versions/<version name>/,\u9664assets,libraries) advancedsettings.game_dir.independent=Independent (.minecraft/versions/<version name>/,除assets,libraries)
advancedsettings.no_jvm_args=No JVM Args advancedsettings.no_jvm_args=No JVM Args
advancedsettings.java_args_default=Default java args: -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -XX:MaxPermSize=???m -Xmx???m -Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.ignorePatchDiscrepancies=true advancedsettings.java_args_default=Default java args: -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -XX:MaxPermSize=???m -Xmx???m -Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.ignorePatchDiscrepancies=true
advancedsettings.wrapper_launcher=Wrapper Launcher(like optirun...) advancedsettings.wrapper_launcher=Wrapper Launcher(like optirun...)
@@ -260,7 +260,7 @@ mainwindow.enter_script_name=Enter the script name.
mainwindow.make_launch_succeed=Finished script creation. mainwindow.make_launch_succeed=Finished script creation.
mainwindow.no_version=No version found. Switch to Game Downloads Tab? mainwindow.no_version=No version found. Switch to Game Downloads Tab?
launcher.about=<html>About Author<br/>\nEmail\uff1ahuanghongxun2008@126.com<br/>\nMinecraft Forum ID: klkl6523<br/>\nCopyright (c) 2013 huangyuhui<br/>Opened source under GPL v3 license:http://github.com/huanghongxun/HMCL/<br/>This software used project Gson which is under Apache License 2.0, thanks contributors.</html> launcher.about=<html>About Author<br/>\nEmail：huanghongxun2008@126.com<br/>\nMinecraft Forum ID: klkl6523<br/>\nCopyright (c) 2013 huangyuhui<br/>Opened source under GPL v3 license:http://github.com/huanghongxun/HMCL/<br/>This software used project Gson which is under Apache License 2.0, thanks contributors.</html>
launcher.download_source=Download Source launcher.download_source=Download Source
launcher.background_location=Background Location launcher.background_location=Background Location
launcher.exit_failed=Failed to shutdown. launcher.exit_failed=Failed to shutdown.
@@ -315,7 +315,7 @@ taskwindow.total_progress=Total progress
taskwindow.cancel=Cancel taskwindow.cancel=Cancel
taskwindow.no_more_instance=Maybe you opened more than one task window, dont open it again! taskwindow.no_more_instance=Maybe you opened more than one task window, dont open it again!
taskwindow.file_name=Task taskwindow.file_name=Task
taskwindow.download_progress=Progress taskwindow.download_progress=Pgs.
setupwindow.include_minecraft=Import game setupwindow.include_minecraft=Import game
setupwindow.find_in_configurations=Finished importing. You can find it in the configuration selection bar. setupwindow.find_in_configurations=Finished importing. You can find it in the configuration selection bar.

4
HMCLAPI/src/main/resources/org/jackhuang/hellominecraft/lang/I18N_en.properties
View File

@@ -239,7 +239,7 @@ mods.default_information=<html><font color=#c0392b>Please ensure that you have i
advancedsettings=Advanced advancedsettings=Advanced
advancedsettings.launcher_visible=Launcher Visibility advancedsettings.launcher_visible=Launcher Visibility
advancedsettings.debug_mode=Debug Mode advancedsettings.debug_mode=Debug Mode
advancedsettings.java_permanent_generation_space=Permanent Generation Space/MB advancedsettings.java_permanent_generation_space=PermGen Space/MB
advancedsettings.jvm_args=Java VM Arguments advancedsettings.jvm_args=Java VM Arguments
advancedsettings.Minecraft_arguments=Minecraft Arguments advancedsettings.Minecraft_arguments=Minecraft Arguments
advancedsettings.launcher_visibility.close=Close the launcher when the game launched. advancedsettings.launcher_visibility.close=Close the launcher when the game launched.
@@ -315,7 +315,7 @@ taskwindow.total_progress=Total progress
taskwindow.cancel=Cancel taskwindow.cancel=Cancel
taskwindow.no_more_instance=Maybe you opened more than one task window, dont open it again! taskwindow.no_more_instance=Maybe you opened more than one task window, dont open it again!
taskwindow.file_name=Task taskwindow.file_name=Task
taskwindow.download_progress=Progress taskwindow.download_progress=Pgs.
setupwindow.include_minecraft=Import game setupwindow.include_minecraft=Import game
setupwindow.find_in_configurations=Finished importing. You can find it in the configuration selection bar. setupwindow.find_in_configurations=Finished importing. You can find it in the configuration selection bar.