Add getSpawnParticleHandler method to ItemRewriter

common/src/main/java/us/myles/ViaVersion/api/rewriters/ItemRewriter.java

@@ -205,7 +205,13 @@ public class ItemRewriter {
                 map(Type.FLOAT); // 7 - Offset Z
                 map(Type.FLOAT); // 8 - Particle Data
                 map(Type.INT); // 9 - Particle Count
-                handler(wrapper -> {
+                handler(getSpawnParticleHandler(itemType, coordType));
+            }
+        });
+    }
+
+    public PacketHandler getSpawnParticleHandler(Type<Item> itemType, Type<?> coordType) {
+        return wrapper -> {
             int id = wrapper.get(Type.INT, 0);
             if (id == -1) return;
 
@@ -221,9 +227,7 @@ public class ItemRewriter {
             if (newId != id) {
                 wrapper.set(Type.INT, 0, newId);
             }
-                });
-            }
-        });
+        };
     }
 
     // Only sent to the client

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/packets/EntityPackets.java

@@ -43,8 +43,8 @@ public class EntityPackets {
                 dimensionName = "minecraft:overworld";
         }
 
-        wrapper.write(Type.STRING, dimensionName); // dimension type
         wrapper.write(Type.STRING, dimensionName); // dimension
+        wrapper.write(Type.STRING, dimensionName); // world
     };
     public static final CompoundTag DIMENSIONS_TAG = new CompoundTag("");
     private static final String[] WORLD_NAMES = {"minecraft:overworld", "minecraft:the_nether", "minecraft:the_end"};