Merge branch 'dev' of https://github.com/Matsv/ViaBackwards into 1.13_items

# Conflicts:
#	core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java

core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java

@@ -12,10 +12,10 @@ package nl.matsv.viabackwards.api;
 
 import nl.matsv.viabackwards.ViaBackwards;
 import nl.matsv.viabackwards.protocol.protocol1_10to1_11.Protocol1_10To1_11;
+import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12;
 import nl.matsv.viabackwards.protocol.protocol1_11to1_11_1.Protocol1_11To1_11_1;
 import nl.matsv.viabackwards.protocol.protocol1_12_1to1_12_2.Protocol1_12_1To1_12_2;
 import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.Protocol1_12_2To1_13;
-import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.Protocol1_11_1To1_12;
 import nl.matsv.viabackwards.protocol.protocol1_12to1_12_1.Protocol1_12To1_12_1;
 import nl.matsv.viabackwards.protocol.protocol1_13_1to1_13_2.Protocol1_13_1To1_13_2;
 import nl.matsv.viabackwards.protocol.protocol1_13to1_13_1.Protocol1_13To1_13_1;

core/src/main/java/nl/matsv/viabackwards/api/rewriters/BlockItemRewriter.java

@@ -17,7 +17,7 @@ import lombok.ToString;
 import net.md_5.bungee.api.ChatColor;
 import nl.matsv.viabackwards.api.BackwardsProtocol;
 import nl.matsv.viabackwards.api.entities.blockitem.BlockItemSettings;
-import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data.BlockColors;
+import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data.BlockColors;
 import nl.matsv.viabackwards.utils.Block;
 import nl.matsv.viabackwards.utils.ItemUtil;
 import us.myles.ViaVersion.api.minecraft.chunks.Chunk;

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java

@@ -18,7 +18,7 @@ import nl.matsv.viabackwards.protocol.protocol1_10to1_11.EntityTypeNames;
 import nl.matsv.viabackwards.protocol.protocol1_10to1_11.Protocol1_10To1_11;
 import nl.matsv.viabackwards.protocol.protocol1_10to1_11.storage.ChestedHorseStorage;
 import nl.matsv.viabackwards.protocol.protocol1_10to1_11.storage.WindowTracker;
-import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data.BlockColors;
+import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data.BlockColors;
 import nl.matsv.viabackwards.utils.Block;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.data.UserConnection;

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java

@@ -8,13 +8,13 @@
  * 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.
  */
 
-package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1;
+package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12;
 
 import lombok.Getter;
 import nl.matsv.viabackwards.api.BackwardsProtocol;
 import nl.matsv.viabackwards.api.entities.storage.EntityTracker;
-import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data.ShoulderTracker;
+import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data.ShoulderTracker;
-import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.packets.*;
+import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.packets.*;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/AdvancementTranslations.java

@@ -8,7 +8,7 @@
  * 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.
  */
 
-package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data;
+package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/BlockColors.java

@@ -8,7 +8,7 @@
  * 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.
  */
 
-package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data;
+package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/MapColorMapping.java

@@ -1,4 +1,4 @@
-package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data;
+package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data;
 
 import java.util.HashMap;
 import java.util.Map;

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ParrotStorage.java

@@ -8,7 +8,7 @@
  * 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.
  */
 
-package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data;
+package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data;
 
 import lombok.Data;
 import nl.matsv.viabackwards.api.entities.storage.EntityStorage;

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java

@@ -8,7 +8,7 @@
  * 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.
  */
 
-package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data;
+package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data;
 
 import lombok.Getter;
 import lombok.Setter;

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java

@@ -8,12 +8,12 @@
  * 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.
  */
 
-package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.packets;
+package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.packets;
 
 import nl.matsv.viabackwards.api.rewriters.BlockItemRewriter;
-import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.Protocol1_11_1To1_12;
+import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12;
-import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data.BlockColors;
+import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data.BlockColors;
-import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data.MapColorMapping;
+import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data.MapColorMapping;
 import nl.matsv.viabackwards.utils.Block;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.minecraft.BlockChangeRecord;

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChangedPacketIds1_12.java

@@ -8,10 +8,10 @@
  * 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.
  */
 
-package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.packets;
+package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.packets;
 
 import nl.matsv.viabackwards.api.rewriters.Rewriter;
