Merge branch 'floodgate-2.0' of https://github.com/GeyserMC/Geyser in…

…to floodgate-2.0

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,64 @@
+name: Bug report
+about: Create a report to help us improve
+body:
+- type: markdown
+  attributes:
+    value: |
+      Thanks for taking the time to fill out this bug report for Geyser! Fill out the following form to your best ability to help us fix the problem.
+      Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/geysermc), [the FAQ](https://github.com/GeyserMC/Geyser/wiki/FAQ) or the [Common Issues](https://github.com/GeyserMC/Geyser/wiki/Common-Issues).
+- type: textarea
+  attributes:
+    label: Describe the bug
+    description: A clear and concise description of what the bug is.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: To Reproduce
+    description: Steps to reproduce this behaviour
+    placeholder: |
+      1. Go to '...'
+      2. Click on '...'
+      3. Scroll down to '...'
+      4. See error
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Expected behaviour
+    description: A clear and concise description of what you expected to happen.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Screenshots / Videos
+    description: If applicable, add screenshots to help explain your problem.
+- type: textarea
+  attributes:
+    label: Server Version and Plugins
+    description: |
+      If you just run Geyser-Spigot, you can leave this area blank as the next section covers this information.
+      If you're running a multi-server instance or using Geyser Standalone:
+      *  Give us the exact output from `/version` on all servers involved. Saying "latest" does not help us at all.
+      * Please list all plugins on all servers involved.
+      If this bug occurs on a server you do not control, please full this in to the best of your knowledge.
+- type: input
+  attributes:
+    label: Geyser Dump
+    description: If Geyser starts correctly, please also include the link to a dump by using `/geyser dump`. If you're using the Standalone GUI, the option can be found under `Commands` => `Dump`. This provides us information about your server that we can use to debug your issue.
+- type: input
+  attributes:
+    label: Geyser Version
+    description: What version of Geyser are you running?
+    placeholder: "For example: 1.2.0-SNAPSHOT (git-master-2d9baf1)"
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: "Minecraft: Bedrock Edition Version"
+    description: "What version of Minecraft: Bedrock Edition are you using? Leave empty if the bug happens before you can connect with Minecraft: Bedrock Edition."
+    placeholder: "For example: 1.16.201"
+- type: textarea
+  attributes:
+    label: Additional Context
+    description: Add any other context about the problem here

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,11 @@
 blank_issues_enabled: false
 contact_links:
-  - name: GeyserMC Discord
-    url: http://discord.geysermc.org/
+  - name: Common Issues
+    url: https://github.com/GeyserMC/Geyser/wiki/Common-Issues
+    about: Check the common issues to see if you are not alone with that issue and see how you can fix them.
+  - name: Frequently Asked Questions
+    url: https://github.com/GeyserMC/Geyser/wiki/FAQ
+    about: Look at the FAQ page for answers for frequently asked questions.
+  - name: Get help on the GeyserMC Discord server
+    url: https://discord.gg/geysermc
     about: If your issue seems like it could possibly be an easy fix due to configuration, please hop on our Discord.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,21 @@
+name: Feature request
+about: Suggest an idea for this project
+labels: "Feature Request"
+body:
+- type: markdown
+  attributes:
+    value: |
+      Thanks for taking the time to fill out this feature request for Geyser! Fill out the following form to your best ability to help us understand your feature request and greately improve the change of it getting added.
+      For anything else than a feature request, use: [our Discord server](https://discord.gg/geysermc), [the FAQ](https://github.com/GeyserMC/Geyser/wiki/FAQ) or [the Common Issues](https://github.com/GeyserMC/Geyser/wiki/Common-Issues).
+- type: textarea
+  attributes:
+    label: What feature do you want to see added?
+    description: A clear and concise description of your feature request.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Are there any alternatives?
+    description: List any alternatives you might have tried
+  validations:
+    required: true

Jenkinsfile

@@ -22,7 +22,10 @@ pipeline {
 
         stage ('Deploy') {
             when {
-                branch "master"
+                anyOf {
+                    branch "master"
+                    branch "floodgate-2.0"
+                }
             }
 
             steps {
@@ -35,8 +38,8 @@ pipeline {
                 rtMavenResolver(
                         id: "maven-resolver",
                         serverId: "opencollab-artifactory",
-                        releaseRepo: "release",
-                        snapshotRepo: "snapshot"
+                        releaseRepo: "maven-deploy-release",
+                        snapshotRepo: "maven-deploy-snapshot"
                 )
                 rtMavenRun(
                         pom: 'pom.xml',

README.md

@@ -18,7 +18,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
 
 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.16.100 - v1.16.201 and Minecraft Java v1.16.4 - v1.16.5.
+### Currently supporting Minecraft Bedrock v1.16.100 - v1.16.210 and Minecraft Java v1.16.4 - v1.16.5.
 
 ## Setting Up
 Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set up Geyser.
@@ -34,20 +34,10 @@ Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set
 - Test Server: `test.geysermc.org` port `25565` for Java and `19132` for Bedrock
 
 ## What's Left to be Added/Fixed
-- Lecterns
 - Near-perfect movement (to the point where anticheat on large servers is unlikely to ban you)
 - Resource pack conversion/CustomModelData
 - Some Entity Flags
-- The Following Inventories 
-  - Enchantment Table (as a proper GUI)
-  - Beacon
-  - Cartography Table
-  - Stonecutter
-  - Structure Block
-  - Horse Inventory
-  - Loom
-  - Smithing Table
-  - Grindstone
+- Structure block UI
 
 ## What can't be fixed
 The following things can't be fixed because of Bedrock limitations. They might be fixable in the future, but not as of now.

bootstrap/bungeecord/pom.xml

@@ -6,15 +6,15 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-bungeecord</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.3.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

bootstrap/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>geyser-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-parent</artifactId>
     <packaging>pom</packaging>
@@ -16,13 +16,9 @@
             <id>spigot-public</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/public/</url>
         </repository>
-        <repository>
-            <id>bukkit-public</id>
-            <url>https://repo.md-5.net/content/repositories/public/</url>
-        </repository>
         <repository>
             <id>sponge-repo</id>
-            <url>https://repo.spongepowered.org/maven</url>
+            <url>https://repo.spongepowered.org/repository/maven-public/</url>
         </repository>
         <repository>
             <id>bungeecord-repo</id>

bootstrap/spigot/pom.xml

@@ -6,15 +6,15 @@
     <parent>
         <groupId>org.geysermc</groupId>
         <artifactId>bootstrap-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>bootstrap-spigot</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>connector</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.3.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -30,9 +30,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.geysermc.adapters</groupId>
+            <groupId>org.geysermc.geyser.adapters</groupId>
             <artifactId>spigot-all</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>