From 23a805d576fcef6590b5764817041e41ad716813 Mon Sep 17 00:00:00 2001
From: huanghongxun <i@huangyuhui.net>
Date: Mon, 18 Oct 2021 03:02:57 +0800
Subject: [PATCH] build: proguard works without multi-release.

---
 HMCL/build.gradle                             | 22 +++++++++++++------
 .../hmcl/ui/versions/VersionSettingsPage.java |  1 -
 HMCL/src/main/resources/assets/css/root.css   |  3 ++-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/HMCL/build.gradle b/HMCL/build.gradle
index 64ab31487..94ee39715 100644
--- a/HMCL/build.gradle
+++ b/HMCL/build.gradle
@@ -170,16 +170,22 @@ task proguard(type: proguard.gradle.ProGuardTask) {
 
     outjars "${buildDir}/libs/${project.name}-${project.version}-proguard.jar"
 
-
     dontobfuscate
     dontoptimize
-    dontpreverify
-    printusage
 
-    keep 'public class org.jackhuang.** { *; }'
-    keepclassmembers 'public class org.jackhuang.** { *; }'
-    keep 'public class com.jfoenix.** { *; }'
-    keepclassmembers 'public class com.jfoenix.** { *; }'
+    keep 'class org.jackhuang.** { *; }'
+    keep 'class com.jfoenix.** { *; }'
+    keep 'class com.google.gson.** { *; }'
+    keep 'class com.github.steveice10.opennbt.** { *; }' // TagRegistry use reflection to create object instance
+
+    keep 'class * extends com.google.gson.TypeAdapter'
+    keep 'class * implements com.google.gson.TypeAdapterFactory'
+    keep 'class * implements com.google.gson.JsonSerializer'
+    keep 'class * implements com.google.gson.JsonDeserializer'
+
+    printusage "${buildDir}/libs/proguard-shrinking-details.txt"
+
+    System.out.println(new File(".").absolutePath)
 
     dontwarn 'com.nqzero.**'
     dontwarn 'org.slf4j.**'
@@ -194,6 +200,8 @@ task proguard(type: proguard.gradle.ProGuardTask) {
     libraryjars files(configurations.compileClasspath.collect())
 
     keepattributes 'SourceFile,LineNumberTable'
+    keepattributes '*Annotation*'
+    keepattributes 'Signature'
 
     var javaHome = System.getProperty('java.home')
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java
index f6623fa5e..76d416148 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java
@@ -400,7 +400,6 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
 
                 txtServerIP = new JFXTextField();
                 txtServerIP.setPromptText(i18n("settings.advanced.server_ip.prompt"));
-                txtServerIP.getStyleClass().add("fit-width");
                 FXUtils.setLimitWidth(txtServerIP, 300);
                 serverPane.addRow(0, new Label(i18n("settings.advanced.server_ip")), txtServerIP);
             }
diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css
index f8e84a7f1..8d016ceed 100644
--- a/HMCL/src/main/resources/assets/css/root.css
+++ b/HMCL/src/main/resources/assets/css/root.css
@@ -743,7 +743,7 @@
     -fx-font-weight: BOLD;
     -fx-prompt-text-fill: #808080;
     -fx-alignment: top-left;
-    -fx-pref-width: 300.0;
+    -fx-max-width: 1000000000;
     -jfx-focus-color: -fx-base-check-color;
     -fx-padding: 8;
     -jfx-unfocus-color: transparent;
@@ -1214,6 +1214,7 @@
     -jfx-unfocus-color: transparent;
     -fx-background-color: #f1f3f4;
     -fx-padding: 4;
+    -fx-max-width: 1000000000;
 }
 
 .jfx-combo-box-warning {