-
Notifications
You must be signed in to change notification settings - Fork 912
[Bugfix] 修复未受支持的模组加载器标签在模组版本界面不显示 #6289
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ToobLac
wants to merge
23
commits into
HMCL-dev:main
Choose a base branch
from
ToobLac:fix-6280
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 5 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
b44f1a8
Fix #6280
ToobLac 352f2e1
update
ToobLac e50ceb5
Update Either.java
ToobLac 2a7b61c
Update Either.java
ToobLac d0e31c1
update
ToobLac a3693ac
add equals and hashCode
ToobLac 47dd877
update
ToobLac c139a75
update
ToobLac b4a3797
update
ToobLac 9115b7f
update
ToobLac b2366a4
update
ToobLac 6477450
discard
ToobLac 0582f0f
update
ToobLac d6fd6aa
update
ToobLac 0d32975
update
ToobLac 9ab287e
update
ToobLac 3242079
update
ToobLac d6b3b87
update
ToobLac 56615e4
Merge remote-tracking branch 'upstream/main' into fix-6280
ToobLac a25232a
update
ToobLac d63f8cd
update
ToobLac d99f52c
Merge remote-tracking branch 'upstream/main' into fix-6280
ToobLac 8ede776
Merge remote-tracking branch 'upstream/main' into fix-6280
ToobLac File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 113 additions & 0 deletions
113
HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| /* | ||
| * Hello Minecraft! Launcher | ||
| * Copyright (C) 2026 huangyuhui <huanghongxun2008@126.com> and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.jackhuang.hmcl.util; | ||
|
|
||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import java.util.Objects; | ||
| import java.util.function.Function; | ||
|
|
||
| public sealed abstract class Either<L, R> { | ||
|
ToobLac marked this conversation as resolved.
ToobLac marked this conversation as resolved.
|
||
|
|
||
| public static <L, R> Either<L, R> left(@NotNull L left) { | ||
| return new Left<>(left); | ||
| } | ||
|
|
||
| public static <L, R> Either<L, R> right(@NotNull R right) { | ||
| return new Right<>(right); | ||
| } | ||
|
|
||
| public abstract boolean hasLeft(); | ||
|
|
||
| public abstract boolean hasRight(); | ||
|
|
||
| public abstract L left(); | ||
|
|
||
| public abstract R right(); | ||
|
|
||
| public abstract <T> T map(Function<L, T> lFunc, Function<R, T> rFunc); | ||
|
|
||
| private static final class Left<L, R> extends Either<L, R> { | ||
|
|
||
| private final L value; | ||
|
|
||
| private Left(L value) { | ||
| this.value = Objects.requireNonNull(value); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasLeft() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasRight() { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public L left() { | ||
| return value; | ||
| } | ||
|
|
||
| @Override | ||
| public R right() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public <T> T map(Function<L, T> lFunc, Function<R, T> rFunc) { | ||
| return lFunc.apply(value); | ||
| } | ||
| } | ||
|
|
||
| private static final class Right<L, R> extends Either<L, R> { | ||
|
|
||
| private final R value; | ||
|
|
||
| private Right(R value) { | ||
| this.value = Objects.requireNonNull(value); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasLeft() { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasRight() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public L left() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public R right() { | ||
| return value; | ||
| } | ||
|
|
||
| @Override | ||
| public <T> T map(Function<L, T> lFunc, Function<R, T> rFunc) { | ||
| return rFunc.apply(value); | ||
| } | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.