From 345d78976ada1afd914c02cab679d1bf878ec8fc Mon Sep 17 00:00:00 2001
From: KennyTV <kennytv@t-online.de>
Date: Fri, 17 Apr 2020 21:11:36 +0200
Subject: [PATCH] Add VB version to dumps

---
 all/pom.xml                                   | 43 +++++++++++++------
 .../api/ViaBackwardsPlatform.java             |  2 +
 .../packets/BlockItemPackets1_16.java         |  6 ++-
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index f45869b7..301fdcfa 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -27,6 +27,37 @@
         <defaultGoal>clean install</defaultGoal>
 
         <plugins>
+            <!-- Write git commit hash into build properties -->
+            <plugin>
+                <groupId>net.md-5</groupId>
+                <artifactId>scriptus</artifactId>
+                <version>0.3.2</version>
+                <configuration>
+                    <format>git-ViaBackwards-${project.parent.version}:%s</format>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>describe</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <!--suppress MavenModelInspection -->
+                            <Implementation-Version>${describe}</Implementation-Version>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -46,22 +77,10 @@
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <minimizeJar>false</minimizeJar>
                     <relocations>
-                        <relocation>
-                            <pattern>com.github.steveice10.opennbt</pattern>
-                            <shadedPattern>us.myles.viaversion.libs.opennbt</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>com.google.gson</pattern>
                             <shadedPattern>us.myles.viaversion.libs.gson</shadedPattern>
                         </relocation>
-                        <relocation>
-                            <pattern>javassist</pattern>
-                            <shadedPattern>us.myles.viaversion.libs.javassist</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.yaml.snakeyaml</pattern>
-                            <shadedPattern>us.myles.viaversion.libs.snakeyaml</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>net.md_5.bungee</pattern>
                             <shadedPattern>us.myles.viaversion.libs.bungeecordchat</shadedPattern>
diff --git a/core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java b/core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java
index 43b1124a..18ddd2a5 100644
--- a/core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java
+++ b/core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java
@@ -55,6 +55,8 @@ public interface ViaBackwardsPlatform {
 
         if (isOutdated()) return;
 
+        Via.getManager().getSubPlatforms().add(ViaBackwards.class.getPackage().getImplementationVersion());
+
         getLogger().info("Loading translations...");
         TranslatableRewriter.loadTranslatables();
 
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java
index 2811d234..bf07e5b0 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java
@@ -160,8 +160,10 @@ public class BlockItemPackets1_16 extends nl.matsv.viabackwards.api.rewriters.It
                         } else if (id.equals("minecraft:skull") && blockEntity.get("SkullOwner") instanceof CompoundTag) {
                             CompoundTag skullOwnerTag = blockEntity.remove("SkullOwner");
                             IntArrayTag ownerUuidTag = skullOwnerTag.remove("Id");
-                            UUID ownerUuid = UUIDIntArrayType.uuidFromIntArray(ownerUuidTag.getValue());
-                            skullOwnerTag.put(new StringTag("Id", ownerUuid.toString()));
+                            if (ownerUuidTag != null) {
+                                UUID ownerUuid = UUIDIntArrayType.uuidFromIntArray(ownerUuidTag.getValue());
+                                skullOwnerTag.put(new StringTag("Id", ownerUuid.toString()));
+                            }
 
                             // SkullOwner -> Owner
                             CompoundTag ownerTag = new CompoundTag("Owner");