From b56476391b879646151ae901ac5d12da300fc30b Mon Sep 17 00:00:00 2001
From: Pugmatt <pugmatt@gmail.com>
Date: Sun, 10 May 2020 20:59:00 -0400
Subject: Fix for error

---
 serverlist-server/BedrockConnect.iml               |   6 +++--
 serverlist-server/pom.xml                          |  26 ---------------------
 .../bedrockconnect/utils/PaletteManager.java       |   4 +++-
 .../main/resources/tables/runtime_block_states.dat | Bin 208936 -> 302699 bytes
 4 files changed, 7 insertions(+), 29 deletions(-)

(limited to 'serverlist-server')

diff --git a/serverlist-server/BedrockConnect.iml b/serverlist-server/BedrockConnect.iml
index 178b250..667e8d4 100644
--- a/serverlist-server/BedrockConnect.iml
+++ b/serverlist-server/BedrockConnect.iml
@@ -9,6 +9,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.17" level="project" />
     <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
     <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
@@ -22,6 +23,7 @@
     <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.43.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.43.Final" level="project" />
     <orderEntry type="library" name="Maven: cn.nukkit:nukkit-natives:1.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.nukkitx:nbt:1.5.1" level="project" />
     <orderEntry type="library" name="Maven: com.nukkitx.network:raknet:1.6.16" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.43.Final" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.43.Final" level="project" />
@@ -31,7 +33,6 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.5" level="project" />
     <orderEntry type="library" name="Maven: com.nukkitx:math:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: com.nukkitx:nbt:1.3.3" level="project" />
     <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:4.39.2" level="project" />
     <orderEntry type="library" name="Maven: com.github.stephenc.jcip:jcip-annotations:1.0-1" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
@@ -44,6 +45,7 @@
     <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
     <orderEntry type="library" name="Maven: net.sf.trove4j:trove:3.1.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: net.sf.trove4j:trove-generator:3.1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.17" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.19" level="project" />
+    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/serverlist-server/pom.xml b/serverlist-server/pom.xml
index 094b5da..5325ea3 100644
--- a/serverlist-server/pom.xml
+++ b/serverlist-server/pom.xml
@@ -74,23 +74,7 @@
             <id>nukkitx-repo-snapshot</id>
             <url>https://repo.nukkitx.com/maven-snapshots/</url>
         </repository>
-        <repository>
-            <id>releases</id>
-            <name>nukkitx-releases</name>
-            <url>https://repo.nukkitx.com/release</url>
-        </repository>
-        <repository>
-            <id>snapshots</id>
-            <name>nukkitx-snapshots</name>
-            <url>https://repo.nukkitx.com/snapshot</url>
-        </repository>
-        <repository>
-            <id>repo</id>
-            <name>repo</name>
-            <url>file://${basedir}/`pwd`/repo</url>
-        </repository>
     </repositories>
-
     <dependencies>
         <!-- https://mvnrepository.com/artifact/net.minidev/json-smart -->
         <dependency>
@@ -116,16 +100,6 @@
             <version>2.5</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.nukkitx</groupId>
-            <artifactId>math</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.nukkitx</groupId>
-            <artifactId>nbt</artifactId>
-            <version>1.3.3</version>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/com.nimbusds/nimbus-jose-jwt -->
         <dependency>
             <groupId>com.nimbusds</groupId>
diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/utils/PaletteManager.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/utils/PaletteManager.java
index f1c1869..e7bb857 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/utils/PaletteManager.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/utils/PaletteManager.java
@@ -42,7 +42,9 @@ public class PaletteManager {
         Map<String, Integer> blockIdToIdentifier = new HashMap<>();
         ListTag<CompoundTag> tag;
 
-        NBTInputStream nbtInputStream = NbtUtils.createReader(stream);
+        NBTInputStream nbtInputStream = NbtUtils.createNetworkReader(stream);
+
+        ListTag<CompoundTag> blocksTag;
         try {
             tag = (ListTag<CompoundTag>) nbtInputStream.readTag();
             nbtInputStream.close();
diff --git a/serverlist-server/src/main/resources/tables/runtime_block_states.dat b/serverlist-server/src/main/resources/tables/runtime_block_states.dat
index 32c9939..0c79ab2 100644
Binary files a/serverlist-server/src/main/resources/tables/runtime_block_states.dat and b/serverlist-server/src/main/resources/tables/runtime_block_states.dat differ
-- 
cgit v1.2.1