lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

清理代码 (#4519)

Browse Source
This commit is contained in:
辞庐
2025-09-28 00:01:00 +08:00
committed by GitHub
parent 75789c774d
commit 7f4c5fc4a0
14 changed files with 33 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLModpackProvider.java
View File

@@ -77,7 +77,7 @@ public final class HMCLModpackProvider implements ModpackProvider {
return manifest; return manifest;
} }
private static class HMCLModpack extends Modpack { private final static class HMCLModpack extends Modpack {
@Override @Override
public Task<?> getInstallTask(DefaultDependencyManager dependencyManager, Path zipFile, String name) { public Task<?> getInstallTask(DefaultDependencyManager dependencyManager, Path zipFile, String name) {
return new HMCLModpackInstallTask(((HMCLGameRepository) dependencyManager.getGameRepository()).getProfile(), zipFile, this, name); return new HMCLModpackInstallTask(((HMCLGameRepository) dependencyManager.getGameRepository()).getProfile(), zipFile, this, name);

1
HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java
View File

@@ -1215,7 +1215,6 @@ public final class FXUtils {
public static JFXButton newBorderButton(String text) { public static JFXButton newBorderButton(String text) {
JFXButton button = new JFXButton(text); JFXButton button = new JFXButton(text);
button.getStyleClass().add("jfx-button-border"); button.getStyleClass().add("jfx-button-border");
button.setButtonType(JFXButton.ButtonType.RAISED);
return button; return button;
} }

4
HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageSkin.java
View File

@@ -64,11 +64,9 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
vBox.setAlignment(Pos.BOTTOM_RIGHT); vBox.setAlignment(Pos.BOTTOM_RIGHT);
vBox.setPickOnBounds(false); vBox.setPickOnBounds(false);
JFXButton btnAdd = new JFXButton(); JFXButton btnAdd = FXUtils.newRaisedButton("");
FXUtils.setLimitWidth(btnAdd, 40); FXUtils.setLimitWidth(btnAdd, 40);
FXUtils.setLimitHeight(btnAdd, 40); FXUtils.setLimitHeight(btnAdd, 40);
btnAdd.getStyleClass().add("jfx-button-raised-round");
btnAdd.setButtonType(JFXButton.ButtonType.RAISED);
btnAdd.setGraphic(SVG.ADD.createIcon(Theme.whiteFill(), -1)); btnAdd.setGraphic(SVG.ADD.createIcon(Theme.whiteFill(), -1));
btnAdd.setOnAction(e -> skinnable.add()); btnAdd.setOnAction(e -> skinnable.add());

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

@@ -191,7 +191,7 @@ public class RipplerContainer extends StackPane {
return StyleableProperties.FACTORY.getCssMetaData(); return StyleableProperties.FACTORY.getCssMetaData();
} }
private static class StyleableProperties { private final static class StyleableProperties {
private static final StyleablePropertyFactory<RipplerContainer> FACTORY = new StyleablePropertyFactory<>(StackPane.getClassCssMetaData()); private static final StyleablePropertyFactory<RipplerContainer> FACTORY = new StyleablePropertyFactory<>(StackPane.getClassCssMetaData());
private static final CssMetaData<RipplerContainer, Paint> RIPPLER_FILL = FACTORY.createPaintCssMetaData("-jfx-rippler-fill", s -> s.ripplerFill, Color.rgb(0, 200, 255)); private static final CssMetaData<RipplerContainer, Paint> RIPPLER_FILL = FACTORY.createPaintCssMetaData("-jfx-rippler-fill", s -> s.ripplerFill, Color.rgb(0, 200, 255));

10
HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TabHeader.java
View File

@@ -225,7 +225,7 @@ public class TabHeader extends Control implements TabControl, PageAware {
} }
} }
private class HeadersRegion extends StackPane { private final class HeadersRegion extends StackPane {
private SideAction action; private SideAction action;
private final ObjectProperty<Side> side = new SimpleObjectProperty<Side>() { private final ObjectProperty<Side> side = new SimpleObjectProperty<Side>() {
@Override @Override
@@ -379,7 +379,7 @@ public class TabHeader extends Control implements TabControl, PageAware {
} }
} }
private class Top extends Horizontal { private final class Top extends Horizontal {
@Override @Override
public void layoutChildren() { public void layoutChildren() {
super.layoutChildren(); super.layoutChildren();
@@ -404,7 +404,7 @@ public class TabHeader extends Control implements TabControl, PageAware {
} }
} }
private class Bottom extends Horizontal { private final class Bottom extends Horizontal {
@Override @Override
public void layoutChildren() { public void layoutChildren() {
super.layoutChildren(); super.layoutChildren();
@@ -519,7 +519,7 @@ public class TabHeader extends Control implements TabControl, PageAware {
} }
} }
private class Left extends Vertical { private final class Left extends Vertical {
@Override @Override
public void layoutChildren() { public void layoutChildren() {
super.layoutChildren(); super.layoutChildren();
@@ -543,7 +543,7 @@ public class TabHeader extends Control implements TabControl, PageAware {
} }
} }
private class Right extends Vertical { private final class Right extends Vertical {
@Override @Override
public void layoutChildren() { public void layoutChildren() {
super.layoutChildren(); super.layoutChildren();

3
HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java
View File

@@ -82,8 +82,7 @@ public abstract class ModpackPage extends SpinnerPane implements WizardPage {
BorderPane descriptionPane = new BorderPane(); BorderPane descriptionPane = new BorderPane();
{ {
btnDescription = new JFXButton(i18n("modpack.description")); btnDescription = FXUtils.newBorderButton(i18n("modpack.description"));
btnDescription.getStyleClass().add("jfx-button-border");
btnDescription.setOnAction(e -> onDescribe()); btnDescription.setOnAction(e -> onDescribe());
descriptionPane.setLeft(btnDescription); descriptionPane.setLeft(btnDescription);

6
HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java
View File

@@ -162,9 +162,8 @@ public abstract class SettingsView extends StackPane {
)); ));
{ {
JFXButton cleanButton = new JFXButton(i18n("launcher.cache_directory.clean")); JFXButton cleanButton = FXUtils.newBorderButton(i18n("launcher.cache_directory.clean"));
cleanButton.setOnAction(e -> clearCacheDirectory()); cleanButton.setOnAction(e -> clearCacheDirectory());
cleanButton.getStyleClass().add("jfx-button-border");
fileCommonLocationSublist.setHeaderRight(cleanButton); fileCommonLocationSublist.setHeaderRight(cleanButton);
} }
@@ -216,9 +215,8 @@ public abstract class SettingsView extends StackPane {
if (LOG.getLogFile() == null) if (LOG.getLogFile() == null)
openLogFolderButton.setDisable(true); openLogFolderButton.setDisable(true);
JFXButton logButton = new JFXButton(i18n("settings.launcher.launcher_log.export")); JFXButton logButton = FXUtils.newBorderButton(i18n("settings.launcher.launcher_log.export"));
logButton.setOnAction(e -> onExportLogs()); logButton.setOnAction(e -> onExportLogs());
logButton.getStyleClass().add("jfx-button-border");
HBox buttonBox = new HBox(); HBox buttonBox = new HBox();
buttonBox.setSpacing(10); buttonBox.setSpacing(10);

9
HMCL/src/main/java/org/jackhuang/hmcl/ui/nbt/NBTEditorPage.java
View File

@@ -27,6 +27,7 @@ import javafx.scene.layout.HBox;
import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Schedulers;
import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.Controllers;
import org.jackhuang.hmcl.ui.FXUtils;
import org.jackhuang.hmcl.ui.construct.MessageDialogPane; import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
import org.jackhuang.hmcl.ui.construct.PageCloseEvent; import org.jackhuang.hmcl.ui.construct.PageCloseEvent;
import org.jackhuang.hmcl.ui.construct.SpinnerPane; import org.jackhuang.hmcl.ui.construct.SpinnerPane;
@@ -68,9 +69,7 @@ public final class NBTEditorPage extends SpinnerPane implements DecoratorPage {
actions.setPadding(new Insets(8)); actions.setPadding(new Insets(8));
actions.setAlignment(Pos.CENTER_RIGHT); actions.setAlignment(Pos.CENTER_RIGHT);
JFXButton saveButton = new JFXButton(i18n("button.save")); JFXButton saveButton = FXUtils.newRaisedButton(i18n("button.save"));
saveButton.getStyleClass().add("jfx-button-raised");
saveButton.setButtonType(JFXButton.ButtonType.RAISED);
saveButton.setOnAction(e -> { saveButton.setOnAction(e -> {
try { try {
save(); save();
@@ -80,9 +79,7 @@ public final class NBTEditorPage extends SpinnerPane implements DecoratorPage {
} }
}); });
JFXButton cancelButton = new JFXButton(i18n("button.cancel")); JFXButton cancelButton = FXUtils.newRaisedButton(i18n("button.cancel"));
cancelButton.getStyleClass().add("jfx-button-raised");
cancelButton.setButtonType(JFXButton.ButtonType.RAISED);
cancelButton.setOnAction(e -> fireEvent(new PageCloseEvent())); cancelButton.setOnAction(e -> fireEvent(new PageCloseEvent()));
onEscPressed(this, cancelButton::fire); onEscPressed(this, cancelButton::fire);

6
HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java
View File

@@ -198,7 +198,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
copyGlobalPane.setLeft(label); copyGlobalPane.setLeft(label);
BorderPane.setAlignment(label, Pos.CENTER_LEFT); BorderPane.setAlignment(label, Pos.CENTER_LEFT);
JFXButton copyAll = new JFXButton(i18n("settings.game.copy_global.copy_all")); JFXButton copyAll = FXUtils.newBorderButton(i18n("settings.game.copy_global.copy_all"));
copyAll.disableProperty().bind(modpack); copyAll.disableProperty().bind(modpack);
copyGlobalPane.setRight(copyAll); copyGlobalPane.setRight(copyAll);
copyAll.setOnAction(e -> Controllers.confirm(i18n("settings.game.copy_global.copy_all.confirm"), null, () -> { copyAll.setOnAction(e -> Controllers.confirm(i18n("settings.game.copy_global.copy_all.confirm"), null, () -> {
@@ -209,7 +209,6 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
PropertyUtils.copyProperties(profile.getGlobal(), lastVersionSetting, name -> !ignored.contains(name)); PropertyUtils.copyProperties(profile.getGlobal(), lastVersionSetting, name -> !ignored.contains(name));
}, null)); }, null));
copyAll.getStyleClass().add("jfx-button-border");
BorderPane.setAlignment(copyAll, Pos.CENTER_RIGHT); BorderPane.setAlignment(copyAll, Pos.CENTER_RIGHT);
} }
@@ -456,7 +455,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
showAdvancedSettingPane.setLeft(label); showAdvancedSettingPane.setLeft(label);
BorderPane.setAlignment(label, Pos.CENTER_LEFT); BorderPane.setAlignment(label, Pos.CENTER_LEFT);
JFXButton button = new JFXButton(i18n("settings.advanced.modify")); JFXButton button = FXUtils.newBorderButton(i18n("settings.advanced.modify"));
button.setOnAction(e -> { button.setOnAction(e -> {
if (lastVersionSetting != null) { if (lastVersionSetting != null) {
if (advancedVersionSettingPage == null) if (advancedVersionSettingPage == null)
@@ -465,7 +464,6 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
Controllers.navigate(advancedVersionSettingPage); Controllers.navigate(advancedVersionSettingPage);
} }
}); });
button.getStyleClass().add("jfx-button-border");
showAdvancedSettingPane.setRight(button); showAdvancedSettingPane.setRight(button);
} }

8
HMCLCore/src/main/java/org/jackhuang/hmcl/auth/OAuth.java
View File

@@ -271,7 +271,7 @@ public class OAuth {
} }
} }
private static class DeviceTokenResponse extends ErrorResponse { private final static class DeviceTokenResponse extends ErrorResponse {
@SerializedName("user_code") @SerializedName("user_code")
public String userCode; public String userCode;
@@ -291,7 +291,7 @@ public class OAuth {
public int interval; public int interval;
} }
private static class TokenResponse extends ErrorResponse { private final static class TokenResponse extends ErrorResponse {
@SerializedName("token_type") @SerializedName("token_type")
public String tokenType; public String tokenType;
@@ -329,7 +329,7 @@ public class OAuth {
* redirect URI used to obtain the authorization * redirect URI used to obtain the authorization
* code.","correlation_id":"??????"} * code.","correlation_id":"??????"}
*/ */
public static class AuthorizationResponse extends ErrorResponse { public final static class AuthorizationResponse extends ErrorResponse {
@SerializedName("token_type") @SerializedName("token_type")
public String tokenType; public String tokenType;
@@ -352,7 +352,7 @@ public class OAuth {
public String foci; public String foci;
} }
private static class RefreshResponse extends ErrorResponse { private final static class RefreshResponse extends ErrorResponse {
@SerializedName("expires_in") @SerializedName("expires_in")
int expiresIn; int expiresIn;

18
HMCLCore/src/main/java/org/jackhuang/hmcl/auth/microsoft/MicrosoftService.java
View File

@@ -321,16 +321,16 @@ public class MicrosoftService {
public static final long ADD_FAMILY = 2148916238L; public static final long ADD_FAMILY = 2148916238L;
} }
public static class XBox400Exception extends AuthenticationException { public final static class XBox400Exception extends AuthenticationException {
} }
public static class NoMinecraftJavaEditionProfileException extends AuthenticationException { public final static class NoMinecraftJavaEditionProfileException extends AuthenticationException {
} }
public static class NoXuiException extends AuthenticationException { public final static class NoXuiException extends AuthenticationException {
} }
private static class XBoxLiveAuthenticationResponseDisplayClaims { private final static class XBoxLiveAuthenticationResponseDisplayClaims {
List<Map<Object, Object>> xui; List<Map<Object, Object>> xui;
} }
@@ -356,7 +356,7 @@ public class MicrosoftService {
* XErr Candidates: 2148916233 = missing XBox account 2148916238 = child account * XErr Candidates: 2148916233 = missing XBox account 2148916238 = child account
* not linked to a family * not linked to a family
*/ */
private static class XBoxLiveAuthenticationResponse extends MicrosoftErrorResponse { private final static class XBoxLiveAuthenticationResponse extends MicrosoftErrorResponse {
@SerializedName("IssueInstant") @SerializedName("IssueInstant")
String issueInstant; String issueInstant;
@@ -370,7 +370,7 @@ public class MicrosoftService {
XBoxLiveAuthenticationResponseDisplayClaims displayClaims; XBoxLiveAuthenticationResponseDisplayClaims displayClaims;
} }
private static class MinecraftLoginWithXBoxResponse { private final static class MinecraftLoginWithXBoxResponse {
@SerializedName("username") @SerializedName("username")
String username; String username;
@@ -387,14 +387,14 @@ public class MicrosoftService {
int expiresIn; int expiresIn;
} }
private static class MinecraftStoreResponseItem { private final static class MinecraftStoreResponseItem {
@SerializedName("name") @SerializedName("name")
String name; String name;
@SerializedName("signature") @SerializedName("signature")
String signature; String signature;
} }
private static class MinecraftStoreResponse extends MinecraftErrorResponse { private final static class MinecraftStoreResponse extends MinecraftErrorResponse {
@SerializedName("items") @SerializedName("items")
List<MinecraftStoreResponseItem> items; List<MinecraftStoreResponseItem> items;
@@ -405,7 +405,7 @@ public class MicrosoftService {
String keyId; String keyId;
} }
public static class MinecraftProfileResponseSkin implements Validation { public final static class MinecraftProfileResponseSkin implements Validation {
public String id; public String id;
public String state; public String state;
public String url; public String url;

4
HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilService.java
View File

@@ -246,11 +246,11 @@ public class YggdrasilService {
} }
} }
private static class TextureResponse { private final static class TextureResponse {
public Map<TextureType, Texture> textures; public Map<TextureType, Texture> textures;
} }
private static class AuthenticationResponse extends ErrorResponse { private final static class AuthenticationResponse extends ErrorResponse {
public String accessToken; public String accessToken;
public String clientToken; public String clientToken;
public GameProfile selectedProfile; public GameProfile selectedProfile;

2
HMCLCore/src/main/java/org/jackhuang/hmcl/download/cleanroom/CleanroomVersionList.java
View File

@@ -62,7 +62,7 @@ public final class CleanroomVersionList extends VersionList<CleanroomRemoteVersi
}); });
} }
private static class ReleaseResult { private final static class ReleaseResult {
String name; String name;
String created_at; String created_at;
} }

2
config/checkstyle/checkstyle.xml
View File

@@ -47,7 +47,7 @@
</module> </module>
<!-- Classes --> <!-- Classes -->
<!-- <module name="FinalClass"/> --> <!-- class with only private constructor must be final: http://checkstyle.sourceforge.net/config_design.html#FinalClass --> <module name="FinalClass"/> <!-- class with only private constructor must be final: http://checkstyle.sourceforge.net/config_design.html#FinalClass -->
<module name="SimplifyBooleanReturn"/> <!-- directly return boolean does not check and return http://checkstyle.sourceforge.net/config_design.html#SimplifyBooleanReturn --> <module name="SimplifyBooleanReturn"/> <!-- directly return boolean does not check and return http://checkstyle.sourceforge.net/config_design.html#SimplifyBooleanReturn -->
<module name="StringLiteralEquality"/> <!-- you can't write myString == "this" http://checkstyle.sourceforge.net/config_design.html#StringLiteralEquality --> <module name="StringLiteralEquality"/> <!-- you can't write myString == "this" http://checkstyle.sourceforge.net/config_design.html#StringLiteralEquality -->
<module name="OneTopLevelClass"/> <!-- only one root class per file http://checkstyle.sourceforge.net/config_design.html#OneTopLevelClass --> <module name="OneTopLevelClass"/> <!-- only one root class per file http://checkstyle.sourceforge.net/config_design.html#OneTopLevelClass -->