Merge pull request #102 from creeper123123321/dev

1.13: Fix sound underflow + tag name conflict + when rewriting of item nbt should occur

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/SoundMapping.java

@@ -39,6 +39,6 @@ public class SoundMapping {
     }
 
     public static int getOldSound(int newSound) {
-        return newSound >= sounds.length ? -1 : sounds[newSound];
+        return newSound < 0 || newSound >= sounds.length ? -1 : sounds[newSound];
     }
 }

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java

@@ -76,7 +76,7 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
 
     @Override
     protected void registerPackets(Protocol1_12_2To1_13 protocol) {
-        NBT_TAG_NAME = "ViaBackwards|" + protocol.getClass().getSimpleName();
+        NBT_TAG_NAME = "ViaBackwards|" + protocol.getClass().getSimpleName() + "|Part2";
         // Block Action
         protocol.out(State.PLAY, 0x0A, 0x0A, new PacketRemapper() {
             @Override
@@ -867,7 +867,6 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
 
     @Override
     protected Item handleItemToServer(Item item) {
-        item = super.handleItemToServer(item);
         if (item == null) return null;
         CompoundTag tag = item.getTag();
 
@@ -1095,6 +1094,7 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
 
         item.setId(MappingData.oldToNewItems.get(rawId).shortValue());
         item.setData((short) 0);
+        item = super.handleItemToServer(item);
         return item;
     }