-import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.Protocol1_11_1To1_12;
+import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.remapper.PacketHandler;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatPackets1_12.java

@@ -8,12 +8,12 @@
  * 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.
  */
 
-package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.packets;
+package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.packets;
 
 import nl.matsv.viabackwards.ViaBackwards;
 import nl.matsv.viabackwards.api.rewriters.Rewriter;
-import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.Protocol1_11_1To1_12;
+import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12;
-import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data.AdvancementTranslations;
+import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data.AdvancementTranslations;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.api.remapper.PacketHandler;

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java

@@ -8,7 +8,7 @@
  * 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.
  */
 
-package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.packets;
+package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.packets;
 
 import nl.matsv.viabackwards.ViaBackwards;
 import nl.matsv.viabackwards.api.entities.storage.EntityData;
@@ -17,9 +17,9 @@ import nl.matsv.viabackwards.api.entities.types.AbstractEntityType;
 import nl.matsv.viabackwards.api.entities.types.EntityType1_12;
 import nl.matsv.viabackwards.api.exceptions.RemovedValueException;
 import nl.matsv.viabackwards.api.rewriters.EntityRewriter;
-import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.Protocol1_11_1To1_12;
+import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12;
-import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data.ParrotStorage;
+import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data.ParrotStorage;
-import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.data.ShoulderTracker;
+import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data.ShoulderTracker;
 import nl.matsv.viabackwards.utils.Block;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.Via;

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/SoundPackets1_12.java

@@ -8,10 +8,10 @@
  * 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.
  */
 
-package nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.packets;
+package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.packets;
 
 import nl.matsv.viabackwards.api.rewriters.SoundRewriter;
-import nl.matsv.viabackwards.protocol.protocol1_12to1_11_1.Protocol1_11_1To1_12;
+import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.remapper.PacketHandler;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;

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

