Update RememberUsernamePlugin to save the name from the vanilla feature
This commit is contained in:
@@ -56,18 +56,6 @@ public class RememberUsernamePlugin extends Plugin
|
|||||||
applyUsername();
|
applyUsername();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void shutDown() throws Exception
|
|
||||||
{
|
|
||||||
GameState gameState = client.getGameState();
|
|
||||||
if (gameState == GameState.LOGIN_SCREEN)
|
|
||||||
{
|
|
||||||
if (Objects.equals(config.username(), client.getUsername()))
|
|
||||||
{
|
|
||||||
client.setUsername("");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
RememberUsernameConfig getConfig(ConfigManager configManager)
|
RememberUsernameConfig getConfig(ConfigManager configManager)
|
||||||
{
|
{
|
||||||
@@ -83,13 +71,20 @@ public class RememberUsernamePlugin extends Plugin
|
|||||||
}
|
}
|
||||||
else if (event.getGameState() == GameState.LOGGED_IN)
|
else if (event.getGameState() == GameState.LOGGED_IN)
|
||||||
{
|
{
|
||||||
if (config.username().equals(client.getUsername()))
|
String username = "";
|
||||||
|
|
||||||
|
if (client.getPreferences().getRememberedUsername() != null)
|
||||||
|
{
|
||||||
|
username = client.getUsername();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (config.username().equals(username))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
log.debug("Saving username: {}", client.getUsername());
|
log.debug("Saving username: {}", username);
|
||||||
config.username(client.getUsername());
|
config.username(username);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -106,12 +101,13 @@ public class RememberUsernamePlugin extends Plugin
|
|||||||
if (gameState == GameState.LOGIN_SCREEN)
|
if (gameState == GameState.LOGIN_SCREEN)
|
||||||
{
|
{
|
||||||
String username = config.username();
|
String username = config.username();
|
||||||
|
|
||||||
if (Strings.isNullOrEmpty(username))
|
if (Strings.isNullOrEmpty(username))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
client.setUsername(username);
|
client.getPreferences().setRememberedUsername(username);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user