Change version to 2.7.7

HMCL-dev · May 20, 2017 · a8bc4eb · a8bc4eb
1 parent 532ff88
commit a8bc4eb
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 13 deletions.
diff --git a/HMCL/build.gradle b/HMCL/build.gradle
@@ -42,7 +42,7 @@ buildnumber = "25"
 
 def versionroot = System.getenv("VERSION_ROOT")
 if (versionroot == null)
-versionroot = "2.7.6"
+versionroot = "2.7.7"
 
 String mavenGroupId = 'HMCL'
 String mavenVersion = versionroot + '.' + buildnumber

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameSettingsPanel.form b/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameSettingsPanel.form
@@ -86,7 +86,7 @@
       <SubComponents>
         <Container class="javax.swing.JPanel" name="pnlSettings">
           <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>
           <Constraints>
             <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 class="javax.swing.JPanel" name="pnlAdvancedSettings">
           <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>
           <Constraints>
             <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 class="javax.swing.JPanel" name="pnlModManagement">
           <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>
           <Constraints>
             <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>
             <Container class="javax.swing.JPanel" name="pnlModManagementContent">
               <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>
 
               <Layout>
@@ -724,7 +724,7 @@
         </Container>
         <Container class="javax.swing.JPanel" name="pnlAutoInstall">
           <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>
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameSettingsPanel.java
@@ -110,7 +110,7 @@ void initGui() {
 
         for (int i = 0; i < InstallerType.values().length; i++)
             installerPanels[i] = new InstallerPanel(this, InstallerType.values()[i]);
-        pnlGameDownloads = new GameDownloadPanel(this);
+        pnlGameDownloads = new GameDownloadPanel(this).setAnimationEnabled(Settings.getInstance().isEnableAnimation());
 
         initExplorationMenu();
         initManagementMenu();
@@ -278,7 +278,7 @@ private void initComponents() {
 
         tabVersionEdit = new NewTabPane();
         ((NewTabPane)tabVersionEdit).initializing = true;
-        pnlSettings = new Page();
+        pnlSettings = new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation());
         lblGameDir = new javax.swing.JLabel();
         txtGameDir = new javax.swing.JTextField();
         lblDimension = new javax.swing.JLabel();
@@ -301,7 +301,7 @@ private void initComponents() {
         btnChoosingGameDir = new javax.swing.JButton();
         btnCleanGame = new javax.swing.JButton();
         lblUsesGlobal = new javax.swing.JLabel();
-        pnlAdvancedSettings = new Page();
+        pnlAdvancedSettings = new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation());
         lblJavaArgs = new javax.swing.JLabel();
         txtJavaArgs = new javax.swing.JTextField();
         txtMinecraftArgs = new javax.swing.JTextField();
@@ -317,14 +317,14 @@ private void initComponents() {
         txtWrapperLauncher = new javax.swing.JTextField();
         chkDontCheckGame = new javax.swing.JCheckBox();
         chkNoCommon = new javax.swing.JCheckBox();
-        pnlModManagement = new Page();
-        pnlModManagementContent = new Page();
+        pnlModManagement = new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation());
+        pnlModManagementContent = new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation());
         jScrollPane1 = new javax.swing.JScrollPane();
         lstExternalMods = new javax.swing.JTable();
         btnAddMod = new javax.swing.JButton();
         btnRemoveMod = new javax.swing.JButton();
         lblModInfo = new javax.swing.JLabel();
-        pnlAutoInstall = new Page();
+        pnlAutoInstall = new Page().setAnimationEnabled(Settings.getInstance().isEnableAnimation());
         tabInstallers = new NewTabPane();
         pnlTop = new javax.swing.JPanel();
         pnlSelection = new javax.swing.JPanel();

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerPanel.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/InstallerPanel.java
@@ -50,6 +50,8 @@ public class InstallerPanel extends Page implements ProgressProviderListener {
      */
     public InstallerPanel(GameSettingsPanel gsp, InstallerType installerType) {
         initComponents();
+
+        animationEnabled = Settings.getInstance().isEnableAnimation();
 
         setOpaque(false);
         this.gsp = gsp;

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ReflectionHelper.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/sys/ReflectionHelper.java
@@ -26,7 +26,7 @@
 import sun.misc.Unsafe;
 
 /**
- *
+ * This class is for breaking the module system of Java 9.
  * @author huang
  */
 public class ReflectionHelper {

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/Page.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ui/Page.java
@@ -148,6 +148,11 @@ protected void superPaint(Graphics2D g) {
     Timer timer;
 
     protected boolean animationEnabled = true;
+
+    public Page setAnimationEnabled(boolean a) {
+        animationEnabled = a;
+        return this;
+    }
 
     public void animate() {
         if (animationEnabled) {