@@ -15,20 +15,20 @@ import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.packets.InventoryPackets;
 
 public class PlayerPacket1_13 extends Rewriter<Protocol1_12_2To1_13> {
-	@Override
+    @Override
-	protected void registerPackets(Protocol1_12_2To1_13 protocol) {
+    protected void registerPackets(Protocol1_12_2To1_13 protocol) {
 
-		//Plugin Message
+        //Plugin Message
-		protocol.out(State.PLAY, 0x19, 0x18, new PacketRemapper() {
+        protocol.out(State.PLAY, 0x19, 0x18, new PacketRemapper() {
-			@Override
+            @Override
-			public void registerMap() {
+            public void registerMap() {
-				handler(new PacketHandler() {
+                handler(new PacketHandler() {
-					@Override
+                    @Override
-					public void handle(PacketWrapper wrapper) throws Exception {
+                    public void handle(PacketWrapper wrapper) throws Exception {
-						String channel = wrapper.read(Type.STRING);
+                        String channel = wrapper.read(Type.STRING);
-						if (channel.equals("minecraft:trader_list")) {
+                        if (channel.equals("minecraft:trader_list")) {
-							wrapper.write(Type.STRING, "MC|TrList");
+                            wrapper.write(Type.STRING, "MC|TrList");
-							wrapper.passthrough(Type.INT); //Passthrough Window ID
+                            wrapper.passthrough(Type.INT); //Passthrough Window ID
 
 							int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
 							for (int i = 0; i < size; i++) {
@@ -46,109 +46,109 @@ public class PlayerPacket1_13 extends Rewriter<Protocol1_12_2To1_13> {
 									wrapper.write(Type.ITEM, getProtocol().getBlockItemPackets().handleItemToClient(second));
 								}
 
-								wrapper.passthrough(Type.BOOLEAN); //Trade disabled
+                                wrapper.passthrough(Type.BOOLEAN); //Trade disabled
-								wrapper.passthrough(Type.INT); //Number of tools uses
+                                wrapper.passthrough(Type.INT); //Number of tools uses
-								wrapper.passthrough(Type.INT); //Maximum number of trade uses
+                                wrapper.passthrough(Type.INT); //Maximum number of trade uses
-							}
+                            }
-						} else {
+                        } else {
-							String oldChannel = InventoryPackets.getOldPluginChannelId(channel);
+                            String oldChannel = InventoryPackets.getOldPluginChannelId(channel);
-							if (oldChannel == null) {
+                            if (oldChannel == null) {
-								ViaBackwards.getPlatform().getLogger().warning("Could not find old channel for " + channel);
+                                ViaBackwards.getPlatform().getLogger().warning("Could not find old channel for " + channel);
-								wrapper.cancel();
+                                wrapper.cancel();
-								return;
+                                return;
-							}
+                            }
-							wrapper.write(Type.STRING, oldChannel);
+                            wrapper.write(Type.STRING, oldChannel);
-						}
+                        }
-					}
+                    }
-				});
+                });
-			}
+            }
-		});
+        });
 
-		//Scoreboard Objective
+        //Scoreboard Objective
-		protocol.out(State.PLAY, 0x45, 0x42, new PacketRemapper() {
+        protocol.out(State.PLAY, 0x45, 0x42, new PacketRemapper() {
-			@Override
+            @Override
-			public void registerMap() {
+            public void registerMap() {
-				map(Type.STRING);
+                map(Type.STRING);
-				map(Type.BYTE);
+                map(Type.BYTE);
-				handler(new PacketHandler() {
+                handler(new PacketHandler() {
-					@Override
+                    @Override
-					public void handle(PacketWrapper wrapper) throws Exception {
+                    public void handle(PacketWrapper wrapper) throws Exception {
-						byte mode = wrapper.get(Type.BYTE, 0);
+                        byte mode = wrapper.get(Type.BYTE, 0);
-						if (mode == 0 || mode == 2) {
+                        if (mode == 0 || mode == 2) {
-							String value = wrapper.read(Type.STRING);
+                            String value = wrapper.read(Type.STRING);
-							value = ChatRewriter.jsonTextToLegacy(value);
+                            value = ChatRewriter.jsonTextToLegacy(value);
-							if (value.length() > 32) value = value.substring(0, 32);
+                            if (value.length() > 32) value = value.substring(0, 32);
-							wrapper.write(Type.STRING, value);
+                            wrapper.write(Type.STRING, value);
-							int type = wrapper.read(Type.VAR_INT);
+                            int type = wrapper.read(Type.VAR_INT);
-							wrapper.write(Type.STRING, type == 1 ? "hearts" : "integer");
+                            wrapper.write(Type.STRING, type == 1 ? "hearts" : "integer");
-						}
+                        }
-					}
+                    }
-				});
+                });
-			}
+            }
-		});
+        });
 
-		//Teams
+        //Teams
-		protocol.out(State.PLAY, 0x47, 0x44, new PacketRemapper() {
+        protocol.out(State.PLAY, 0x47, 0x44, new PacketRemapper() {
-			@Override
+            @Override
-			public void registerMap() {
+            public void registerMap() {
-				map(Type.STRING);
+                map(Type.STRING);
-				map(Type.BYTE);
+                map(Type.BYTE);
-				handler(new PacketHandler() {
+                handler(new PacketHandler() {
-					@Override
+                    @Override
-					public void handle(PacketWrapper wrapper) throws Exception {
+                    public void handle(PacketWrapper wrapper) throws Exception {
-						byte action = wrapper.get(Type.BYTE, 0);
+                        byte action = wrapper.get(Type.BYTE, 0);
-						if (action == 0 || action == 2) {
+                        if (action == 0 || action == 2) {
-							String displayName = wrapper.read(Type.STRING);
+                            String displayName = wrapper.read(Type.STRING);
-							displayName = ChatRewriter.jsonTextToLegacy(displayName);
+                            displayName = ChatRewriter.jsonTextToLegacy(displayName);
-							displayName = ChatUtil.removeUnusedColor(displayName, 'f');
+                            displayName = ChatUtil.removeUnusedColor(displayName, 'f');
-							if (displayName.length() > 32) displayName = displayName.substring(0, 32);
+                            if (displayName.length() > 32) displayName = displayName.substring(0, 32);
-							wrapper.write(Type.STRING, displayName);
+                            wrapper.write(Type.STRING, displayName);
 
-							byte flags = wrapper.read(Type.BYTE);
+                            byte flags = wrapper.read(Type.BYTE);
-							String nameTagVisibility = wrapper.read(Type.STRING);
+                            String nameTagVisibility = wrapper.read(Type.STRING);
-							String collisionRule = wrapper.read(Type.STRING);
+                            String collisionRule = wrapper.read(Type.STRING);
 
-							int colour = wrapper.read(Type.VAR_INT);
+                            int colour = wrapper.read(Type.VAR_INT);
-							if (colour == 21) {
+                            if (colour == 21) {
-								colour = -1;
+                                colour = -1;
-							}
+                            }
 
-							//TODO team color/prefix handling changed from 1.12.2 to 1.13 and to 1.13.1 again afaik
+                            //TODO team color/prefix handling changed from 1.12.2 to 1.13 and to 1.13.1 again afaik
-							String prefix = wrapper.read(Type.STRING);
+                            String prefix = wrapper.read(Type.STRING);
-							String suffix = wrapper.read(Type.STRING);
+                            String suffix = wrapper.read(Type.STRING);
-							prefix = prefix == null || prefix.equals("null") ? "" : ChatRewriter.jsonTextToLegacy(prefix);
+                            prefix = prefix == null || prefix.equals("null") ? "" : ChatRewriter.jsonTextToLegacy(prefix);
-							prefix += "§" + (colour > -1 && colour <= 15 ? Integer.toHexString(colour) : "r");
+                            prefix += "§" + (colour > -1 && colour <= 15 ? Integer.toHexString(colour) : "r");
-							prefix = ChatUtil.removeUnusedColor(prefix, 'f', true);
+                            prefix = ChatUtil.removeUnusedColor(prefix, 'f', true);
-							if (prefix.length() > 16) prefix = prefix.substring(0, 16);
+                            if (prefix.length() > 16) prefix = prefix.substring(0, 16);
-							if (prefix.endsWith("§")) prefix = prefix.substring(0, prefix.length() - 1);
+                            if (prefix.endsWith("§")) prefix = prefix.substring(0, prefix.length() - 1);
-							suffix = suffix == null || suffix.equals("null") ? "" : ChatRewriter.jsonTextToLegacy(suffix);
+                            suffix = suffix == null || suffix.equals("null") ? "" : ChatRewriter.jsonTextToLegacy(suffix);
-							suffix = ChatUtil.removeUnusedColor(suffix, 'f');
+                            suffix = ChatUtil.removeUnusedColor(suffix, 'f');
-							if (suffix.endsWith("§")) suffix = suffix.substring(0, suffix.length() - 1);
+                            if (suffix.endsWith("§")) suffix = suffix.substring(0, suffix.length() - 1);
-							wrapper.write(Type.STRING, prefix);
+                            wrapper.write(Type.STRING, prefix);
-							wrapper.write(Type.STRING, suffix);
+                            wrapper.write(Type.STRING, suffix);
 
-							wrapper.write(Type.BYTE, flags);
+                            wrapper.write(Type.BYTE, flags);
-							wrapper.write(Type.STRING, nameTagVisibility);
+                            wrapper.write(Type.STRING, nameTagVisibility);
-							wrapper.write(Type.STRING, collisionRule);
+                            wrapper.write(Type.STRING, collisionRule);
 
-							wrapper.write(Type.BYTE, (byte) colour);
+                            wrapper.write(Type.BYTE, (byte) colour);
-						}
+                        }
 
-						if (action == 0 || action == 3 || action == 4) {
+                        if (action == 0 || action == 3 || action == 4) {
-							wrapper.passthrough(Type.STRING_ARRAY); //Entities
+                            wrapper.passthrough(Type.STRING_ARRAY); //Entities
-						}
+                        }
-					}
+                    }
-				});
+                });
-			}
+            }
-		});
+        });
 
         // Tab-Complete (clientbound) TODO MODIFIED
         protocol.out(State.PLAY, 0x10, 0x0E, new PacketRemapper() {
             @Override
-			public void registerMap() {
+            public void registerMap() {
-				handler(new PacketHandler() {
+                handler(new PacketHandler() {
-					@Override
+                    @Override
-					public void handle(PacketWrapper wrapper) throws Exception {
+                    public void handle(PacketWrapper wrapper) throws Exception {
                         int key = wrapper.read(Type.VAR_INT);
                         int start = wrapper.read(Type.VAR_INT);
                         int length = wrapper.read(Type.VAR_INT);
@@ -160,10 +160,10 @@ public class PlayerPacket1_13 extends Rewriter<Protocol1_12_2To1_13> {
                             // Ignore tooltip
 	                        if (wrapper.read(Type.BOOLEAN)) wrapper.read(Type.STRING);
                         }
-					}
+                    }
-				});
+                });
-			}
+            }
-		});
+        });
 
         // Tab-Complete (serverbound)
         protocol.in(State.PLAY, 0x05, 0x01, new PacketRemapper() {
@@ -186,7 +186,7 @@ public class PlayerPacket1_13 extends Rewriter<Protocol1_12_2To1_13> {
                         // Ignore fields
                         wrapper.read(Type.BOOLEAN);
                         if (wrapper.read(Type.BOOLEAN)) {
-	                        wrapper.read(Type.POSITION);
+                            wrapper.read(Type.POSITION);
                         }
                     }
                 });
