Skip to content

Commit

Permalink
Run google java format again
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexProgrammerDE
AlexProgrammerDE committed Mar 10, 2024
1 parent b7ab8e4 commit 65bff9c
Show file tree
Hide file tree
Showing 30 changed files with 258 additions and 246 deletions.
8 changes: 6 additions & 2 deletions client/src/main/java/com/soulfiremc/client/SoulFireClientLoader.java
View file
Expand Up @@ -26,15 +26,19 @@ public class SoulFireClientLoader {
private SoulFireClientLoader() {}

public static void runHeadless(String host, int port, String[] args) {
var soulFire = new SoulFireServer(host, port, SoulFireClientBootstrap.PLUGIN_MANAGER, SoulFireClientBootstrap.START_TIME);
var soulFire =
new SoulFireServer(
host, port, SoulFireClientBootstrap.PLUGIN_MANAGER, SoulFireClientBootstrap.START_TIME);

var rpcClient = new RPCClient(host, port, soulFire.generateLocalCliJWT());
var cliManager = new CLIManager(rpcClient, SoulFireClientBootstrap.PLUGIN_MANAGER);
cliManager.initCLI(args);
}

public static void runGUI(String host, int port) {
var soulFire = new SoulFireServer(host, port, SoulFireClientBootstrap.PLUGIN_MANAGER, SoulFireClientBootstrap.START_TIME);
var soulFire =
new SoulFireServer(
host, port, SoulFireClientBootstrap.PLUGIN_MANAGER, SoulFireClientBootstrap.START_TIME);

var rpcClient = new RPCClient(host, port, soulFire.generateAdminJWT());
var guiManager = new GUIManager(rpcClient, SoulFireClientBootstrap.PLUGIN_MANAGER);
Expand Down
3 changes: 2 additions & 1 deletion client/src/main/java/com/soulfiremc/client/grpc/RPCClient.java
View file
Expand Up @@ -77,7 +77,8 @@ public RPCClient(CallCredentials callCredentials, ManagedChannel managedChannel)
attackStub = prepareChannel(AttackServiceGrpc.newStub(channel), callCredentials);
configStubBlocking =
prepareChannel(ConfigServiceGrpc.newBlockingStub(channel), callCredentials);
mcAuthServiceBlocking = prepareChannel(MCAuthServiceGrpc.newBlockingStub(channel), callCredentials);
mcAuthServiceBlocking =
prepareChannel(MCAuthServiceGrpc.newBlockingStub(channel), callCredentials);
}

private <T extends AbstractStub<T>> T prepareChannel(T channel, CallCredentials callCredentials) {
Expand Down
3 changes: 1 addition & 2 deletions client/src/main/java/com/soulfiremc/client/gui/SFMenuBar.java
View file
Expand Up @@ -232,8 +232,7 @@ public SFMenuBar(GUIManager guiManager, LogPanel logPanel, GUIFrame guiFrame) {
}

if (desktop.isSupported(Desktop.Action.APP_QUIT_HANDLER)) {
desktop.setQuitHandler(
(e, response) -> response.performQuit());
desktop.setQuitHandler((e, response) -> response.performQuit());
}
}

Expand Down
6 changes: 5 additions & 1 deletion client/src/main/java/com/soulfiremc/client/gui/navigation/AccountPanel.java
View file
Expand Up @@ -183,7 +183,11 @@ private static JMenuItem createAccountLoadButton(
String.format("%s list file", type),
guiManager,
parent,
text -> guiManager.clientSettingsManager().accountRegistry().loadFromString(text, type, null)));
text ->
guiManager
.clientSettingsManager()
.accountRegistry()
.loadFromString(text, type, null)));

