From 6c49c0b2d366f941c3536a7de9d3ff21f91e3ef0 Mon Sep 17 00:00:00 2001
From: Matsv <mats@matsv.nl>
Date: Sat, 16 Mar 2019 16:43:46 +0100
Subject: [PATCH 1/2] :sparkles: Fix paintings

---
 .../data/PaintingMapping.java                 | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/PaintingMapping.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/PaintingMapping.java
index 578ed5f9..0a591996 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/PaintingMapping.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/PaintingMapping.java
@@ -7,32 +7,32 @@ public class PaintingMapping {
     private static Map<Integer, String> paintings = new HashMap<>();
 
     public static void init() {
-        add("kebab");
-        add("aztec");
-        add("alban");
-        add("aztec2");
-        add("bomb");
-        add("plant");
-        add("wasteland");
-        add("pool");
-        add("courbet");
-        add("sea");
-        add("sunset");
-        add("creebet");
-        add("wanderer");
-        add("graham");
-        add("match");
-        add("bust");
-        add("stage");
-        add("void");
-        add("skullandroses");
-        add("wither");
-        add("fighters");
-        add("pointer");
-        add("pigscene");
-        add("burningskull");
-        add("skeleton");
-        add("donkeykong");
+        add("Kebab");
+        add("Aztec");
+        add("Alban");
+        add("Aztec2");
+        add("Bomb");
+        add("Plant");
+        add("Wasteland");
+        add("Pool");
+        add("Courbet");
+        add("Sea");
+        add("Sunset");
+        add("Creebet");
+        add("Wanderer");
+        add("Graham");
+        add("Match");
+        add("Bust");
+        add("Stage");
+        add("Void");
+        add("SkullAndRoses");
+        add("Wither");
+        add("Fighters");
+        add("Pointer");
+        add("Pigscene");
+        add("BurningSkull");
+        add("Skeleton");
+        add("DonkeyKong");
     }
 
     private static void add(String motive) {

From b8c87cfa2eeba95939ec8027aed107d72a3de599 Mon Sep 17 00:00:00 2001
From: creeper123123321 <creeper123123321@gmail.com>
Date: Sat, 16 Mar 2019 17:29:23 -0300
Subject: [PATCH 2/2] Fix wrong position remappings

---
 .../packets/BlockItemPackets1_14.java                     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java
index 5aebf719..c5d7b9fa 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java
@@ -352,7 +352,7 @@ public class BlockItemPackets1_14 extends BlockItemRewriter<Protocol1_13_2To1_14
         protocol.registerOutgoing(State.PLAY, 0x0A, 0x0A, new PacketRemapper() {
             @Override
             public void registerMap() {
-                map(Type.POSITION, Type.POSITION1_14); // Location
+                map(Type.POSITION1_14, Type.POSITION); // Location
                 map(Type.UNSIGNED_BYTE); // Action id
                 map(Type.UNSIGNED_BYTE); // Action param
                 map(Type.VAR_INT); // Block id - /!\ NOT BLOCK STATE
@@ -369,7 +369,7 @@ public class BlockItemPackets1_14 extends BlockItemRewriter<Protocol1_13_2To1_14
         protocol.registerOutgoing(State.PLAY, 0xB, 0xB, new PacketRemapper() {
             @Override
             public void registerMap() {
-                map(Type.POSITION, Type.POSITION1_14);
+                map(Type.POSITION1_14, Type.POSITION);
                 map(Type.VAR_INT);
                 handler(new PacketHandler() {
                     @Override
@@ -435,7 +435,7 @@ public class BlockItemPackets1_14 extends BlockItemRewriter<Protocol1_13_2To1_14
             @Override
             public void registerMap() {
                 map(Type.INT); // Effect Id
-                map(Type.POSITION, Type.POSITION1_14); // Location
+                map(Type.POSITION1_14, Type.POSITION); // Location
                 map(Type.INT); // Data
                 handler(new PacketHandler() {
                     @Override
@@ -514,7 +514,7 @@ public class BlockItemPackets1_14 extends BlockItemRewriter<Protocol1_13_2To1_14
         protocol.registerOutgoing(State.PLAY, 0x49, 0x49, new PacketRemapper() {
             @Override
             public void registerMap() {
-                map(Type.POSITION, Type.POSITION1_14);
+                map(Type.POSITION1_14, Type.POSITION);
             }
         });
     }