Google/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Little changes

Browse source
This commit is contained in:
Tim203 2019-11-30 18:38:09 +01:00
parent b12256bc1e
commit 1c48279a9f
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
api/src/main/java/org/geysermc/api/AuthType.java
View file

@ -1,27 +1,23 @@
package org.geysermc.api; package org.geysermc.api;
import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
@AllArgsConstructor
@Getter @Getter
public enum AuthType { public enum AuthType {
OFFLINE("offline"), OFFLINE,
ONLINE("online"), ONLINE,
FLOODGATE("floodgate"); FLOODGATE;
public static final AuthType[] VALUES = values(); public static final AuthType[] VALUES = values();
private String name;
public static AuthType getById(int id) { public static AuthType getById(int id) {
return id < VALUES.length ? VALUES[id] : OFFLINE; return id < VALUES.length ? VALUES[id] : OFFLINE;
} }
public static AuthType getByName(String name) { public static AuthType getByName(String name) {
String lowerCase = name.toLowerCase(); String upperCase = name.toUpperCase();
for (AuthType type : VALUES) { for (AuthType type : VALUES) {
if (type.getName().equals(lowerCase)) { if (type.name().equals(upperCase)) {
return type; return type;
} }
} }

2
connector/src/main/java/org/geysermc/connector/GeyserConnector.java
View file

@ -158,7 +158,7 @@ public class GeyserConnector implements Connector {
metrics = new Metrics("GeyserMC", config.getMetrics().getUUID(), false, java.util.logging.Logger.getLogger("")); metrics = new Metrics("GeyserMC", config.getMetrics().getUUID(), false, java.util.logging.Logger.getLogger(""));
metrics.addCustomChart(new Metrics.SingleLineChart("servers", () -> 1)); metrics.addCustomChart(new Metrics.SingleLineChart("servers", () -> 1));
metrics.addCustomChart(new Metrics.SingleLineChart("players", Geyser::getPlayerCount)); metrics.addCustomChart(new Metrics.SingleLineChart("players", Geyser::getPlayerCount));
metrics.addCustomChart(new Metrics.SimplePie("authMode", getAuthType()::getName)); metrics.addCustomChart(new Metrics.SimplePie("authMode", getAuthType()::name));
} }
double completeTime = (System.currentTimeMillis() - startupTime) / 1000D; double completeTime = (System.currentTimeMillis() - startupTime) / 1000D;

4
connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
View file

@ -198,6 +198,10 @@ public class GeyserSession implements Player {
publicKey = key; publicKey = key;
} else publicKey = null; } else publicKey = null;
if (publicKey != null) {
connector.getLogger().info("Loaded Floodgate key!");
}
downstream = new Client(remoteServer.getAddress(), remoteServer.getPort(), protocol, new TcpSessionFactory()); downstream = new Client(remoteServer.getAddress(), remoteServer.getPort(), protocol, new TcpSessionFactory());
downstream.getSession().addListener(new SessionAdapter() { downstream.getSession().addListener(new SessionAdapter() {
@Override @Override

2
connector/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java
View file

@ -37,7 +37,7 @@ public class BedrockClientData {
private boolean premiumSkin; private boolean premiumSkin;
@JsonProperty(value = "DeviceId") @JsonProperty(value = "DeviceId")
private UUID deviceId; private String deviceId;
@JsonProperty(value = "DeviceModel") @JsonProperty(value = "DeviceModel")
private String deviceModel; private String deviceModel;
@JsonProperty(value = "DeviceOS") @JsonProperty(value = "DeviceOS")