@@ -296,8 +296,8 @@ public class PlayerPacket1_13 extends Rewriter<Protocol1_12_2To1_13> {
         });
     }
 
-	@Override
+    @Override
-	protected void registerRewrites() {
+    protected void registerRewrites() {
 
-	}
+    }
 }

core/src/main/java/nl/matsv/viabackwards/utils/ChatUtil.java

@@ -3,30 +3,30 @@ package nl.matsv.viabackwards.utils;
 import java.util.regex.Pattern;
 
 public class ChatUtil {
-	private static final Pattern UNUSED_COLOR_PATTERN = Pattern.compile("(?>(?>§[0-fk-or])*(§r|\\Z))|(?>(?>§[0-f])*(§[0-f]))");
+    private static final Pattern UNUSED_COLOR_PATTERN = Pattern.compile("(?>(?>§[0-fk-or])*(§r|\\Z))|(?>(?>§[0-f])*(§[0-f]))");
-	private static final Pattern UNUSED_COLOR_PATTERN_PREFIX = Pattern.compile("(?>(?>§[0-fk-or])*(§r))|(?>(?>§[0-f])*(§[0-f]))");
+    private static final Pattern UNUSED_COLOR_PATTERN_PREFIX = Pattern.compile("(?>(?>§[0-fk-or])*(§r))|(?>(?>§[0-f])*(§[0-f]))");
 
-	public static String removeUnusedColor(String legacy, char defaultColor) {
+    public static String removeUnusedColor(String legacy, char defaultColor) {
-		return removeUnusedColor(legacy, defaultColor, false);
+        return removeUnusedColor(legacy, defaultColor, false);
-	}
+    }
 
-	public static String removeUnusedColor(String legacy, char defaultColor, boolean isPrefix) {
+    public static String removeUnusedColor(String legacy, char defaultColor, boolean isPrefix) {
-		if (legacy == null) return null;
+        if (legacy == null) return null;
-		Pattern pattern = isPrefix ? UNUSED_COLOR_PATTERN_PREFIX : UNUSED_COLOR_PATTERN;
+        Pattern pattern = isPrefix ? UNUSED_COLOR_PATTERN_PREFIX : UNUSED_COLOR_PATTERN;
-		legacy = pattern.matcher(legacy).replaceAll("$1$2");
+        legacy = pattern.matcher(legacy).replaceAll("$1$2");
-		StringBuilder builder = new StringBuilder();
+        StringBuilder builder = new StringBuilder();
-		char last = defaultColor;
+        char last = defaultColor;
-		for (int i = 0; i < legacy.length(); i++) {
+        for (int i = 0; i < legacy.length(); i++) {
-			char current = legacy.charAt(i);
+            char current = legacy.charAt(i);
-			if (current != '§' || i == legacy.length() - 1) {
+            if (current != '§' || i == legacy.length() - 1) {
-				builder.append(current);
+                builder.append(current);
-				continue;
+                continue;
-			}
+            }
-			current = legacy.charAt(++i);
+            current = legacy.charAt(++i);
-			if (current == last) continue;
+            if (current == last) continue;
-			builder.append('§').append(current);
+            builder.append('§').append(current);
-			last = current;
+            last = current;
-		}
+        }
-		return builder.toString();
+        return builder.toString();
-	}
+    }
 }