GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Small changes

Browse source
This commit is contained in:
Tim203 2020-12-12 01:39:09 +01:00
parent 45596a87a9
commit 9500da2ef0
No known key found for this signature in database
GPG key ID: 064EE9F5BF7C3EE8
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
connector/src/main/java/org/geysermc/connector/network/session/cache/FormCache.java vendored
View file

@ -77,7 +77,7 @@ public class FormCache {
Consumer<String> responseConsumer = form.getResponseHandler(); Consumer<String> responseConsumer = form.getResponseHandler();
if (responseConsumer != null) { if (responseConsumer != null) {
responseConsumer.accept(response.getFormData().trim()); responseConsumer.accept(response.getFormData());
} }
removeWindow(response.getFormId()); removeWindow(response.getFormId());

11
connector/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java
View file

@ -154,17 +154,15 @@ public class LoginEncryptionUtils {
} }
public static void buildAndShowLoginWindow(GeyserSession session) { public static void buildAndShowLoginWindow(GeyserSession session) {
String userLanguage = session.getClientData().getLanguageCode();
session.sendForm( session.sendForm(
SimpleForm.builder() SimpleForm.builder()
.translator(LanguageUtils::getPlayerLocaleString, userLanguage) .translator(LanguageUtils::getPlayerLocaleString, session.getLocale())
.title("geyser.auth.login.form.notice.title") .title("geyser.auth.login.form.notice.title")
.content("geyser.auth.login.form.notice.desc") .content("geyser.auth.login.form.notice.desc")
.button("geyser.auth.login.form.notice.btn_login") // id = 0 .button("geyser.auth.login.form.notice.btn_login") // id = 0
.button("geyser.auth.login.form.notice.btn_disconnect") .button("geyser.auth.login.form.notice.btn_disconnect")
.responseHandler((form, responseData) -> { .responseHandler((form, responseData) -> {
SimpleFormResponse response = form.parseResponse(responseData.trim()); SimpleFormResponse response = form.parseResponse(responseData);
if (!response.isCorrect()) { if (!response.isCorrect()) {
buildAndShowLoginWindow(session); buildAndShowLoginWindow(session);
return; return;
@ -180,16 +178,15 @@ public class LoginEncryptionUtils {
} }
public static void buildAndShowLoginDetailsWindow(GeyserSession session) { public static void buildAndShowLoginDetailsWindow(GeyserSession session) {
String userLanguage = session.getLocale();
session.sendForm( session.sendForm(
CustomForm.builder() CustomForm.builder()
.translator(LanguageUtils::getPlayerLocaleString, userLanguage) .translator(LanguageUtils::getPlayerLocaleString, session.getLocale())
.title("geyser.auth.login.form.details.title") .title("geyser.auth.login.form.details.title")
.label("geyser.auth.login.form.details.desc") .label("geyser.auth.login.form.details.desc")
.input("geyser.auth.login.form.details.email", "account@geysermc.org", "") .input("geyser.auth.login.form.details.email", "account@geysermc.org", "")
.input("geyser.auth.login.form.details.pass", "123456", "") .input("geyser.auth.login.form.details.pass", "123456", "")
.responseHandler((form, responseData) -> { .responseHandler((form, responseData) -> {
CustomFormResponse response = form.parseResponse(responseData.trim()); CustomFormResponse response = form.parseResponse(responseData);
if (!response.isCorrect()) { if (!response.isCorrect()) {
buildAndShowLoginDetailsWindow(session); buildAndShowLoginDetailsWindow(session);
return; return;