Merge branch 'master' into dev

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

@@ -297,9 +297,7 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<Protocol1_10To1_11>
             Metadata data = e.getData();
             data.setId(13);
             data.setMetaType(MetaType1_9.VarInt);
-
-            data.setValue((int) data.getValue() == 1 ? 2 : 4);
-
+            data.setValue(((Number) data.getValue()).intValue() == 1 ? 2 : 4);
             return data;
         });
 

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

@@ -39,9 +39,13 @@ public class ParticleMapping {
 
                 int type = blockType >> 4;
                 int meta = blockType & 15;
-
                 return new int[]{type + (meta << 12)};
             }
+
+            @Override
+            public boolean isBlockHandler() {
+                return true;
+            }
         };
 
         particles = new ParticleData[]{
@@ -148,11 +152,15 @@ public class ParticleMapping {
         return new ParticleData(replacementId, handler);
     }
 
-    interface ParticleHandler {
+    public interface ParticleHandler {
 
         int[] rewrite(Protocol1_12_2To1_13 protocol, PacketWrapper wrapper) throws Exception;
 
         int[] rewrite(Protocol1_12_2To1_13 protocol, List<Particle.ParticleData> data);
+
+        default boolean isBlockHandler() {
+            return false;
+        }
     }
 
     public static final class ParticleData {

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

@@ -382,6 +382,11 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
             int secondArg = 0;
             int[] particleArgs = data.rewriteMeta(protocol, particle.getArguments());
             if (particleArgs != null && particleArgs.length != 0) {
+                if (data.getHandler().isBlockHandler() && particleArgs[0] == 0) {
+                    // Air doesn't have a break particle for sub 1.13 clients -> glass pane
+                    particleArgs[0] = 102;
+                }
+
                 firstArg = particleArgs[0];
                 secondArg = particleArgs.length == 2 ? particleArgs[1] : 0;
             }

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

@@ -139,10 +139,17 @@ public class PlayerPacket1_13 extends Rewriter<Protocol1_12_2To1_13> {
 
                         int[] data = old.rewriteData(protocol, wrapper);
                         if (data != null) {
-                            for (int i : data)
+                            if (old.getHandler().isBlockHandler() && data[0] == 0) {
+                                // Cancel air block particles
+                                wrapper.cancel();
+                                return;
+                            }
+
+                            for (int i : data) {
                                 wrapper.write(Type.VAR_INT, i);
                             }
                         }
+                    }
                 });
             }
         });