From 5475acdc9e6b149c378a2836d6daadf47aeb6761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=9E=E5=BA=90?= <109708109+CiiLu@users.noreply.github.com> Date: Sun, 30 Aug 2026 21:57:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=20MojangJavaRemoteVersion=20?= =?UTF-8?q?&=20MojangJavaDistribution=20(#6772)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/mojang/MojangJavaDistribution.java | 46 ------------------ .../java/mojang/MojangJavaRemoteVersion.java | 48 ------------------- 2 files changed, 94 deletions(-) delete mode 100644 HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/mojang/MojangJavaDistribution.java delete mode 100644 HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/mojang/MojangJavaRemoteVersion.java diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/mojang/MojangJavaDistribution.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/mojang/MojangJavaDistribution.java deleted file mode 100644 index 3f257264fd..0000000000 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/mojang/MojangJavaDistribution.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Hello Minecraft! Launcher - * Copyright (C) 2024 huangyuhui 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 . - */ -package org.jackhuang.hmcl.download.java.mojang; - -import org.jackhuang.hmcl.download.java.JavaDistribution; -import org.jackhuang.hmcl.download.java.JavaPackageType; -import org.jackhuang.hmcl.download.java.JavaRemoteVersion; - -import java.util.Collections; -import java.util.Set; - -/** - * @author Glavo - */ -public final class MojangJavaDistribution implements JavaDistribution { - - public static final MojangJavaDistribution DISTRIBUTION = new MojangJavaDistribution(); - - private MojangJavaDistribution() { - } - - @Override - public String getDisplayName() { - return "Mojang"; - } - - @Override - public Set getSupportedPackageTypes() { - return Collections.singleton(JavaPackageType.JRE); - } -} diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/mojang/MojangJavaRemoteVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/mojang/MojangJavaRemoteVersion.java deleted file mode 100644 index b4385175dc..0000000000 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/mojang/MojangJavaRemoteVersion.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Hello Minecraft! Launcher - * Copyright (C) 2024 huangyuhui 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 . - */ -package org.jackhuang.hmcl.download.java.mojang; - -import org.jackhuang.hmcl.download.java.JavaRemoteVersion; -import org.jackhuang.hmcl.game.GameJavaVersion; -import org.jetbrains.annotations.NotNull; - -/** - * @author Glavo - */ -public record MojangJavaRemoteVersion(GameJavaVersion gameJavaVersion) implements JavaRemoteVersion { - - @Override - public int getJdkVersion() { - return gameJavaVersion.majorVersion(); - } - - @Override - public String getJavaVersion() { - return String.valueOf(getJdkVersion()); - } - - @Override - public String getDistributionVersion() { - return String.valueOf(getJdkVersion()); - } - - @Override - public @NotNull String toString() { - return "MojangJavaRemoteVersion[gameJavaVersion=" + gameJavaVersion + "]"; - } -}