Update to latest master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -31,10 +31,10 @@ assignees: ''
 <!--- Give us the exact output from /version. Saying "latest" does not help us at all. -->
 
 **Geyser Version**
-<!--- Give us the exact build number as well as branch if applicable. Saying "latest" does not help us at all. -->
+<!--- Give us the exact build number as well as branch if applicable. Saying "latest" does not help us at all. Please also include if you are running the standalone version, or specify which plugin version you are using. If your issue is a connection problem, please specify if you are using the Floodgate plugin. -->
 
 **Minecraft: Bedrock Edition Version**
 <!-- The version of your Minecraft: Bedrock Edition client you tested with. -->
 
 **Additional Context**
-<!--- Add any other context about the problem here. --->
+<!--- Add any other context about the problem here. Include any plugins on the Minecraft server that may cause problems. --->

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,5 @@
 blank_issues_enabled: false
+contact_links:
+  - name: GeyserMC Discord
+    url: http://discord.geysermc.org/
+    about: If your issue seems like it could possibly be an easy fix due to configuration, please hop on our Discord.

.gitignore

@@ -222,6 +222,7 @@ nbdist/
 # End of https://www.gitignore.io/api/git,java,maven,eclipse,netbeans,jetbrains+all
 
 ### Geyser ###
+run/
 config.yml
 logs/
 public-key.pem

README.md

@@ -9,11 +9,15 @@
 
 Geyser is a bridge between Minecraft: Bedrock Edition and Minecraft: Java Edition, closing the gap from those wanting to play true cross-platform.
 
