Skip to content

Commit 44d4178

Browse files
committed
Merge remote-tracking branch 'upstream/main' into patches
2 parents 8c80274 + e0dacd0 commit 44d4178

7 files changed

Lines changed: 5 additions & 147 deletions

File tree

HMCL/src/main/java/org/jackhuang/hmcl/setting/StyleSheets.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ private static String getThemeStyleSheet() {
153153
addColor(builder, "-monet-primary-seed", scheme.getPrimaryColorSeed());
154154

155155
addColor(builder, scheme, ColorRole.PRIMARY, 0.5);
156+
addColor(builder, scheme, ColorRole.PRIMARY, 0.8);
156157
addColor(builder, scheme, ColorRole.SECONDARY_CONTAINER, 0.5);
157158
addColor(builder, scheme, ColorRole.SURFACE, 0.5);
158159
addColor(builder, scheme, ColorRole.SURFACE, 0.8);

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/UpdateInstallerWizardProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@ public Object finish(SettingsMap settings) {
7474
var hints = new ArrayList<Task.StagesHint>();
7575
for (Object value : settings.asStringMap().values()) {
7676
if (value instanceof ComponentRemoteVersion remoteVersion) {
77+
hints.add(new Task.StagesHint("hmcl.install.libraries"));
78+
7779
hints.add(new Task.StagesHint(String.format("hmcl.install.%s:%s", remoteVersion.getComponentType().getPatchId(), remoteVersion.getSelfVersion())));
7880
if (remoteVersion.getComponentType() == GameComponentType.GAME) {
79-
hints.add(new Task.StagesHint("hmcl.install.libraries"));
8081
hints.add(new Task.StagesHint("hmcl.install.assets"));
8182
}
8283
}

HMCL/src/main/resources/assets/css/blue.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
-monet-surface-tint: #4858AB;
5151
-monet-primary-seed: #5C6BC0;
5252
-monet-primary-transparent-50: #4352A580;
53+
-monet-primary-transparent-80: #4352A5CC;
5354
-monet-secondary-container-transparent-50: #D0D5FD80;
5455
-monet-surface-transparent-50: #FBF8FF80;
5556
-monet-surface-transparent-80: #FBF8FFCC;

HMCL/src/main/resources/assets/css/root.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1939,7 +1939,7 @@
19391939
}
19401940

19411941
.line-select-button .menu-container:selected .subtitle-label {
1942-
-fx-text-fill: -monet-primary-container;
1942+
-fx-text-fill: -monet-primary-transparent-80;
19431943
}
19441944

19451945
.line-toggle-button .jfx-toggle-button {

HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/mojang/MojangJavaDistribution.java

Lines changed: 0 additions & 46 deletions
This file was deleted.

HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/mojang/MojangJavaRemoteVersion.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/JsonMap.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)