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

Change version to 2.7.7

Browse Source
This commit is contained in:
huangyuhui 2017-05-20 19:10:38 +08:00
parent 532ff88ea4
commit a8bc4eb352
6 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HMCL/build.gradle
View File

@ -42,7 +42,7 @@ buildnumber = "25"
def versionroot = System.getenv("VERSION_ROOT") def versionroot = System.getenv("VERSION_ROOT")
if (versionroot == null) if (versionroot == null)
versionroot = "2.7.6" versionroot = "2.7.7"
String mavenGroupId = 'HMCL' String mavenGroupId = 'HMCL'
String mavenVersion = versionroot + '.' + buildnumber String mavenVersion = versionroot + '.' + buildnumber

10
HMCL/src/main/java/org/jackhuang/hmcl/ui/GameSettingsPanel.form
View File

@ -86,7 +86,7 @@
<SubComponents> <SubComponents>
<Container class="javax.swing.JPanel" name="pnlSettings"> <Container class="javax.swing.JPanel" name="pnlSettings">
<AuxValues> <AuxValues>
<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new Page()"/> <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation())"/>
</AuxValues> </AuxValues>
<Constraints> <Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription"> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
@ -383,7 +383,7 @@
</Container> </Container>
<Container class="javax.swing.JPanel" name="pnlAdvancedSettings"> <Container class="javax.swing.JPanel" name="pnlAdvancedSettings">
<AuxValues> <AuxValues>
<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new Page()"/> <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation())"/>
</AuxValues> </AuxValues>
<Constraints> <Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription"> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
@ -593,7 +593,7 @@
</Container> </Container>
<Container class="javax.swing.JPanel" name="pnlModManagement"> <Container class="javax.swing.JPanel" name="pnlModManagement">
<AuxValues> <AuxValues>
<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new Page()"/> <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation())"/>
</AuxValues> </AuxValues>
<Constraints> <Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription"> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
@ -620,7 +620,7 @@
<SubComponents> <SubComponents>
<Container class="javax.swing.JPanel" name="pnlModManagementContent"> <Container class="javax.swing.JPanel" name="pnlModManagementContent">
<AuxValues> <AuxValues>
<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new Page()"/> <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation())"/>
</AuxValues> </AuxValues>
<Layout> <Layout>
@ -724,7 +724,7 @@
</Container> </Container>
<Container class="javax.swing.JPanel" name="pnlAutoInstall"> <Container class="javax.swing.JPanel" name="pnlAutoInstall">
<AuxValues> <AuxValues>
<AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new Page()"/> <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation())"/>
</AuxValues> </AuxValues>
<Constraints> <Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription"> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">

12
HMCL/src/main/java/org/jackhuang/hmcl/ui/GameSettingsPanel.java
View File

@ -110,7 +110,7 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi
for (int i = 0; i < InstallerType.values().length; i++) for (int i = 0; i < InstallerType.values().length; i++)
installerPanels[i] = new InstallerPanel(this, InstallerType.values()[i]); installerPanels[i] = new InstallerPanel(this, InstallerType.values()[i]);
pnlGameDownloads = new GameDownloadPanel(this); pnlGameDownloads = new GameDownloadPanel(this).setAnimationEnabled(Settings.getInstance().isEnableAnimation());
initExplorationMenu(); initExplorationMenu();
initManagementMenu(); initManagementMenu();
@ -278,7 +278,7 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi
tabVersionEdit = new NewTabPane(); tabVersionEdit = new NewTabPane();
((NewTabPane)tabVersionEdit).initializing = true; ((NewTabPane)tabVersionEdit).initializing = true;
pnlSettings = new Page(); pnlSettings = new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation());
lblGameDir = new javax.swing.JLabel(); lblGameDir = new javax.swing.JLabel();
txtGameDir = new javax.swing.JTextField(); txtGameDir = new javax.swing.JTextField();
lblDimension = new javax.swing.JLabel(); lblDimension = new javax.swing.JLabel();
@ -301,7 +301,7 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi
btnChoosingGameDir = new javax.swing.JButton(); btnChoosingGameDir = new javax.swing.JButton();
btnCleanGame = new javax.swing.JButton(); btnCleanGame = new javax.swing.JButton();
lblUsesGlobal = new javax.swing.JLabel(); lblUsesGlobal = new javax.swing.JLabel();
pnlAdvancedSettings = new Page(); pnlAdvancedSettings = new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation());
lblJavaArgs = new javax.swing.JLabel(); lblJavaArgs = new javax.swing.JLabel();
txtJavaArgs = new javax.swing.JTextField(); txtJavaArgs = new javax.swing.JTextField();
txtMinecraftArgs = new javax.swing.JTextField(); txtMinecraftArgs = new javax.swing.JTextField();
@ -317,14 +317,14 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi
txtWrapperLauncher = new javax.swing.JTextField(); txtWrapperLauncher = new javax.swing.JTextField();
chkDontCheckGame = new javax.swing.JCheckBox(); chkDontCheckGame = new javax.swing.JCheckBox();
chkNoCommon = new javax.swing.JCheckBox(); chkNoCommon = new javax.swing.JCheckBox();
pnlModManagement = new Page(); pnlModManagement = new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation());
pnlModManagementContent = new Page(); pnlModManagementContent = new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation());
jScrollPane1 = new javax.swing.JScrollPane(); jScrollPane1 = new javax.swing.JScrollPane();
lstExternalMods = new javax.swing.JTable(); lstExternalMods = new javax.swing.JTable();
btnAddMod = new javax.swing.JButton(); btnAddMod = new javax.swing.JButton();
btnRemoveMod = new javax.swing.JButton(); btnRemoveMod = new javax.swing.JButton();
lblModInfo = new javax.swing.JLabel(); lblModInfo = new javax.swing.JLabel();
pnlAutoInstall = new Page(); pnlAutoInstall = new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation());
tabInstallers = new NewTabPane(); tabInstallers = new NewTabPane();
pnlTop = new javax.swing.JPanel(); pnlTop = new javax.swing.JPanel();
pnlSelection = new javax.swing.JPanel(); pnlSelection = new javax.swing.JPanel();

2
HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerPanel.java
View File

@ -51,6 +51,8 @@ public class InstallerPanel extends Page implements ProgressProviderListener {
public InstallerPanel(GameSettingsPanel gsp, InstallerType installerType) { public InstallerPanel(GameSettingsPanel gsp, InstallerType installerType) {
initComponents(); initComponents();
animationEnabled = Settings.getInstance().isEnableAnimation();
setOpaque(false); setOpaque(false);
this.gsp = gsp; this.gsp = gsp;
id = installerType; id = installerType;

2
HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ReflectionHelper.java
View File

@ -26,7 +26,7 @@ import java.security.PrivilegedExceptionAction;
import sun.misc.Unsafe; import sun.misc.Unsafe;
/** /**
* * This class is for breaking the module system of Java 9.
* @author huang * @author huang
*/ */
public class ReflectionHelper { public class ReflectionHelper {

5
HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/Page.java
View File

@ -149,6 +149,11 @@ public class Page extends TopTabPage {
protected boolean animationEnabled = true; protected boolean animationEnabled = true;
public Page setAnimationEnabled(boolean a) {
animationEnabled = a;
return this;
}
public void animate() { public void animate() {
if (animationEnabled) { if (animationEnabled) {
offsetX = 0; offsetX = 0;