From a64da463ff51c712b3a8ee1d8ee09296a46c073b Mon Sep 17 00:00:00 2001 From: LostInLinearPast <1283411677@qq.com> Date: Fri, 31 Oct 2025 22:51:28 +0800 Subject: [PATCH] update blank question rule version 1.0.2 --- .../utils/http/HttpUtils.java | 4 +-- .../utils/rcon/LoginWhitelistCommand.java | 33 +++++++++++-------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/linearpast/minecraftmanager/utils/http/HttpUtils.java b/src/main/java/com/linearpast/minecraftmanager/utils/http/HttpUtils.java index 12697fb..a235cac 100644 --- a/src/main/java/com/linearpast/minecraftmanager/utils/http/HttpUtils.java +++ b/src/main/java/com/linearpast/minecraftmanager/utils/http/HttpUtils.java @@ -303,9 +303,7 @@ public class HttpUtils { ClientConnectionManager ccm = httpClient.getConnectionManager(); SchemeRegistry registry = ccm.getSchemeRegistry(); registry.register(new Scheme("https", ssf, 443)); - } catch (KeyManagementException ex) { - throw new RuntimeException(ex); - } catch (NoSuchAlgorithmException ex) { + } catch (KeyManagementException | NoSuchAlgorithmException ex) { throw new RuntimeException(ex); } } diff --git a/src/main/java/com/linearpast/minecraftmanager/utils/rcon/LoginWhitelistCommand.java b/src/main/java/com/linearpast/minecraftmanager/utils/rcon/LoginWhitelistCommand.java index 2828a25..a1b7efb 100644 --- a/src/main/java/com/linearpast/minecraftmanager/utils/rcon/LoginWhitelistCommand.java +++ b/src/main/java/com/linearpast/minecraftmanager/utils/rcon/LoginWhitelistCommand.java @@ -3,6 +3,7 @@ package com.linearpast.minecraftmanager.utils.rcon; import com.linearpast.minecraftmanager.utils.WhitelistTarget; import com.linearpast.minecraftmanager.utils.config.SelfConfig; import io.graversen.minecraft.rcon.commands.base.ICommand; +import io.graversen.minecraft.rcon.util.Target; import io.graversen.minecraft.rcon.util.WhiteListModes; import lombok.Getter; import org.apache.commons.text.StringSubstitutor; @@ -10,19 +11,25 @@ import org.apache.commons.text.StringSubstitutor; import java.util.Map; import java.util.Objects; -public record LoginWhitelistCommand(WhitelistTarget whitelistTarget, WhiteListModes whiteListMode) implements ICommand { - public LoginWhitelistCommand(WhitelistTarget whitelistTarget, WhiteListModes whiteListMode) { - this.whitelistTarget = whitelistTarget; - this.whiteListMode = Objects.requireNonNull(whiteListMode); - } +//public record LoginWhitelistCommand(WhitelistTarget whitelistTarget, WhiteListModes whiteListMode) implements ICommand { +// public LoginWhitelistCommand(WhitelistTarget whitelistTarget, WhiteListModes whiteListMode) { +// this.whitelistTarget = whitelistTarget; +// this.whiteListMode = Objects.requireNonNull(whiteListMode); +// } +// +// public String command() { +// return switch (this.whiteListMode()) { +// case ADD -> StringSubstitutor.replace(SelfConfig.addCommand + " ${name} ${uuid}", Map.of( +// "name", this.whitelistTarget().name(), +// "uuid", this.whitelistTarget().uuid()) +// ); +// case REMOVE, LIST, OFF, ON, RELOAD -> ""; +// }; +// } +//} - public String command() { - return switch (this.whiteListMode()) { - case ADD -> StringSubstitutor.replace(SelfConfig.addCommand + " ${name} ${uuid}", Map.of( - "name", this.whitelistTarget().name(), - "uuid", this.whitelistTarget().uuid()) - ); - case REMOVE, LIST, OFF, ON, RELOAD -> ""; - }; +public class LoginWhitelistCommand extends SelfWhiteListCommand { + public LoginWhitelistCommand(WhitelistTarget target, WhiteListModes whiteListMode) { + super(Target.player(target.name()), whiteListMode); } }