+Geyser is an open collaboration project by [CubeCraft Games](https://cubecraft.net).
+
 ## What is Geyser?
 Geyser is a proxy, bridging the gap between Minecraft: Bedrock Edition and Minecraft: Java Edition servers.
 The ultimate goal of this project is to allow Minecraft: Bedrock Edition users to join Minecraft: Java Edition servers as seamlessly as possible. **Please note, this project is still a work in progress and should not be used on production. Expect bugs!**
 
-### Currently supporting Minecraft Bedrock v1.14.X and Minecraft Java v1.15.2.
+Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have now joined us here!
+
+### Currently supporting Minecraft Bedrock v1.14.6(0) and Minecraft Java v1.15.2.
 
 ## Setting Up
 Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set up Geyser.
@@ -28,12 +32,11 @@ Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set
 - Donate: https://patreon.com/GeyserMC
 
 ## What's Left to be Added/Fixed
-- Inventories ([`inventory`](https://github.com/GeyserMC/Geyser/tree/inventory))
-- Crafting ([`inventory`](https://github.com/GeyserMC/Geyser/tree/inventory))
-- Creative Mode ([`inventory`](https://github.com/GeyserMC/Geyser/tree/inventory))
-- Sounds
-- Block Particles
-- Block Entities ([`inventory`](https://github.com/GeyserMC/Geyser/tree/inventory))
+- The Following Inventories 
+  - [ ] Enchantment Table
+  - [ ] Beacon
+  - [ ] Cartography Table
+  - [ ] Stonecutter
 - Some Entity Flags
 
 ## Compiling

bootstrap/bukkit/pom.xml

@@ -23,6 +23,12 @@
             <version>1.14-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>us.myles</groupId>
+            <artifactId>viaversion</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     <build>
         <finalName>${outputName}-Bukkit</finalName>
@@ -33,6 +39,18 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Main-Class>org.geysermc.platform.bukkit.GeyserBukkitMain</Main-Class>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -53,19 +71,15 @@
                                     <pattern>it.unimi.dsi.fastutil</pattern>
                                     <shadedPattern>org.geysermc.platform.bukkit.shaded.fastutil</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.fasterxml.jackson</pattern>
+                                    <shadedPattern>org.geysermc.platform.bukkit.shaded.jackson</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
                 </executions>
                 <configuration>
-                    <filters>
-                        <filter>
-                            <artifact>*:*</artifact>
-                            <excludes>
-                                <exclude>META-INF/*</exclude>
-                            </excludes>
-                        </filter>
-                    </filters>
                     <artifactSet>
                         <excludes>
                             <exclude>com.google.code.gson:*</exclude>

bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitConfiguration.java

@@ -25,167 +25,38 @@
 
 package org.geysermc.platform.bukkit;
 
-import org.bukkit.configuration.file.FileConfiguration;
-import org.geysermc.common.IGeyserConfiguration;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+import org.geysermc.connector.FloodgateKeyLoader;
+import org.geysermc.connector.configuration.GeyserJacksonConfiguration;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.Map;
 
-public class GeyserBukkitConfiguration implements IGeyserConfiguration {
+@Getter
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class GeyserBukkitConfiguration extends GeyserJacksonConfiguration {
 
-    private FileConfiguration config;
-    private File dataFolder;
+    @JsonProperty("floodgate-key-file")
+    private String floodgateKeyFile;
 
-    private BukkitBedrockConfiguration bedrockConfig;
-    private BukkitRemoteConfiguration remoteConfig;
-    private BukkitMetricsInfo metricsInfo;
+    private Path floodgateKey;
 
-    private Map<String, BukkitUserAuthenticationInfo> userAuthInfo = new HashMap<>();
-
-    public GeyserBukkitConfiguration(File dataFolder, FileConfiguration config) {
-        this.dataFolder = dataFolder;
-        this.config = config;
-
-        bedrockConfig = new BukkitBedrockConfiguration();
-        remoteConfig = new BukkitRemoteConfiguration();
-        metricsInfo = new BukkitMetricsInfo();
-
-        if (!config.contains("userAuths"))
-            return;
-
-        for (String key : config.getConfigurationSection("userAuths").getKeys(false)) {
-            userAuthInfo.put(key, new BukkitUserAuthenticationInfo(key));
-        }
-    }
-
-    @Override
-    public IBedrockConfiguration getBedrock() {
-        return bedrockConfig;
-    }
-
-    @Override
-    public IRemoteConfiguration getRemote() {
-        return remoteConfig;
-    }
-
-    @Override
-    public Map<String, BukkitUserAuthenticationInfo> 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 String getDefaultLocale() {
-        return config.getString("default-locale", "en_us");
+    public void loadFloodgate(GeyserBukkitPlugin plugin) {
+        Plugin floodgate = Bukkit.getPluginManager().getPlugin("floodgate-bukkit");
+        floodgateKey = FloodgateKeyLoader.getKey(plugin.getGeyserLogger(), this, Paths.get(plugin.getDataFolder().toString(), plugin.getConfig().getString("floodgate-key-file", "public-key.pem")), floodgate, floodgate != null ? floodgate.getDataFolder().toPath() : null);
     }
 
     @Override
     public Path getFloodgateKeyFile() {
-        return Paths.get(dataFolder.toString(), config.getString("floodgate-key-file", "public-key.pem"));
+        return floodgateKey;
     }
 
     @Override
-    public IMetricsInfo getMetrics() {
-        return metricsInfo;
-    }
-
-    public class BukkitBedrockConfiguration 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 BukkitRemoteConfiguration 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 BukkitUserAuthenticationInfo implements IUserAuthenticationInfo {
-
-        private String key;
-
-        public BukkitUserAuthenticationInfo(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 BukkitMetricsInfo implements IMetricsInfo {
-
-        @Override
-        public boolean isEnabled() {
-            return config.getBoolean("metrics.enabled", true);
-        }
-
-        @Override
-        public String getUniqueId() {
-            return config.getString("metrics.uuid", "generateduuid");
-        }
+    public boolean isCacheChunks() {
+        return true; // We override this as with Bukkit, we have direct access to the server implementation
     }
 }

bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitLogger.java

@@ -27,13 +27,13 @@
 
 import lombok.AllArgsConstructor;
 
-import org.geysermc.common.logger.IGeyserLogger;
+import org.geysermc.connector.GeyserLogger;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 @AllArgsConstructor
-public class GeyserBukkitLogger implements IGeyserLogger {
+public class GeyserBukkitLogger implements GeyserLogger {
 
     private Logger logger;
     private boolean debugMode;

bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitMain.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2019-2020 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.bukkit;
+
+import org.geysermc.common.main.IGeyserMain;
+
+public class GeyserBukkitMain extends IGeyserMain {
+
+    public static void main(String[] args) {
+        new GeyserBukkitMain().displayMessage();
+    }
+
+    public String getPluginType() {
+        return "Spigot or Paper (recommended)";
+    }
+
+    public String getPluginFolder() {
+        return "plugins";
+    }
+}