Merge remote-tracking branch 'origin/master'

# Conflicts: # connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
2019-07-18 20:13:42 -04:00 · 2019-07-18 20:13:42 -04:00 · c2fe6d1066
parent 9ba14d9dc9 e39c29866a
commit c2fe6d1066
10 changed files with 77 additions and 24 deletions
--- a/README.md
+++ b/README.md
@ -10,9 +10,26 @@ The ultimate goal for this project is to allow those to join Minecraft: Java Edi
 If you're interested in development, please join our Discord server:
 https://discord.gg/mRjbCsS

+## What's Completed
+- [x] Server recognized in server list 
+- [x] Join detection from remote
+- [ ] Online mode/auth support
+- [ ] Chat/command support
+- [ ] Inventory support
+- [ ] Movement support
+- [ ] Entity support
+- [ ] Chunks
+- [ ] Block break/place support
+
 ## Compiling
 Clone the repo to your computer, and run `mvn clean install`.

 ## Contributing
 As a project that is still nowhere near completion, any contributions are appreciated. Please feel free to reach out to us on Discord if
 you're interested in helping this project come along.
+
+## Libraries Used:
+- [NukkitX Bedrock Protocol Library](https://github.com/NukkitX/Protocol)
+- [Steveice10's Java Protocol Library](https://github.com/Steveice10/MCProtocolLib)
+- [TerminalConsoleAppender](https://github.com/Minecrell/TerminalConsoleAppender)
+- [Simple Logging Facade for Java (slf4j)](https://github.com/qos-ch/slf4j)
--- a/api/pom.xml
+++ b/api/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.geysermc</groupId>
        <artifactId>geyser-parent</artifactId>
-        <version>${revision}</version>
+        <version>1.0-SNAPSHOT</version>
    </parent>
    <artifactId>api</artifactId>
    <dependencies>
--- a/api/src/main/java/org/geysermc/api/GeyserAPI.java
+++ b/api/src/main/java/org/geysermc/api/GeyserAPI.java
@ -1,4 +0,0 @@
-package org.geysermc.api;
-
-public class GeyserAPI {
-}
--- a/common/pom.xml
+++ b/common/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.geysermc</groupId>
        <artifactId>geyser-parent</artifactId>
-        <version>${revision}</version>
+        <version>1.0-SNAPSHOT</version>
    </parent>
    <artifactId>common</artifactId>
    <dependencies>
--- a/connector/pom.xml
+++ b/connector/pom.xml
@ -6,20 +6,20 @@
    <parent>
        <groupId>org.geysermc</groupId>
        <artifactId>geyser-parent</artifactId>
-        <version>${revision}</version>
+        <version>1.0-SNAPSHOT</version>
    </parent>
    <artifactId>connector</artifactId>
    <dependencies>
        <dependency>
            <groupId>org.geysermc</groupId>
            <artifactId>api</artifactId>
-            <version>${revision}</version>
+            <version>1.0-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>org.geysermc</groupId>
            <artifactId>common</artifactId>
-            <version>${revision}</version>
+            <version>1.0-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
@ -62,7 +62,7 @@
        <dependency>
            <groupId>com.nukkitx.protocol</groupId>
            <artifactId>bedrock-v361</artifactId>
-            <version>2.1.0</version>
+            <version>2.1.1</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
@ -74,13 +74,13 @@
        <dependency>
            <groupId>com.nukkitx.protocol</groupId>
            <artifactId>bedrock-v354</artifactId>
-            <version>2.1.0</version>
+            <version>2.1.1</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.nukkitx.protocol</groupId>
            <artifactId>bedrock-v340</artifactId>
-            <version>2.1.0</version>
+            <version>2.1.1</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
--- a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java
+++ b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java
@ -27,20 +27,12 @@ package org.geysermc.connector;

 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import com.nukkitx.network.raknet.RakNetServer;
-import com.nukkitx.network.raknet.RakNetServerListener;
-import com.nukkitx.network.raknet.RakNetServerSession;
 import com.nukkitx.protocol.bedrock.BedrockPacketCodec;
 import com.nukkitx.protocol.bedrock.BedrockServer;
 import com.nukkitx.protocol.bedrock.v361.Bedrock_v361;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.socket.DatagramPacket;
 import lombok.Getter;
-import org.apache.logging.log4j.core.filter.Filterable;
 import org.fusesource.jansi.AnsiConsole;
-import org.geysermc.api.ChatColor;
 import org.geysermc.api.Connector;
-import org.geysermc.api.ConsoleColors;
 import org.geysermc.api.Geyser;
 import org.geysermc.api.command.CommandMap;
 import org.geysermc.api.logger.Logger;
--- a/connector/src/main/java/org/geysermc/connector/network/translators/Registry.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/Registry.java
@ -1,3 +1,28 @@
+/*
+ * 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.connector.network.translators;

 import com.github.steveice10.packetlib.packet.Packet;
@ -26,5 +51,4 @@ public class Registry<T> {
            GeyserLogger.DEFAULT.warning("could not translate packet " + p.getClass().getSimpleName());
        }
    }
-
 }
--- a/connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
@ -1,3 +1,28 @@
+/*
+ * 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.connector.network.translators;

 import com.flowpowered.math.vector.Vector2f;
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>org.geysermc</groupId>
        <artifactId>geyser-parent</artifactId>
-        <version>${revision}</version>
+        <version>1.0-SNAPSHOT</version>
    </parent>
    <artifactId>plugin</artifactId>
 </project>
--- a/pom.xml
+++ b/pom.xml
@ -5,7 +5,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.geysermc</groupId>
    <artifactId>geyser-parent</artifactId>
-    <version>${revision}</version>
+    <version>1.0-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>GeyserMC</name>
    <description>Allows for players from Minecraft Bedrock Edition to join Minecraft Java Edition servers.</description>
@ -16,7 +16,6 @@
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <maven.compiler.source>1.8</maven.compiler.source>
        <maven.compiler.target>1.8</maven.compiler.target>
-        <revision>1.0-SNAPSHOT</revision>
    </properties>
    <organization>
        <name>GeyserMC</name>