diff --git a/HMCL/build.gradle b/HMCL/build.gradle index 6e2a221e7..f802dd095 100755 --- 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 index ab998cefd..221fa6375 100755 --- 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 @@ - + @@ -383,7 +383,7 @@ - + @@ -593,7 +593,7 @@ - + @@ -620,7 +620,7 @@ - + @@ -724,7 +724,7 @@ - + diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameSettingsPanel.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/GameSettingsPanel.java index 5fa14b9da..c1798ad80 100755 --- 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 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi 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 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi 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 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi 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 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi 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 index 4ca40dc43..04f8ea083 100755 --- 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 index 461fb01f8..3b0fb9db5 100644 --- 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 java.security.PrivilegedExceptionAction; 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 index 4469c5c71..84e14228f 100644 --- 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 @@ public class Page extends TopTabPage { Timer timer; protected boolean animationEnabled = true; + + public Page setAnimationEnabled(boolean a) { + animationEnabled = a; + return this; + } public void animate() { if (animationEnabled) {