Skip to content

Commit af45d96

Browse files
RaphiMCRaphiMC
committed
Replaced deprecated method usages
1 parent c2dff90 commit af45d96

26 files changed

Lines changed: 99 additions & 96 deletions

‎src/main/java/net/raphimc/viaproxy/ViaProxy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ public static void startProxy() {
284284
Logger.LOGGER.info("Starting proxy server");
285285
currentProxyServer = new NetServer(new Client2ProxyChannelInitializer(() -> EVENT_MANAGER.call(new Client2ProxyHandlerCreationEvent(new Client2ProxyHandler(), false)).getHandler()));
286286
EVENT_MANAGER.call(new ProxyStartEvent());
287-
Logger.LOGGER.info("Binding proxy server to " + AddressUtil.toString(CONFIG.getBindAddress()));
288-
currentProxyServer.bind(CONFIG.getBindAddress(), false);
287+
Logger.LOGGER.info("Binding proxy server to " + AddressUtil.toString(CONFIG.getFrontend().getBindAddress()));
288+
currentProxyServer.bind(CONFIG.getFrontend().getBindAddress(), false);
289289
} catch (Throwable e) {
290290
currentProxyServer = null;
291291
throw e;

‎src/main/java/net/raphimc/viaproxy/cli/command/impl/AccountCommand.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ public void register(LiteralArgumentBuilder<CommandExecutor> builder) {
5555
ctx.getSource().sendMessage("No accounts added yet.");
5656
} else {
5757
for (int i = 0; i < accounts.size(); i++) {
58-
boolean isSelected = ViaProxy.getConfig().getAccount() == accounts.get(i);
58+
boolean isSelected = ViaProxy.getConfig().getBackend().getAccount() == accounts.get(i);
5959
ctx.getSource().sendMessage("[" + i + "] " + accounts.get(i).getDisplayString() + (isSelected ? " <--" : ""));
6060
}
6161
}
6262
return 1;
6363
}));
6464
builder.then(literal("deselect").executes(ctx -> {
65-
ViaProxy.getConfig().setAccount(null);
65+
ViaProxy.getConfig().getBackend().setAccount(null);
6666
ctx.getSource().sendMessage("Deselected current account.");
6767
return 1;
6868
}));
@@ -78,7 +78,7 @@ public void register(LiteralArgumentBuilder<CommandExecutor> builder) {
7878
return 0;
7979
}
8080
Account account = ViaProxy.getSaveManager().accountsSave.getAccounts().get(index);
81-
ViaProxy.getConfig().setAccount(account);
81+
ViaProxy.getConfig().getBackend().setAccount(account);
8282
ctx.getSource().sendMessage("Selected account " + index + ": " + account.getDisplayString() + ".");
8383
return 1;
8484
})));
@@ -111,8 +111,8 @@ public void register(LiteralArgumentBuilder<CommandExecutor> builder) {
111111
Account account = ViaProxy.getSaveManager().accountsSave.getAccounts().get(index);
112112
ViaProxy.getSaveManager().accountsSave.removeAccount(account);
113113
ViaProxy.getSaveManager().save();
114-
if (ViaProxy.getConfig().getAccount() == account) {
115-
ViaProxy.getConfig().setAccount(null);
114+
if (ViaProxy.getConfig().getBackend().getAccount() == account) {
115+
ViaProxy.getConfig().getBackend().setAccount(null);
116116
}
117117
ctx.getSource().sendMessage("Removed account " + index + ": " + account.getDisplayString() + ".");
118118
return 1;

‎src/main/java/net/raphimc/viaproxy/injection/mixins/MixinProtocol1_20To1_20_2.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public abstract class MixinProtocol1_20To1_20_2 {
3232

3333
@Inject(method = "lambda$queueServerboundPacket$12", at = @At("HEAD"), cancellable = true)
3434
private static void dontQueueConfigPackets(ServerboundPackets1_20_2 packetType, PacketWrapper wrapper, CallbackInfo ci) {
35-
if (ViaProxy.getConfig().shouldSkipConfigStatePacketQueue()) {
35+
if (ViaProxy.getConfig().getProxy().shouldSkipConfigStatePacketQueue()) {
3636
ci.cancel();
3737
switch (packetType) {
3838
case CUSTOM_PAYLOAD -> wrapper.setPacketType(ServerboundPackets1_19_4.CUSTOM_PAYLOAD);

‎src/main/java/net/raphimc/viaproxy/protocoltranslator/impl/ViaProxyViaCodec.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public ViaProxyViaCodec(UserConnection user) {
3131

3232
@Override
3333
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
34-
if (ViaProxy.getConfig().shouldIgnoreProtocolTranslationErrors()) {
34+
if (ViaProxy.getConfig().getProxy().shouldIgnoreProtocolTranslationErrors()) {
3535
try {
3636
super.channelRead(ctx, msg);
3737
} catch (Throwable e) {

‎src/main/java/net/raphimc/viaproxy/protocoltranslator/providers/ViaProxyClassicMPPassProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public String getMpPass(UserConnection user) {
3939
final String mppass = ProxyConnection.fromUserConnection(user).getUserOptions().classicMpPass();
4040
if (mppass != null && !mppass.isBlank()) {
4141
return mppass;
42-
} else if (ViaProxy.getConfig().useBetacraftAuth()) {
42+
} else if (ViaProxy.getConfig().getBackend().useBetacraftAuth()) {
4343
try {
4444
final HttpClient httpClient = new HttpClient();
4545
String externalIp;

‎src/main/java/net/raphimc/viaproxy/protocoltranslator/viaproxy/ViaProxyConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public void loadFromArguments(final String[] args) throws Exception {
117117
}
118118

119119
if (options.has("minecraft-account-index")) {
120-
this.setAuthMethod(AuthMethod.ACCOUNT);
120+
this.getBackend().setAuthMethod(AuthMethod.ACCOUNT);
121121
}
122122
for (Map.Entry<OptionSpec<Object>, ConfigOption> entry : optionMap.entrySet()) {
123123
final ConfigOption option = entry.getValue();

‎src/main/java/net/raphimc/viaproxy/proxy/client2proxy/Client2ProxyChannelInitializer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ protected void initChannel(Channel channel) {
5151
return;
5252
}
5353

54-
if (ViaProxy.getConfig().useFrontendHaProxy()) {
54+
if (ViaProxy.getConfig().getFrontend().useHaProxy()) {
5555
channel.pipeline().addLast(VIAPROXY_HAPROXY_DECODER_NAME, new HAProxyMessageDecoder());
5656
channel.pipeline().addLast(VIAPROXY_HAPROXY_HANDLER_NAME, new HAProxyHandler());
5757
}
58-
if (ViaProxy.getConfig().shouldAllowLegacyClientPassthrough()) {
58+
if (ViaProxy.getConfig().getProxy().shouldAllowLegacyClientPassthrough()) {
5959
channel.pipeline().addLast(LEGACY_PASSTHROUGH_INITIAL_HANDLER_NAME, new LegacyPassthroughInitialHandler());
6060
}
6161

‎src/main/java/net/raphimc/viaproxy/proxy/client2proxy/Client2ProxyHandler.java‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,17 @@ private void handleHandshake(final C2SHandshakingClientIntentionPacket packet) {
124124
}
125125

126126
final String[] handshakeParts;
127-
if (ViaProxy.getConfig().shouldPassthroughBungeecordPlayerInfo()) {
127+
if (ViaProxy.getConfig().getProxy().shouldPassthroughBungeecordPlayerInfo()) {
128128
handshakeParts = packet.address.split("\0");
129129
} else {
130130
handshakeParts = new String[]{packet.address};
131131
}
132132

133-
SocketAddress serverAddress = ViaProxy.getConfig().getTargetAddress();
134-
ProtocolVersion serverVersion = ViaProxy.getConfig().getTargetVersion();
135-
String classicMpPass = ViaProxy.getConfig().getAccount() instanceof ClassicAccount classicAccount ? classicAccount.getMppass() : null;
133+
SocketAddress serverAddress = ViaProxy.getConfig().getBackend().getAddress();
134+
ProtocolVersion serverVersion = ViaProxy.getConfig().getBackend().getVersion();
135+
String classicMpPass = ViaProxy.getConfig().getBackend().getAccount() instanceof ClassicAccount classicAccount ? classicAccount.getMppass() : null;
136136

137-
if (ViaProxy.getConfig().getWildcardDomainHandling() == ViaProxyConfig.WildcardDomainHandling.PUBLIC) {
137+
if (ViaProxy.getConfig().getFrontend().getWildcardDomainHandling() == ViaProxyConfig.WildcardDomainHandling.PUBLIC) {
138138
if (handshakeParts[0].toLowerCase().contains("f2.viaproxy.")) { // Format 2: address.<address>.port.<port>.version.<version>.f2.viaproxy.hostname
139139
WildcardDomainParser.ParsedDomain parsedDomain = WildcardDomainParser.parseFormat2(handshakeParts[0]);
140140
if (parsedDomain == null) {
@@ -158,7 +158,7 @@ private void handleHandshake(final C2SHandshakingClientIntentionPacket packet) {
158158
} else {
159159
this.proxyConnection.kickClient("§cWrong domain syntax! §6Please use:\n§7address_port_version.viaproxy.hostname");
160160
}
161-
} else if (ViaProxy.getConfig().getWildcardDomainHandling() == ViaProxyConfig.WildcardDomainHandling.INTERNAL) {
161+
} else if (ViaProxy.getConfig().getFrontend().getWildcardDomainHandling() == ViaProxyConfig.WildcardDomainHandling.INTERNAL) {
162162
final ArrayHelper arrayHelper = ArrayHelper.instanceOf(handshakeParts[0].split("\7"));
163163
handshakeParts[0] = arrayHelper.get(0); // Restore the original address
164164
final String versionString = arrayHelper.get(2);
@@ -191,16 +191,16 @@ private void handleHandshake(final C2SHandshakingClientIntentionPacket packet) {
191191
serverAddress = preConnectEvent.getServerAddress();
192192
serverVersion = preConnectEvent.getServerVersion();
193193

194-
final boolean isJavaBetaPing = packet.intendedState.getConnectionState() == ConnectionState.STATUS && serverVersion.olderThanOrEqualTo(LegacyProtocolVersion.b1_7tob1_7_3) && !ViaProxy.getConfig().shouldAllowBetaPinging();
194+
final boolean isJavaBetaPing = packet.intendedState.getConnectionState() == ConnectionState.STATUS && serverVersion.olderThanOrEqualTo(LegacyProtocolVersion.b1_7tob1_7_3) && !ViaProxy.getConfig().getBackend().shouldAllowBetaPinging();
195195
final boolean isBedrockNetherNetPing = packet.intendedState.getConnectionState() == ConnectionState.STATUS && serverVersion.equals(BedrockProtocolVersion.bedrockLatest) && serverAddress instanceof NetherNetAddress;
196196
if (isJavaBetaPing || isBedrockNetherNetPing) {
197-
if (!ViaProxy.getConfig().getCustomMotd().isBlank()) {
198-
this.proxyConnection.kickClient(ViaProxy.getConfig().getCustomMotd());
197+
if (!ViaProxy.getConfig().getFrontend().getMotd().isEnabled()) {
198+
this.proxyConnection.kickClient(ViaProxy.getConfig().getFrontend().getMotd().getDescription());
199199
}
200200
this.proxyConnection.kickClient("§7ViaProxy is working!\n§7Connect to join the configured server");
201201
}
202202

203-
final UserOptions userOptions = new UserOptions(classicMpPass, ViaProxy.getConfig().getAccount());
203+
final UserOptions userOptions = new UserOptions(classicMpPass, ViaProxy.getConfig().getBackend().getAccount());
204204
ChannelUtil.disableAutoRead(this.proxyConnection.getC2P());
205205

206206
if (packet.intendedState.getConnectionState() == ConnectionState.LOGIN && serverVersion.equals(ProtocolTranslator.AUTO_DETECT_PROTOCOL)) {
@@ -236,14 +236,16 @@ private void connect(final SocketAddress serverAddress, final ProtocolVersion se
236236
this.proxyConnection.setClientHandshakeAddress(clientHandshakeAddress);
237237
this.proxyConnection.setUserOptions(userOptions);
238238
this.proxyConnection.setC2pConnectionState(intendedState.getConnectionState());
239-
this.proxyConnection.getPacketHandlers().add(new StatusPacketHandler(this.proxyConnection));
240-
if (ViaProxy.getConfig().shouldSupportSimpleVoiceChat() && serverVersion.newerThan(ProtocolVersion.v1_14) && clientVersion.newerThan(ProtocolVersion.v1_14)) {
239+
if (ViaProxy.getConfig().getFrontend().getMotd().isEnabled()) {
240+
this.proxyConnection.getPacketHandlers().add(new StatusPacketHandler(this.proxyConnection));
241+
}
242+
if (ViaProxy.getConfig().getProxy().shouldSupportSimpleVoiceChat() && serverVersion.newerThan(ProtocolVersion.v1_14) && clientVersion.newerThan(ProtocolVersion.v1_14)) {
241243
this.proxyConnection.getPacketHandlers().add(new SimpleVoiceChatPacketHandler(this.proxyConnection));
242244
}
243-
if (ViaProxy.getConfig().shouldFixFabricParticleApi() && serverVersion.newerThanOrEqualTo(ProtocolVersion.v1_21_5) && clientVersion.newerThanOrEqualTo(ProtocolVersion.v1_21_5) && !serverVersion.equals(clientVersion)) {
245+
if (ViaProxy.getConfig().getProxy().shouldFixFabricParticleApi() && serverVersion.newerThanOrEqualTo(ProtocolVersion.v1_21_5) && clientVersion.newerThanOrEqualTo(ProtocolVersion.v1_21_5) && !serverVersion.equals(clientVersion)) {
244246
this.proxyConnection.getPacketHandlers().add(new FabricParticleApiFixPacketHandler(this.proxyConnection));
245247
}
246-
if (ViaProxy.getConfig().shouldFakeAcceptResourcePacks() && serverVersion.newerThanOrEqualTo(LegacyProtocolVersion.r1_3_1tor1_3_2)) {
248+
if (ViaProxy.getConfig().getProxy().shouldFakeAcceptResourcePacks() && serverVersion.newerThanOrEqualTo(LegacyProtocolVersion.r1_3_1tor1_3_2)) {
247249
this.proxyConnection.getPacketHandlers().add(new ResourcePackSpooferPacketHandler(this.proxyConnection));
248250
}
249251
if (clientVersion.newerThanOrEqualTo(ProtocolVersion.v1_8)) {
@@ -252,7 +254,7 @@ private void connect(final SocketAddress serverAddress, final ProtocolVersion se
252254
this.proxyConnection.getPacketHandlers().add(new CompressionPacketHandler(this.proxyConnection));
253255
this.proxyConnection.getPacketHandlers().add(new LoginPacketHandler(this.proxyConnection));
254256
this.proxyConnection.getPacketHandlers().add(new DisconnectPacketHandler(this.proxyConnection));
255-
if (ViaProxy.getConfig().shouldRewriteTransferPackets() && clientVersion.newerThanOrEqualTo(ProtocolVersion.v1_20_5)) {
257+
if (ViaProxy.getConfig().getProxy().shouldRewriteTransferPackets() && clientVersion.newerThanOrEqualTo(ProtocolVersion.v1_20_5)) {
256258
this.proxyConnection.getPacketHandlers().add(new TransferPacketHandler(this.proxyConnection));
257259
}
258260
if (clientVersion.newerThanOrEqualTo(ProtocolVersion.v1_20_2) || serverVersion.newerThanOrEqualTo(ProtocolVersion.v1_20_2)) {
@@ -261,21 +263,21 @@ private void connect(final SocketAddress serverAddress, final ProtocolVersion se
261263
if (clientVersion.newerThanOrEqualTo(ProtocolVersion.v1_19_3) && serverVersion.newerThanOrEqualTo(ProtocolVersion.v1_19_3)) {
262264
this.proxyConnection.getPacketHandlers().add(new ChatSignaturePacketHandler(this.proxyConnection));
263265
}
264-
if (!ViaProxy.getConfig().getResourcePackUrl().isBlank()) {
266+
if (!ViaProxy.getConfig().getFrontend().getResourcePackUrl().isBlank()) {
265267
this.proxyConnection.getPacketHandlers().add(new ResourcePackPacketHandler(this.proxyConnection));
266268
}
267269
if (Via.getConfig().sendPlayerDetails() || Via.getConfig().sendServerDetails()) {
268270
this.proxyConnection.getPacketHandlers().add(new ViaVersionConnectionDetailsPacketHandler(this.proxyConnection));
269271
}
270272
this.proxyConnection.getPacketHandlers().add(new UnexpectedPacketHandler(this.proxyConnection));
271273

272-
if (ViaProxy.getConfig().shouldLogClientStatusRequests() || intendedState != IntendedState.STATUS) {
274+
if (ViaProxy.getConfig().getFrontend().shouldLogClientStatusRequests() || intendedState != IntendedState.STATUS) {
273275
Logger.u_info("connect", this.proxyConnection, "[" + clientVersion.getName() + " <-> " + serverVersion.getName() + "] Connecting to " + AddressUtil.toString(serverAddress));
274276
}
275277
ViaProxy.EVENT_MANAGER.call(new ConnectEvent(this.proxyConnection));
276278

277279
final int handshakePort;
278-
if (ViaProxy.getConfig().shouldRewriteHandshakePacket()) {
280+
if (ViaProxy.getConfig().getProxy().shouldRewriteHandshakePacket()) {
279281
if (serverAddress instanceof InetSocketAddress inetSocketAddress) {
280282
handshakeParts[0] = inetSocketAddress.getHostString();
281283
handshakePort = inetSocketAddress.getPort();
@@ -290,7 +292,7 @@ private void connect(final SocketAddress serverAddress, final ProtocolVersion se
290292
this.proxyConnection.connectToServer(serverAddress, serverVersion).addListeners((ThrowingChannelFutureListener) f -> {
291293
if (f.isSuccess()) {
292294
f.channel().eventLoop().submit(() -> { // Reschedule so the packets get sent after the channel is fully initialized and active
293-
if (ViaProxy.getConfig().useBackendHaProxy()) {
295+
if (ViaProxy.getConfig().getBackend().useHaProxy()) {
294296
this.proxyConnection.getChannel().writeAndFlush(HAProxyUtil.createMessage(this.proxyConnection.getC2P(), this.proxyConnection.getChannel(), clientVersion)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
295297
}
296298

‎src/main/java/net/raphimc/viaproxy/proxy/client2proxy/passthrough/PassthroughClient2ProxyHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ protected void connectToServer(final Channel c2pChannel) {
8686
this.proxyConnection.connect(serverAddress).addListeners((ThrowingChannelFutureListener) f -> {
8787
if (f.isSuccess()) {
8888
f.channel().eventLoop().submit(() -> { // Reschedule so the packets get sent after the channel is fully initialized and active
89-
if (ViaProxy.getConfig().useBackendHaProxy()) {
89+
if (ViaProxy.getConfig().getBackend().useHaProxy()) {
9090
this.proxyConnection.getChannel().writeAndFlush(HAProxyUtil.createMessage(this.proxyConnection.getC2P(), this.proxyConnection.getChannel(), null)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
9191
}
9292

@@ -103,7 +103,7 @@ protected void connectToServer(final Channel c2pChannel) {
103103
}
104104

105105
protected SocketAddress getServerAddress() {
106-
return ViaProxy.getConfig().getTargetAddress();
106+
return ViaProxy.getConfig().getBackend().getAddress();
107107
}
108108

109109
}

‎src/main/java/net/raphimc/viaproxy/proxy/external_interface/ExternalInterface.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static void fillPlayerData(final ProxyConnection proxyConnection) {
6363
proxyConnection.setGameProfile(account.getGameProfile());
6464
final UserConnection user = proxyConnection.getUserConnection();
6565

66-
if (ViaProxy.getConfig().shouldSignChat() && proxyConnection.getServerVersion().newerThanOrEqualTo(ProtocolVersion.v1_19) && account instanceof MicrosoftAccount microsoftAccount) {
66+
if (ViaProxy.getConfig().getBackend().useChatSigning() && proxyConnection.getServerVersion().newerThanOrEqualTo(ProtocolVersion.v1_19) && account instanceof MicrosoftAccount microsoftAccount) {
6767
final MinecraftPlayerCertificates playerCertificates = microsoftAccount.getAuthManager().getMinecraftPlayerCertificates().getUpToDate();
6868
final Instant expiresAt = Instant.ofEpochMilli(playerCertificates.getExpireTimeMs());
6969
final long expiresAtMillis = playerCertificates.getExpireTimeMs();
@@ -105,10 +105,10 @@ public static void joinServer(final String serverIdHash, final ProxyConnection p
105105
try {
106106
if (proxyConnection.getUserOptions().account() instanceof MicrosoftAccount microsoftAccount) {
107107
try {
108-
if (ViaProxy.getConfig().getBackendProxy() == null) {
108+
if (ViaProxy.getConfig().getBackend().getProxy() == null) {
109109
AuthLibServices.SESSION_SERVICE.joinServer(microsoftAccount.getGameProfile().id(), microsoftAccount.getAuthManager().getMinecraftToken().getUpToDate().getToken(), serverIdHash);
110110
} else {
111-
final Proxy proxy = ViaProxy.getConfig().getBackendProxy();
111+
final Proxy proxy = ViaProxy.getConfig().getBackend().getProxy();
112112
final MinecraftSessionService sessionService = new YggdrasilAuthenticationService(proxy.toJavaProxy()).createMinecraftSessionService();
113113
Authenticator prevAuthenticator = Authenticator.getDefault();
114114
try {

0 commit comments

Comments
 (0)