Add BungeeCord plugin module, cleanup POMs

api/pom.xml

@@ -14,7 +14,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.18.4</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

bootstrap/bukkit/pom.xml

@@ -11,12 +11,6 @@
     </parent>
     <artifactId>bootstrap-bukkit</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>common</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
@@ -54,7 +48,6 @@
                 </executions>
                 <configuration>
                     <finalName>${outputName}-Bukkit</finalName>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
                     <minimizeJar>true</minimizeJar>
                 </configuration>
             </plugin>

bootstrap/bungeecord/pom.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.geysermc</groupId>
+        <artifactId>bootstrap-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <artifactId>bootstrap-bungeecord</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.geysermc</groupId>
+            <artifactId>connector</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-api</artifactId>
+            <version>1.14-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <finalName>${outputName}-BungeeCord-noshade</finalName>
+        <defaultGoal>clean install</defaultGoal>
+        <resources>
+            <resource>
+                <directory>src/main/resources/</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <finalName>${outputName}-BungeeCord</finalName>
+                    <minimizeJar>true</minimizeJar>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeConfiguration.java

@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2019 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.platform.bungeecord;
+
+import net.md_5.bungee.config.Configuration;
+
+import org.geysermc.common.IGeyserConfiguration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class GeyserBungeeConfiguration implements IGeyserConfiguration {
+
+    private Configuration config;
+
+    private BungeeBedrockConfiguration bedrockConfig;
+    private BungeeRemoteConfiguration remoteConfig;
+    private BungeeMetricsInfo metricsInfo;
+
+    private Map<String, BungeeUserAuthenticationInfo> userAuthInfo = new HashMap<>();
+
+    public GeyserBungeeConfiguration(Configuration config) {
+        this.config = config;
+
+        bedrockConfig = new BungeeBedrockConfiguration();
+        remoteConfig = new BungeeRemoteConfiguration();
+        metricsInfo = new BungeeMetricsInfo();
+
+        if (!config.contains("userAuths"))
+            return;
+
+        for (String key : config.getSection("userAuths").getKeys()) {
+            userAuthInfo.put(key, new BungeeUserAuthenticationInfo(key));
+        }
+    }
+
+    @Override
+    public BungeeBedrockConfiguration getBedrock() {
+        return bedrockConfig;
+    }
+
+    @Override
+    public BungeeRemoteConfiguration getRemote() {
+        return remoteConfig;
+    }
+
+    @Override
+    public Map<String, BungeeUserAuthenticationInfo> getUserAuths() {
+        return userAuthInfo;
+    }
+
+    @Override
+    public boolean isPingPassthrough() {
+        return config.getBoolean("ping-passthrough", false);
+    }
+
+    @Override
+    public int getMaxPlayers() {
+        return config.getInt("max-players", 10);
+    }
+
+    @Override
+    public boolean isDebugMode() {
+        return config.getBoolean("debug-mode", false);
+    }
+
+    @Override
+    public int getGeneralThreadPool() {
+        return config.getInt("general-thread-pool", 32);
+    }
+
+    @Override
+    public boolean isAllowThirdPartyCapes() {
+        return config.getBoolean("allow-third-party-capes", true);
+    }
+
+    @Override
+    public BungeeMetricsInfo getMetrics() {
+        return metricsInfo;
+    }
+
+    public class BungeeBedrockConfiguration implements IBedrockConfiguration {
+
+        @Override
+        public String getAddress() {
+            return config.getString("bedrock.address", "0.0.0.0");
+        }
+
+        @Override
+        public int getPort() {
+            return config.getInt("bedrock.port", 25565);
+        }
+
+        @Override
+        public String getMotd1() {
+            return config.getString("bedrock.motd1", "GeyserMC");
+        }
+
+        @Override
+        public String getMotd2() {
+            return config.getString("bedrock.motd2", "GeyserMC");
+        }
+    }
+
+    public class BungeeRemoteConfiguration implements IRemoteConfiguration {
+
+        @Override
+        public String getAddress() {
+            return config.getString("remote.address", "127.0.0.1");
+        }
+
+        @Override
+        public int getPort() {
+            return config.getInt("remote.port", 25565);
+        }
+
+        @Override
+        public String getAuthType() {
+            return config.getString("remote.auth-type", "online");
+        }
+    }
+
+    public class BungeeUserAuthenticationInfo implements IUserAuthenticationInfo {
+
+        private String key;
+
+        public BungeeUserAuthenticationInfo(String key) {
+            this.key = key;
+        }
+
+        @Override
+        public String getEmail() {
+            return config.getString("userAuths." + key + ".email");
+        }
+
+        @Override
+        public String getPassword() {
+            return config.getString("userAuths." + key + ".password");
+        }
+    }
+
+    public class BungeeMetricsInfo implements IMetricsInfo {
+
+        @Override
+        public boolean isEnabled() {
+            return config.getBoolean("metrics.enabled", true);
+        }
+
+        @Override
+        public String getUniqueId() {
+            return config.getString("metrics.uuid", "generateduuid");
+        }
+    }
+}

bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeeLogger.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2019 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.platform.bungeecord;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class GeyserBungeeLogger implements org.geysermc.api.logger.Logger {
+
+    private Logger logger;
+    private boolean debugMode;
+
+    public GeyserBungeeLogger(Logger logger, boolean debugMode) {
+        this.logger = logger;
+        this.debugMode = debugMode;
+    }
+
+    @Override
+    public void severe(String message) {
+        logger.severe(message);
+    }
+
+    @Override
+    public void severe(String message, Throwable error) {
+        logger.log(Level.SEVERE, message, error);
+    }
+
+    @Override
+    public void error(String message) {
+        logger.warning(message);
+    }
+
+    @Override
+    public void error(String message, Throwable error) {
+        logger.log(Level.WARNING, message, error);
+    }
+
+    @Override
+    public void warning(String message) {
+        error(message);
+    }
+
+    @Override
+    public void info(String message) {
+        logger.info(message);
+    }
+
+    @Override
+    public void debug(String message) {
+        if (debugMode)
+            info(message);
+    }
+
+    @Override
+    public void setDebug(boolean debug) {
+        debugMode = debug;
+    }
+}

bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePlugin.java

@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2019 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.platform.bungeecord;
+
+import net.md_5.bungee.api.plugin.Plugin;
+import net.md_5.bungee.config.Configuration;
+import net.md_5.bungee.config.ConfigurationProvider;
+import net.md_5.bungee.config.YamlConfiguration;
+
+import org.geysermc.connector.GeyserConnector;
+import org.geysermc.common.bootstrap.IGeyserBootstrap;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.UUID;
+
+public class GeyserBungeePlugin extends Plugin implements IGeyserBootstrap {
+
+    private GeyserBungeeConfiguration geyserConfig;
+    private GeyserBungeeLogger geyserLogger;
+
+    @Override
+    public void onEnable() {
+        if (!getDataFolder().exists())
+            getDataFolder().mkdir();
+
+        File file = new File(getDataFolder(), "config.yml");
+        Configuration configuration = null;
+
+        if (!file.exists()) {
+            try (InputStream in = getResourceAsStream("config.yml")) {
+                Files.copy(in, file.toPath());
+                configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(new File(getDataFolder(), "config.yml"));
+            } catch (IOException ex) {
+                geyserLogger.severe("Failed to read/create config.yml! Make sure it's up to date and/or readable+writable!", ex);
+                return;
+            }
+        }
+
+        if (configuration == null) {
+            geyserLogger.severe("Failed to read/create config.yml! Make sure it's up to date and/or readable+writable!");
+            return;
+        }
+
+        geyserConfig = new GeyserBungeeConfiguration(configuration);
+
+        if (geyserConfig.getMetrics().getUniqueId().equals("generateduuid")) {
+            configuration.set("metrics.uuid", UUID.randomUUID().toString());
+            try {
+                ConfigurationProvider.getProvider(YamlConfiguration.class).save(configuration, new File(getDataFolder(), "config.yml"));
+            } catch (IOException ex) {
+                geyserLogger.severe("Failed to read/create config.yml! Make sure it's up to date and/or readable+writable!", ex);
+                return;
+            }
+        }
+
+        geyserLogger = new GeyserBungeeLogger(getLogger(), geyserConfig.isDebugMode());
+
+        GeyserConnector.start(this, false);
+    }
+
+    @Override
+    public void onDisable() {
+        GeyserConnector.stop();
+    }
+
+    @Override
+    public GeyserBungeeConfiguration getGeyserConfig() {
+        return geyserConfig;
+    }
+
+    @Override
+    public GeyserBungeeLogger getGeyserLogger() {
+        return geyserLogger;
+    }
+}

bootstrap/bungeecord/src/main/resources/bungee.yml

@@ -0,0 +1,5 @@
+main: org.geysermc.platform.bungeecord.GeyserBungeePlugin
+name: ${outputName}-BungeeCord
+author: ${project.organization.name}
+website: ${project.organization.url}
+version: ${project.version}

bootstrap/pom.xml

@@ -25,11 +25,15 @@
             <id>sponge-repo</id>
             <url>https://repo.spongepowered.org/maven</url>
         </repository>
+        <repository>
+            <id>bungeecord-repo</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </repository>
     </repositories>
     <modules>
         <module>bukkit</module>
-        <!-- <module>bungeecord</module>
+        <module>bungeecord</module>
-        <module>sponge</module> -->
+        <!-- <module>sponge</module> -->
         <module>standalone</module>
         <!-- <module>velocity</module> -->
     </modules>

bootstrap/standalone/pom.xml

@@ -11,12 +11,6 @@
     </parent>
     <artifactId>bootstrap-standalone</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>common</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
@@ -54,7 +48,6 @@
                 </executions>
                 <configuration>
                     <finalName>${outputName}</finalName>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
                     <minimizeJar>true</minimizeJar>
                 </configuration>
             </plugin>

bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserBootstrap.java

@@ -56,7 +56,7 @@ public class GeyserBootstrap implements IGeyserBootstrap {
             File configFile = FileUtils.fileOrCopiedFromResource("config.yml", (x) -> x.replaceAll("generateduuid", UUID.randomUUID().toString()));
             geyserConfig = FileUtils.loadConfig(configFile, GeyserConfiguration.class);
         } catch (IOException ex) {
-            getGeyserLogger().severe("Failed to read/create config.yml! Make sure it's up to date and/or readable+writable!", ex);
+            geyserLogger.severe("Failed to read/create config.yml! Make sure it's up to date and/or readable+writable!", ex);
             System.exit(0);
         }
 

connector/pom.xml

@@ -12,12 +12,6 @@
     <artifactId>connector</artifactId>
     <version>1.0-SNAPSHOT</version>
     <dependencies>
-        <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>api</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>common</artifactId>
@@ -49,18 +43,6 @@
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.5</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.6.4</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -146,7 +128,6 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <shadedArtifactAttached>true</shadedArtifactAttached>
                     <minimizeJar>true</minimizeJar>
                 </configuration>
             </plugin>

pom.xml

@@ -106,7 +106,6 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.1.0</version>
                 <configuration>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
                     <minimizeJar>true</minimizeJar>
                 </configuration>
             </plugin>