return button;
}
Expand Down
17 changes: 12 additions & 5 deletions client/src/main/java/com/soulfiremc/client/gui/navigation/GeneratedPanel.java
View file
Expand Up @@ -44,7 +44,8 @@
public class GeneratedPanel extends NavigationItem {
private final ClientPluginSettingsPage settingsPage;

public GeneratedPanel(ClientSettingsManager clientSettingsManager, ClientPluginSettingsPage settingsPage) {
public GeneratedPanel(
ClientSettingsManager clientSettingsManager, ClientPluginSettingsPage settingsPage) {
this.settingsPage = settingsPage;

setLayout(new GridBagLayout());
Expand Down Expand Up @@ -73,7 +74,9 @@ private static JSpinner createIntObject(
}

private static JSpinner createDoubleObject(
PropertyKey propertyKey, ClientSettingsManager clientSettingsManager, DoubleSetting doubleSetting) {
PropertyKey propertyKey,
ClientSettingsManager clientSettingsManager,
DoubleSetting doubleSetting) {
var spinner =
new JSpinner(
new SpinnerNumberModel(
Expand All @@ -93,7 +96,9 @@ private static JSpinner createDoubleObject(
}

public static void addComponents(
JPanel panel, ClientPluginSettingsPage settingsPage, ClientSettingsManager clientSettingsManager) {
JPanel panel,
ClientPluginSettingsPage settingsPage,
ClientSettingsManager clientSettingsManager) {
var row = 0;
for (var settingEntry : settingsPage.getEntriesList()) {
switch (settingEntry.getValueCase()) {
Expand Down Expand Up @@ -190,7 +195,8 @@ public static void addComponents(
.anchor(GBC.LINE_START)
.add(
new JLabel(min.getUiName()), label -> label.setToolTipText(min.getDescription()));
var minSpinner = createIntObject(minPropertyKey, clientSettingsManager, min.getIntSetting());
var minSpinner =
createIntObject(minPropertyKey, clientSettingsManager, min.getIntSetting());
GBC.create(panel)
.grid(1, row++)
.insets(0, 10, 0, 0)
Expand All @@ -206,7 +212,8 @@ public static void addComponents(
.anchor(GBC.LINE_START)
.add(
new JLabel(max.getUiName()), label -> label.setToolTipText(max.getDescription()));
var maxSpinner = createIntObject(maxPropertyKey, clientSettingsManager, max.getIntSetting());
var maxSpinner =
createIntObject(maxPropertyKey, clientSettingsManager, max.getIntSetting());
GBC.create(panel)
.grid(1, row++)
.insets(0, 10, 0, 0)
Expand Down
6 changes: 4 additions & 2 deletions client/src/main/java/com/soulfiremc/client/gui/navigation/ProxyPanel.java
View file
Expand Up @@ -133,7 +133,8 @@ public Class<?> getColumnClass(int columnIndex) {
var type = (ProxyType) row[4];
var enabled = (boolean) row[5];

proxies.add(new EnabledWrapper<>(enabled, new SFProxy(type, host, port, username, password)));
proxies.add(
new EnabledWrapper<>(enabled, new SFProxy(type, host, port, username, password)));
}

proxyRegistry.setProxies(proxies);
Expand Down Expand Up @@ -191,7 +192,8 @@ private static JMenuItem createProxyLoadButton(
String.format("%s list file", type),
guiManager,
parent,
text -> guiManager.clientSettingsManager().proxyRegistry().loadFromString(text, type)));
text ->
guiManager.clientSettingsManager().proxyRegistry().loadFromString(text, type)));

return button;
}
Expand Down
5 changes: 2 additions & 3 deletions client/src/main/java/com/soulfiremc/client/settings/AccountRegistry.java
View file
Expand Up @@ -76,9 +76,8 @@ private MinecraftAccount fromStringSingle(String data, AuthType authType, SFProx
request.setProxy(proxy.toProto());
}

return MinecraftAccount.fromProto(rpcClient.mcAuthServiceBlocking()
.login(request.build())
.getAccount());
return MinecraftAccount.fromProto(
rpcClient.mcAuthServiceBlocking().login(request.build()).getAccount());
} catch (Exception e) {
log.error("Failed to load account from string", e);
throw new RuntimeException(e);
Expand Down
24 changes: 14 additions & 10 deletions common/src/main/java/com/soulfiremc/account/MinecraftAccount.java
View file
Expand Up @@ -26,9 +26,8 @@
import lombok.NonNull;

/**
* Represents an authenticated MC account.
* This can be a premium, offline or bedrock account.
* Beware that the profileId is not a valid online UUID for offline and bedrock accounts.
* Represents an authenticated MC account. This can be a premium, offline or bedrock account. Beware
* that the profileId is not a valid online UUID for offline and bedrock accounts.
*
* @param authType The type of authentication
* @param profileId Identifier that uniquely identifies the account
Expand All @@ -41,18 +40,23 @@ public record MinecraftAccount(
@NonNull String lastKnownName,
@NonNull AccountData accountData) {
public static MinecraftAccount fromProto(MinecraftAccountProto account) {
return new MinecraftAccount(AuthType.valueOf(account.getType().name()), UUID.fromString(account.getProfileId()), account.getLastKnownName(), switch (account.getAccountDataCase()) {
case ONLINEJAVADATA -> OnlineJavaData.fromProto(account.getOnlineJavaData());
case OFFLINEJAVADATA -> OfflineJavaData.fromProto(account.getOfflineJavaData());
case BEDROCKDATA -> BedrockData.fromProto(account.getBedrockData());
case ACCOUNTDATA_NOT_SET -> throw new IllegalArgumentException("AccountData not set");
});
return new MinecraftAccount(
AuthType.valueOf(account.getType().name()),
UUID.fromString(account.getProfileId()),
account.getLastKnownName(),
switch (account.getAccountDataCase()) {
case ONLINEJAVADATA -> OnlineJavaData.fromProto(account.getOnlineJavaData());
case OFFLINEJAVADATA -> OfflineJavaData.fromProto(account.getOfflineJavaData());
case BEDROCKDATA -> BedrockData.fromProto(account.getBedrockData());
case ACCOUNTDATA_NOT_SET -> throw new IllegalArgumentException("AccountData not set");
});
}

@Override
public String toString() {
return String.format(
"MinecraftAccount(authType=%s, profileId=%s, lastKnownName=%s)", authType, profileId, lastKnownName);
"MinecraftAccount(authType=%s, profileId=%s, lastKnownName=%s)",
authType, profileId, lastKnownName);
}

public boolean isPremiumJava() {
Expand Down
3 changes: 1 addition & 2 deletions common/src/main/java/com/soulfiremc/account/service/AccountData.java
View file
Expand Up @@ -17,5 +17,4 @@
*/
package com.soulfiremc.account.service;

public sealed interface AccountData permits BedrockData, OfflineJavaData, OnlineJavaData {
}
public sealed interface AccountData permits BedrockData, OfflineJavaData, OnlineJavaData {}
3 changes: 1 addition & 2 deletions common/src/main/java/com/soulfiremc/account/service/OnlineJavaData.java
View file
Expand Up @@ -19,8 +19,7 @@

import com.soulfiremc.grpc.generated.MinecraftAccountProto;

public record OnlineJavaData(String authToken, long tokenExpireAt)
implements AccountData {
public record OnlineJavaData(String authToken, long tokenExpireAt) implements AccountData {
public static OnlineJavaData fromProto(MinecraftAccountProto.OnlineJavaData data) {
return new OnlineJavaData(data.getAuthToken(), data.getTokenExpireAt());
}
Expand Down
31 changes: 16 additions & 15 deletions common/src/main/java/com/soulfiremc/proxy/SFProxy.java
View file
Expand Up @@ -28,15 +28,6 @@ public record SFProxy(
int port,
@Nullable String username,
@Nullable String password) {
public static SFProxy fromProto(ProxyProto proto) {
return new SFProxy(
ProxyType.valueOf(proto.getType().name()),
proto.getHost(),
proto.getPort(),
proto.hasUsername() ? proto.getUsername() : null,
proto.hasPassword() ? proto.getPassword() : null);
}

public SFProxy {
if (type == ProxyType.SOCKS4 && password != null) {
throw new IllegalArgumentException("SOCKS4 does not support passwords!");
Expand All @@ -49,22 +40,32 @@ public static SFProxy fromProto(ProxyProto proto) {
}
}

public static SFProxy fromProto(ProxyProto proto) {
return new SFProxy(
ProxyType.valueOf(proto.getType().name()),
proto.getHost(),
proto.getPort(),
proto.hasUsername() ? proto.getUsername() : null,
proto.hasPassword() ? proto.getPassword() : null);
}

public InetSocketAddress getInetSocketAddress() {
return new InetSocketAddress(host, port);
}

public ProxyProto toProto() {
var builder = ProxyProto.newBuilder()
.setType(ProxyProto.Type.valueOf(type.name()))
.setHost(host)
.setPort(port);
var builder =
ProxyProto.newBuilder()
.setType(ProxyProto.Type.valueOf(type.name()))
.setHost(host)
.setPort(port);

if (username != null) {
builder.setUsername(username);
builder.setUsername(username);
}

if (password != null) {
builder.setPassword(password);
builder.setPassword(password);
}

return builder.build();
Expand Down
11 changes: 6 additions & 5 deletions common/src/main/java/com/soulfiremc/util/KeyHelper.java
View file
Expand Up @@ -28,14 +28,17 @@
import java.util.Base64;

public class KeyHelper {
private KeyHelper() {}

public static String encodeBase64Key(Key key) {
return Base64.getEncoder().encodeToString(key.getEncoded());
}

public static ECPublicKey decodeBase64PublicKey(String key) {
try {
var keyFactory = KeyFactory.getInstance("EC");
return (ECPublicKey) keyFactory.generatePublic(new X509EncodedKeySpec(decodeBase64String(key)));
return (ECPublicKey)
keyFactory.generatePublic(new X509EncodedKeySpec(decodeBase64String(key)));
} catch (GeneralSecurityException e) {
throw new JsonParseException(e);
}
Expand All @@ -44,7 +47,8 @@ public static ECPublicKey decodeBase64PublicKey(String key) {
public static ECPrivateKey decodeBase64PrivateKey(String key) {
try {
var keyFactory = KeyFactory.getInstance("EC");
return (ECPrivateKey) keyFactory.generatePrivate(new PKCS8EncodedKeySpec(decodeBase64String(key)));
return (ECPrivateKey)
keyFactory.generatePrivate(new PKCS8EncodedKeySpec(decodeBase64String(key)));
} catch (GeneralSecurityException e) {
throw new JsonParseException(e);
}
Expand All @@ -53,7 +57,4 @@ public static ECPrivateKey decodeBase64PrivateKey(String key) {
private static byte[] decodeBase64String(String key) {
return Base64.getDecoder().decode(key);
}

private KeyHelper() {
}
}
38 changes: 19 additions & 19 deletions common/src/main/java/com/soulfiremc/util/ReactorHttpHelper.java
View file
Expand Up @@ -44,26 +44,26 @@ public static reactor.netty.http.client.HttpClient createReactorClient(
return proxyData == null
? base
: base.proxy(
p -> {
var spec =
p.type(
switch (proxyData.type()) {
case HTTP -> ProxyProvider.Proxy.HTTP;
case SOCKS4 -> ProxyProvider.Proxy.SOCKS4;
case SOCKS5 -> ProxyProvider.Proxy.SOCKS5;
})
.host(proxyData.host())
.port(proxyData.port())
.nonProxyHosts("localhost")
.connectTimeoutMillis(20_000);
p -> {
var spec =
p.type(
switch (proxyData.type()) {
case HTTP -> ProxyProvider.Proxy.HTTP;
case SOCKS4 -> ProxyProvider.Proxy.SOCKS4;
case SOCKS5 -> ProxyProvider.Proxy.SOCKS5;
})
.host(proxyData.host())
.port(proxyData.port())
.nonProxyHosts("localhost")
.connectTimeoutMillis(20_000);

if (proxyData.username() != null) {
spec.username(proxyData.username());
}
if (proxyData.username() != null) {
spec.username(proxyData.username());
}

if (proxyData.password() != null) {
spec.password(s -> proxyData.password());
}
});
if (proxyData.password() != null) {
spec.password(s -> proxyData.password());
}
});
}
}
3 changes: 2 additions & 1 deletion dedicated/src/main/java/com/soulfiremc/dedicated/SFDedicatedTerminalConsole.java
View file
Expand Up @@ -54,7 +54,8 @@ public static void setupTerminalConsole(
return;
}

threadPool.execute(new SFDedicatedTerminalConsole(shutdownManager, serverCommandManager)::start);
threadPool.execute(
new SFDedicatedTerminalConsole(shutdownManager, serverCommandManager)::start);
}

@Override
Expand Down
8 changes: 2 additions & 6 deletions dedicated/src/main/java/com/soulfiremc/dedicated/SoulFireDedicatedBootstrap.java
View file
Expand Up @@ -23,7 +23,6 @@
import com.soulfiremc.util.PortHelper;
import com.soulfiremc.util.SFPathConstants;
import io.netty.util.ResourceLeakDetector;
import java.awt.GraphicsEnvironment;
import java.io.IOException;
import java.nio.file.Files;
import java.time.Instant;
Expand Down Expand Up @@ -73,13 +72,10 @@ public static void bootstrap(String[] args, List<ClassLoader> classLoaders) {

initPlugins(classLoaders);

// We may split client and server mixins in the future
var runServer = GraphicsEnvironment.isHeadless() || args.length > 0;

injectMixinsAndRun(runServer, args);
injectMixinsAndRun();
}

private static void injectMixinsAndRun(boolean runServer, String[] args) {
private static void injectMixinsAndRun() {
var mixinPaths = new HashSet<String>();
PLUGIN_MANAGER
.getExtensions(MixinExtension.class)
Expand Down
10 changes: 7 additions & 3 deletions dedicated/src/main/java/com/soulfiremc/dedicated/SoulFireDedicatedLoader.java
View file
Expand Up @@ -22,11 +22,15 @@
import java.util.concurrent.Executors;

public class SoulFireDedicatedLoader {
private SoulFireDedicatedLoader() {
}
private SoulFireDedicatedLoader() {}

public static void runDedicated(String host, int port) {
var soulFire = new SoulFireServer(host, port, SoulFireDedicatedBootstrap.PLUGIN_MANAGER, SoulFireDedicatedBootstrap.START_TIME);
var soulFire =
new SoulFireServer(
host,
port,
SoulFireDedicatedBootstrap.PLUGIN_MANAGER,
SoulFireDedicatedBootstrap.START_TIME);

SFDedicatedTerminalConsole.setupTerminalConsole(
Executors.newSingleThreadExecutor(),
Expand Down

0 comments on commit 65bff9c

Please sign in to comment.