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

Merge branch 'master' into plugin

Browse source
This commit is contained in:
Redned 2020-01-25 23:03:47 -06:00 committed by RednedEpic
commit c4857c6a54
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserConfiguration.java
View file

@ -30,6 +30,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter; import lombok.Getter;
import org.geysermc.common.IGeyserConfiguration; import org.geysermc.common.IGeyserConfiguration;
import java.io.File;
import java.util.Map; import java.util.Map;
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
@ -61,6 +62,11 @@ public class GeyserConfiguration implements IGeyserConfiguration {
private MetricsInfo metrics; private MetricsInfo metrics;
@Override
public File getFloodgateKeyFile() {
return new File(floodgateKeyFile);
}
@Getter @Getter
public static class BedrockConfiguration implements IBedrockConfiguration { public static class BedrockConfiguration implements IBedrockConfiguration {

2
connector/pom.xml
View file

@ -75,7 +75,7 @@
<dependency> <dependency>
<groupId>com.github.steveice10</groupId> <groupId>com.github.steveice10</groupId>
<artifactId>mcprotocollib</artifactId> <artifactId>mcprotocollib</artifactId>
<version>1.15.1-1-SNAPSHOT</version> <version>1.15.2-1-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>

2
connector/src/main/resources/config.yml
View file

@ -20,7 +20,7 @@ remote:
address: 127.0.0.1 address: 127.0.0.1
# The port of the remote (Java Edition) server # The port of the remote (Java Edition) server
port: 25565 port: 25565
# Authentication type. Can be offline, online, or floodgate (see the wiki). # Authentication type. Can be offline, online, or floodgate (see https://github.com/GeyserMC/Geyser/wiki/Floodgate).
auth-type: online auth-type: online
# Floodgate uses encryption to ensure use from authorised sources. # Floodgate uses encryption to ensure use from authorised sources.