Merge Floodgate changes

This commit is contained in:
RednedEpic 2020-01-03 23:58:58 -06:00
commit 2fc591e341
16 changed files with 351 additions and 24 deletions

View file

@ -96,6 +96,11 @@ public class GeyserBukkitConfiguration implements IGeyserConfiguration {
return config.getBoolean("allow-third-party-capes", true);
}
@Override
public String getFloodgateKeyFile() {
return config.getString("floodgate-key-file", "public-key.pem");
}
@Override
public IMetricsInfo getMetrics() {
return metricsInfo;

View file

@ -97,6 +97,11 @@ public class GeyserBungeeConfiguration implements IGeyserConfiguration {
return config.getBoolean("allow-third-party-capes", true);
}
@Override
public String getFloodgateKeyFile() {
return config.getString("floodgate-key-file", "public-key.pem");
}
@Override
public BungeeMetricsInfo getMetrics() {
return metricsInfo;

View file

@ -100,6 +100,11 @@ public class GeyserSpongeConfiguration implements IGeyserConfiguration {
return node.getNode("allow-third-party-capes").getBoolean(true);
}
@Override
public String getFloodgateKeyFile() {
return node.getNode("floodgate-key-file").getString("public-key.pem");
}
@Override
public SpongeMetricsInfo getMetrics() {
return metricsInfo;

View file

@ -39,6 +39,9 @@ public class GeyserConfiguration implements IGeyserConfiguration {
private BedrockConfiguration bedrock;
private RemoteConfiguration remote;
@JsonProperty("floodgate-key-file")
private String floodgateKeyFile;
private Map<String, UserAuthenticationInfo> userAuths;
@JsonProperty("ping-passthrough")