diff --git a/mappings/net/minecraft/client/particle/IParticleFactory.mapping b/mappings/net/minecraft/client/particle/IParticleFactory.mapping
index 098b566278..257c8c8c60 100644
--- a/mappings/net/minecraft/client/particle/IParticleFactory.mapping
+++ b/mappings/net/minecraft/client/particle/IParticleFactory.mapping
@@ -1,6 +1,6 @@
 CLASS none/bnn net/minecraft/client/particle/IParticleFactory
 	METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-		ARG 0 particleId
+		ARG 0 id
 		ARG 1 world
 		ARG 2 x
 		ARG 3 y
diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping
index 4396786dfa..f75013af36 100644
--- a/mappings/net/minecraft/client/particle/Particle.mapping
+++ b/mappings/net/minecraft/client/particle/Particle.mapping
@@ -30,6 +30,7 @@ CLASS none/bnl net/minecraft/client/particle/Particle
 	FIELD t tileV I
 	FIELD w age I
 	FIELD x maxAge I
+	FIELD y size F
 	FIELD z gravityStrength F
 	METHOD <init> (Lnone/aiw;DDD)V
 		ARG 0 world
@@ -63,18 +64,22 @@ CLASS none/bnl net/minecraft/client/particle/Particle
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
 	METHOD a setSprite (Lnone/bxe;)V
-		ARG 0 sprite
+		ARG 0 value
 	METHOD b getParticleGroup ()I
 	METHOD b setPos (DDD)V
 		ARG 0 x
 		ARG 1 y
 		ARG 2 z
+	METHOD b setSpriteIndex (I)V
+		ARG 0 value
 	METHOD d getColorRed ()F
 	METHOD e getColorGreen ()F
 	METHOD e setAlpha (F)V
 		ARG 0 alpha
 	METHOD f getColorBlue ()F
+	METHOD h incSpriteIndex ()V
 	METHOD i markDead ()V
 	METHOD j repositionFromBoundingBox ()V
 	METHOD k isAlive ()Z
diff --git a/mappings/net/minecraft/client/particle/ParticleBarrier.mapping b/mappings/net/minecraft/client/particle/ParticleBarrier.mapping
index ab474fccc1..f3d48d61bb 100644
--- a/mappings/net/minecraft/client/particle/ParticleBarrier.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleBarrier.mapping
@@ -1,7 +1,7 @@
 CLASS none/bmq net/minecraft/client/particle/ParticleBarrier
 	CLASS none/bmq$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -10,7 +10,14 @@ CLASS none/bmq net/minecraft/client/particle/ParticleBarrier
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
+	METHOD <init> (Lnone/aiw;DDDLnone/aeq;)V
+		ARG 0 world
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+		ARG 4 item
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
 	METHOD b getParticleGroup ()I
diff --git a/mappings/net/minecraft/client/particle/ParticleBlockCrack.mapping b/mappings/net/minecraft/client/particle/ParticleBlockCrack.mapping
index 1100c18946..d92d686702 100644
--- a/mappings/net/minecraft/client/particle/ParticleBlockCrack.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleBlockCrack.mapping
@@ -1,7 +1,7 @@
 CLASS none/bnz net/minecraft/client/particle/ParticleBlockCrack
 	CLASS none/bnz$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -10,7 +10,24 @@ CLASS none/bnz net/minecraft/client/particle/ParticleBlockCrack
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
+	FIELD a block Lnone/asm;
+	FIELD b blockPos Lnone/cn;
+	METHOD <init> (Lnone/aiw;DDDDDDLnone/asm;)V
+		ARG 0 world
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+		ARG 4 velocityX
+		ARG 5 velocityY
+		ARG 6 velocityZ
+		ARG 7 block
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
+	METHOD a setBlockPos (Lnone/cn;)Lnone/bnz;
+		ARG 0 blockPos
 	METHOD b getParticleGroup ()I
+	METHOD b updateColor (Lnone/cn;)V
+		ARG 0 blockPos
+	METHOD m setBlockPosFromPosition ()Lnone/bnz;
diff --git a/mappings/net/minecraft/client/particle/ParticleBlockDust.mapping b/mappings/net/minecraft/client/particle/ParticleBlockDust.mapping
index 01c5bddc30..3818e664c4 100644
--- a/mappings/net/minecraft/client/particle/ParticleBlockDust.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleBlockDust.mapping
@@ -1,7 +1,7 @@
 CLASS none/bny net/minecraft/client/particle/ParticleBlockDust
 	CLASS none/bny$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
diff --git a/mappings/net/minecraft/client/particle/ParticleFallingDust.mapping b/mappings/net/minecraft/client/particle/ParticleBlockFallingDust.mapping
similarity index 58%
rename from mappings/net/minecraft/client/particle/ParticleFallingDust.mapping
rename to mappings/net/minecraft/client/particle/ParticleBlockFallingDust.mapping
index 0105279d58..3c467d592a 100644
--- a/mappings/net/minecraft/client/particle/ParticleFallingDust.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleBlockFallingDust.mapping
@@ -1,7 +1,7 @@
-CLASS none/bmz net/minecraft/client/particle/ParticleFallingDust
+CLASS none/bmz net/minecraft/client/particle/ParticleBlockFallingDust
 	CLASS none/bmz$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -10,7 +10,16 @@ CLASS none/bmz net/minecraft/client/particle/ParticleFallingDust
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
+	METHOD <init> (Lnone/aiw;DDDFFF)V
+		ARG 0 world
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+		ARG 4 red
+		ARG 5 green
+		ARG 6 blue
 	METHOD a update ()V
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
diff --git a/mappings/net/minecraft/client/particle/ParticleDrip.mapping b/mappings/net/minecraft/client/particle/ParticleBlockLeak.mapping
similarity index 64%
rename from mappings/net/minecraft/client/particle/ParticleDrip.mapping
rename to mappings/net/minecraft/client/particle/ParticleBlockLeak.mapping
index 244bf6b02f..26a6afd0b2 100644
--- a/mappings/net/minecraft/client/particle/ParticleDrip.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleBlockLeak.mapping
@@ -1,7 +1,7 @@
-CLASS none/bmv net/minecraft/client/particle/ParticleDrip
+CLASS none/bmv net/minecraft/client/particle/ParticleBlockLeak
 	CLASS none/bmv$a FactoryLava
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -12,7 +12,7 @@ CLASS none/bmv net/minecraft/client/particle/ParticleDrip
 			ARG 8 extra
 	CLASS none/bmv$b FactoryWater
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -21,4 +21,12 @@ CLASS none/bmv net/minecraft/client/particle/ParticleDrip
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
+	FIELD a material Lnone/ayr;
+	FIELD b slowedTimer I
+	METHOD <init> (Lnone/aiw;DDDLnone/ayr;)V
+		ARG 0 world
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+		ARG 4 material
 	METHOD a update ()V
diff --git a/mappings/net/minecraft/client/particle/ParticleCloud.mapping b/mappings/net/minecraft/client/particle/ParticleCloud.mapping
index 3dd5d9716d..12f0977eab 100644
--- a/mappings/net/minecraft/client/particle/ParticleCloud.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleCloud.mapping
@@ -1,7 +1,7 @@
 CLASS none/bno net/minecraft/client/particle/ParticleCloud
 	CLASS none/bno$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -14,3 +14,4 @@ CLASS none/bno net/minecraft/client/particle/ParticleCloud
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
diff --git a/mappings/net/minecraft/client/particle/ParticlePoof.mapping b/mappings/net/minecraft/client/particle/ParticleCrack.mapping
similarity index 57%
rename from mappings/net/minecraft/client/particle/ParticlePoof.mapping
rename to mappings/net/minecraft/client/particle/ParticleCrack.mapping
index 9d2f42d3b1..6a438208cd 100644
--- a/mappings/net/minecraft/client/particle/ParticlePoof.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleCrack.mapping
@@ -1,7 +1,7 @@
-CLASS none/bmr net/minecraft/client/particle/ParticlePoof
-	CLASS none/bmr$a FactoryIronCrack
+CLASS none/bmr net/minecraft/client/particle/ParticleCrack
+	CLASS none/bmr$a FactoryItem
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -12,7 +12,7 @@ CLASS none/bmr net/minecraft/client/particle/ParticlePoof
 			ARG 8 extra
 	CLASS none/bmr$b FactorySlime
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -23,7 +23,7 @@ CLASS none/bmr net/minecraft/client/particle/ParticlePoof
 			ARG 8 extra
 	CLASS none/bmr$c FactorySnowball
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -32,7 +32,31 @@ CLASS none/bmr net/minecraft/client/particle/ParticlePoof
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
+	METHOD <init> (Lnone/aiw;DDDDDDLnone/aeq;I)V
+		ARG 0 world
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+		ARG 4 velocityX
+		ARG 5 velocityY
+		ARG 6 velocityZ
+		ARG 7 item
+		ARG 8 meta
+	METHOD <init> (Lnone/aiw;DDDLnone/aeq;)V
+		ARG 0 world
+		ARG 1 rx
+		ARG 2 y
+		ARG 3 z
+		ARG 4 item
+	METHOD <init> (Lnone/aiw;DDDLnone/aeq;I)V
+		ARG 0 world
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+		ARG 4 item
+		ARG 5 meta
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
 	METHOD b getParticleGroup ()I
diff --git a/mappings/net/minecraft/client/particle/ParticleHitDamage.mapping b/mappings/net/minecraft/client/particle/ParticleDamage.mapping
similarity index 68%
rename from mappings/net/minecraft/client/particle/ParticleHitDamage.mapping
rename to mappings/net/minecraft/client/particle/ParticleDamage.mapping
index af5c140f22..939538227b 100644
--- a/mappings/net/minecraft/client/particle/ParticleHitDamage.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleDamage.mapping
@@ -1,7 +1,7 @@
-CLASS none/bmt net/minecraft/client/particle/ParticleHitDamage
-	CLASS none/bmt$a Factory
+CLASS none/bmt net/minecraft/client/particle/ParticleDamage
+	CLASS none/bmt$a FactoryDefault
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -10,9 +10,9 @@ CLASS none/bmt net/minecraft/client/particle/ParticleHitDamage
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
-	CLASS none/bmt$b FactoryMagicCrit
+	CLASS none/bmt$b FactoryCritMagic
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -23,7 +23,7 @@ CLASS none/bmt net/minecraft/client/particle/ParticleHitDamage
 			ARG 8 extra
 	CLASS none/bmt$c FactoryCrit
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -32,7 +32,16 @@ CLASS none/bmt net/minecraft/client/particle/ParticleHitDamage
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
+	METHOD <init> (Lnone/aiw;DDDDDDF)V
+		ARG 0 world
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+		ARG 4 velocityX
+		ARG 5 velocityY
+		ARG 6 velocityZ
 	METHOD a update ()V
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
diff --git a/mappings/net/minecraft/client/particle/ParticleDragonBreath.mapping b/mappings/net/minecraft/client/particle/ParticleDragonBreath.mapping
index 7f0aa8ea8e..e702fa2f39 100644
--- a/mappings/net/minecraft/client/particle/ParticleDragonBreath.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleDragonBreath.mapping
@@ -1,7 +1,7 @@
 CLASS none/bmu net/minecraft/client/particle/ParticleDragonBreath
 	CLASS none/bmu$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -14,3 +14,4 @@ CLASS none/bmu net/minecraft/client/particle/ParticleDragonBreath
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
diff --git a/mappings/net/minecraft/client/particle/PrticleElderGuardianAppearance.mapping b/mappings/net/minecraft/client/particle/ParticleElderGuardianAppearance.mapping
similarity index 77%
rename from mappings/net/minecraft/client/particle/PrticleElderGuardianAppearance.mapping
rename to mappings/net/minecraft/client/particle/ParticleElderGuardianAppearance.mapping
index bec133b6c6..ea05d6ca3c 100644
--- a/mappings/net/minecraft/client/particle/PrticleElderGuardianAppearance.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleElderGuardianAppearance.mapping
@@ -1,7 +1,7 @@
-CLASS none/bnj net/minecraft/client/particle/PrticleElderGuardianAppearance
+CLASS none/bnj net/minecraft/client/particle/ParticleElderGuardianAppearance
 	CLASS none/bnj$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -15,4 +15,5 @@ CLASS none/bnj net/minecraft/client/particle/PrticleElderGuardianAppearance
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
 	METHOD b getParticleGroup ()I
diff --git a/mappings/none/bnd.mapping b/mappings/net/minecraft/client/particle/ParticleEmotion.mapping
similarity index 73%
rename from mappings/none/bnd.mapping
rename to mappings/net/minecraft/client/particle/ParticleEmotion.mapping
index b606db3ab2..d360b378eb 100644
--- a/mappings/none/bnd.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleEmotion.mapping
@@ -1,7 +1,7 @@
-CLASS none/bnd
-	CLASS none/bnd$a FactoryAngryVillager
+CLASS none/bnd net/minecraft/client/particle/ParticleEmotion
+	CLASS none/bnd$a FactoryAngry
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -10,9 +10,9 @@ CLASS none/bnd
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
-	CLASS none/bnd$b FactoryRedHeart
+	CLASS none/bnd$b FactoryLove
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -25,3 +25,4 @@ CLASS none/bnd
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
diff --git a/mappings/net/minecraft/client/particle/ParticleEnchantGlyph.mapping b/mappings/net/minecraft/client/particle/ParticleEnchantGlyph.mapping
index 81b0e54c11..0558162a0d 100644
--- a/mappings/net/minecraft/client/particle/ParticleEnchantGlyph.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleEnchantGlyph.mapping
@@ -1,7 +1,7 @@
 CLASS none/bmw net/minecraft/client/particle/ParticleEnchantGlyph
 	CLASS none/bmw$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -10,6 +10,9 @@ CLASS none/bmw net/minecraft/client/particle/ParticleEnchantGlyph
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
+	FIELD L startY D
+	FIELD M startZ D
+	FIELD b startX D
 	METHOD a update ()V
 	METHOD a addPos (DDD)V
 		ARG 0 dx
diff --git a/mappings/net/minecraft/client/particle/ParticleEndRod.mapping b/mappings/net/minecraft/client/particle/ParticleEndRod.mapping
index d35cf9d73e..9f94e8e29c 100644
--- a/mappings/net/minecraft/client/particle/ParticleEndRod.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleEndRod.mapping
@@ -1,7 +1,7 @@
 CLASS none/bmx net/minecraft/client/particle/ParticleEndRod
 	CLASS none/bmx$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
diff --git a/mappings/net/minecraft/client/particle/ParticleHugeExplosion.mapping b/mappings/net/minecraft/client/particle/ParticleExplosionHuge.mapping
similarity index 72%
rename from mappings/net/minecraft/client/particle/ParticleHugeExplosion.mapping
rename to mappings/net/minecraft/client/particle/ParticleExplosionHuge.mapping
index 273c23c76b..f3c2279c31 100644
--- a/mappings/net/minecraft/client/particle/ParticleHugeExplosion.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleExplosionHuge.mapping
@@ -1,7 +1,7 @@
-CLASS none/bnf net/minecraft/client/particle/ParticleHugeExplosion
+CLASS none/bnf net/minecraft/client/particle/ParticleExplosionHuge
 	CLASS none/bnf$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -10,8 +10,11 @@ CLASS none/bnf net/minecraft/client/particle/ParticleHugeExplosion
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
+	FIELD a age_ I
+	FIELD b maxAge_ I
 	METHOD a update ()V
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
 	METHOD b getParticleGroup ()I
diff --git a/mappings/net/minecraft/client/particle/ParticleExplosionLarge.mapping b/mappings/net/minecraft/client/particle/ParticleExplosionLarge.mapping
new file mode 100644
index 0000000000..5b9ca006d7
--- /dev/null
+++ b/mappings/net/minecraft/client/particle/ParticleExplosionLarge.mapping
@@ -0,0 +1,28 @@
+CLASS none/bne net/minecraft/client/particle/ParticleExplosionLarge
+	CLASS none/bne$a Factory
+		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
+			ARG 0 id
+			ARG 1 world
+			ARG 2 x
+			ARG 3 y
+			ARG 4 z
+			ARG 5 velocityX
+			ARG 6 velocityY
+			ARG 7 velocityZ
+			ARG 8 extra
+	FIELD L age_ I
+	FIELD M maxAge_ I
+	FIELD N textureManager Lnone/bxf;
+	FIELD a TEX Lnone/kp;
+	METHOD <init> (Lnone/bxf;Lnone/aiw;DDDDDD)V
+		ARG 0 textureManager
+		ARG 1 world
+		ARG 2 x
+		ARG 3 y
+		ARG 4 rz
+	METHOD a update ()V
+	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
+		ARG 0 vertexBuffer
+		ARG 1 entity
+		ARG 2 deltaTicks
+	METHOD b getParticleGroup ()I
diff --git a/mappings/net/minecraft/client/particle/ParticleExplosionSmoke.mapping b/mappings/net/minecraft/client/particle/ParticleExplosionSmoke.mapping
index 1083ab96a6..48382e1818 100644
--- a/mappings/net/minecraft/client/particle/ParticleExplosionSmoke.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleExplosionSmoke.mapping
@@ -1,7 +1,7 @@
 CLASS none/bmy net/minecraft/client/particle/ParticleExplosionSmoke
 	CLASS none/bmy$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
diff --git a/mappings/net/minecraft/client/particle/ParticleLargeExplosion.mapping b/mappings/net/minecraft/client/particle/ParticleFireSmoke.mapping
similarity index 53%
rename from mappings/net/minecraft/client/particle/ParticleLargeExplosion.mapping
rename to mappings/net/minecraft/client/particle/ParticleFireSmoke.mapping
index 26bb22c64b..d0f142d993 100644
--- a/mappings/net/minecraft/client/particle/ParticleLargeExplosion.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleFireSmoke.mapping
@@ -1,7 +1,7 @@
-CLASS none/bne net/minecraft/client/particle/ParticleLargeExplosion
-	CLASS none/bne$a Factory
+CLASS none/bns net/minecraft/client/particle/ParticleFireSmoke
+	CLASS none/bns$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -10,8 +10,16 @@ CLASS none/bne net/minecraft/client/particle/ParticleLargeExplosion
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
+	METHOD <init> (Lnone/aiw;DDDDDDF)V
+		ARG 0 world
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+		ARG 4 velocityX
+		ARG 5 velocityY
+		ARG 6 velocityZ
 	METHOD a update ()V
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
-	METHOD b getParticleGroup ()I
+		ARG 2 deltaTicks
diff --git a/mappings/net/minecraft/client/particle/ParticleLargeSmoke.mapping b/mappings/net/minecraft/client/particle/ParticleFireSmokeLarge.mapping
similarity index 70%
rename from mappings/net/minecraft/client/particle/ParticleLargeSmoke.mapping
rename to mappings/net/minecraft/client/particle/ParticleFireSmokeLarge.mapping
index 4c539811cd..902a3923db 100644
--- a/mappings/net/minecraft/client/particle/ParticleLargeSmoke.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleFireSmokeLarge.mapping
@@ -1,7 +1,7 @@
-CLASS none/bnh net/minecraft/client/particle/ParticleLargeSmoke
+CLASS none/bnh net/minecraft/client/particle/ParticleFireSmokeLarge
 	CLASS none/bnh$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
diff --git a/mappings/net/minecraft/client/particle/ParticleFireworksSpark.mapping b/mappings/net/minecraft/client/particle/ParticleFireworksSpark.mapping
index bc7a137d7f..bdf3ca824a 100644
--- a/mappings/net/minecraft/client/particle/ParticleFireworksSpark.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleFireworksSpark.mapping
@@ -3,20 +3,23 @@ CLASS none/bna net/minecraft/client/particle/ParticleFireworksSpark
 		METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 			ARG 0 vertexBuffer
 			ARG 1 entity
+			ARG 2 deltaTicks
 	CLASS none/bna$b
 		METHOD a update ()V
 		METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 			ARG 0 vertexBuffer
 			ARG 1 entity
+			ARG 2 deltaTicks
 	CLASS none/bna$c
 		METHOD a update ()V
 		METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 			ARG 0 vertexBuffer
 			ARG 1 entity
+			ARG 2 deltaTicks
 		METHOD b getParticleGroup ()I
 	CLASS none/bna$d Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
diff --git a/mappings/net/minecraft/client/particle/ParticleWake.mapping b/mappings/net/minecraft/client/particle/ParticleFishing.mapping
similarity index 74%
rename from mappings/net/minecraft/client/particle/ParticleWake.mapping
rename to mappings/net/minecraft/client/particle/ParticleFishing.mapping
index f79a265554..4d175925ac 100644
--- a/mappings/net/minecraft/client/particle/ParticleWake.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleFishing.mapping
@@ -1,7 +1,7 @@
-CLASS none/bob net/minecraft/client/particle/ParticleWake
+CLASS none/bob net/minecraft/client/particle/ParticleFishing
 	CLASS none/bob$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
diff --git a/mappings/net/minecraft/client/particle/ParticleFlame.mapping b/mappings/net/minecraft/client/particle/ParticleFlame.mapping
index 4da90fbc86..c05dc05dcc 100644
--- a/mappings/net/minecraft/client/particle/ParticleFlame.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleFlame.mapping
@@ -1,7 +1,7 @@
 CLASS none/bnb net/minecraft/client/particle/ParticleFlame
 	CLASS none/bnb$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -18,3 +18,4 @@ CLASS none/bnb net/minecraft/client/particle/ParticleFlame
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
diff --git a/mappings/net/minecraft/client/particle/ParticleFootstep.mapping b/mappings/net/minecraft/client/particle/ParticleFootstep.mapping
index b613eaefaa..0ddafc2eb6 100644
--- a/mappings/net/minecraft/client/particle/ParticleFootstep.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleFootstep.mapping
@@ -1,7 +1,7 @@
 CLASS none/bnc net/minecraft/client/particle/ParticleFootstep
 	CLASS none/bnc$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -10,8 +10,19 @@ CLASS none/bnc net/minecraft/client/particle/ParticleFootstep
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
+	FIELD L maxAge_ I
+	FIELD M textureManager Lnone/bxf;
+	FIELD a TEX Lnone/kp;
+	FIELD b age_ I
+	METHOD <init> (Lnone/bxf;Lnone/aiw;DDD)V
+		ARG 0 textureManager
+		ARG 1 world
+		ARG 2 x
+		ARG 3 y
+		ARG 4 z
 	METHOD a update ()V
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
 	METHOD b getParticleGroup ()I
diff --git a/mappings/none/bng.mapping b/mappings/net/minecraft/client/particle/ParticleItemPickup.mapping
similarity index 62%
rename from mappings/none/bng.mapping
rename to mappings/net/minecraft/client/particle/ParticleItemPickup.mapping
index 6811fc2ca7..d2a5960fef 100644
--- a/mappings/none/bng.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleItemPickup.mapping
@@ -1,6 +1,7 @@
-CLASS none/bng
+CLASS none/bng net/minecraft/client/particle/ParticleItemPickup
 	METHOD a update ()V
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
 	METHOD b getParticleGroup ()I
diff --git a/mappings/net/minecraft/client/particle/ParticleLava.mapping b/mappings/net/minecraft/client/particle/ParticleLavaEmber.mapping
similarity index 76%
rename from mappings/net/minecraft/client/particle/ParticleLava.mapping
rename to mappings/net/minecraft/client/particle/ParticleLavaEmber.mapping
index 4b66daa35e..1857ae69bc 100644
--- a/mappings/net/minecraft/client/particle/ParticleLava.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleLavaEmber.mapping
@@ -1,7 +1,7 @@
-CLASS none/bni net/minecraft/client/particle/ParticleLava
+CLASS none/bni net/minecraft/client/particle/ParticleLavaEmber
 	CLASS none/bni$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -14,3 +14,4 @@ CLASS none/bni net/minecraft/client/particle/ParticleLava
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping
index 134665cd99..c59c19f2cc 100644
--- a/mappings/net/minecraft/client/particle/ParticleManager.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping
@@ -17,11 +17,11 @@ CLASS none/bnm net/minecraft/client/particle/ParticleManager
 	METHOD <init> (Lnone/aiw;Lnone/bxf;)V
 		ARG 0 world
 		ARG 1 textureManager
-	METHOD a tickParticles ()V
+	METHOD a updateParticles ()V
 	METHOD a updateParticleGroup (I)V
 		ARG 0 groupId
 	METHOD a createParticle (IDDDDDD[I)Lnone/bnl;
-		ARG 0 particleId
+		ARG 0 id
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
diff --git a/mappings/net/minecraft/client/particle/ParticleNote.mapping b/mappings/net/minecraft/client/particle/ParticleNote.mapping
index 1ff2ffb081..0cd76878bf 100644
--- a/mappings/net/minecraft/client/particle/ParticleNote.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleNote.mapping
@@ -1,7 +1,7 @@
 CLASS none/bnk net/minecraft/client/particle/ParticleNote
 	CLASS none/bnk$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -10,7 +10,14 @@ CLASS none/bnk net/minecraft/client/particle/ParticleNote
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
+	METHOD <init> (Lnone/aiw;DDDDDDF)V
+		ARG 0 world
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+		ARG 4 hue
 	METHOD a update ()V
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
diff --git a/mappings/net/minecraft/client/particle/ParticlePortal.mapping b/mappings/net/minecraft/client/particle/ParticlePortal.mapping
index c61bf214ae..6040691a7b 100644
--- a/mappings/net/minecraft/client/particle/ParticlePortal.mapping
+++ b/mappings/net/minecraft/client/particle/ParticlePortal.mapping
@@ -1,7 +1,7 @@
 CLASS none/bnp net/minecraft/client/particle/ParticlePortal
 	CLASS none/bnp$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -10,6 +10,9 @@ CLASS none/bnp net/minecraft/client/particle/ParticlePortal
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
+	FIELD L startY D
+	FIELD M startZ D
+	FIELD b startX D
 	METHOD a update ()V
 	METHOD a addPos (DDD)V
 		ARG 0 dx
@@ -18,3 +21,4 @@ CLASS none/bnp net/minecraft/client/particle/ParticlePortal
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
diff --git a/mappings/net/minecraft/client/particle/ParticleDroplet.mapping b/mappings/net/minecraft/client/particle/ParticleRainSplash.mapping
similarity index 73%
rename from mappings/net/minecraft/client/particle/ParticleDroplet.mapping
rename to mappings/net/minecraft/client/particle/ParticleRainSplash.mapping
index 67f6a9a462..668ae7fbba 100644
--- a/mappings/net/minecraft/client/particle/ParticleDroplet.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleRainSplash.mapping
@@ -1,7 +1,7 @@
-CLASS none/boc net/minecraft/client/particle/ParticleDroplet
+CLASS none/boc net/minecraft/client/particle/ParticleRainSplash
 	CLASS none/boc$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
diff --git a/mappings/net/minecraft/client/particle/ParticleRedDust.mapping b/mappings/net/minecraft/client/particle/ParticleRedDust.mapping
index a94d0c4292..36ddcf318a 100644
--- a/mappings/net/minecraft/client/particle/ParticleRedDust.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleRedDust.mapping
@@ -1,7 +1,7 @@
 CLASS none/bnq net/minecraft/client/particle/ParticleRedDust
 	CLASS none/bnq$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -10,7 +10,24 @@ CLASS none/bnq net/minecraft/client/particle/ParticleRedDust
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
+	METHOD <init> (Lnone/aiw;DDDFFF)V
+		ARG 0 world
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+		ARG 4 red
+		ARG 5 green
+		ARG 6 blue
+	METHOD <init> (Lnone/aiw;DDDFFFF)V
+		ARG 0 world
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
+		ARG 5 red
+		ARG 6 green
+		ARG 7 blue
 	METHOD a update ()V
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
diff --git a/mappings/net/minecraft/client/particle/ParticleSmoke.mapping b/mappings/net/minecraft/client/particle/ParticleSnowGolem.mapping
similarity index 70%
rename from mappings/net/minecraft/client/particle/ParticleSmoke.mapping
rename to mappings/net/minecraft/client/particle/ParticleSnowGolem.mapping
index 258e521e9e..5745dc66ac 100644
--- a/mappings/net/minecraft/client/particle/ParticleSmoke.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleSnowGolem.mapping
@@ -1,7 +1,7 @@
-CLASS none/bns net/minecraft/client/particle/ParticleSmoke
-	CLASS none/bns$a Factory
+CLASS none/bnt net/minecraft/client/particle/ParticleSnowGolem
+	CLASS none/bnt$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -14,3 +14,4 @@ CLASS none/bns net/minecraft/client/particle/ParticleSmoke
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
diff --git a/mappings/none/bnx.mapping b/mappings/net/minecraft/client/particle/ParticleSomething.mapping
similarity index 73%
rename from mappings/none/bnx.mapping
rename to mappings/net/minecraft/client/particle/ParticleSomething.mapping
index a20cabbddb..d7c7ede3d6 100644
--- a/mappings/none/bnx.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleSomething.mapping
@@ -1,7 +1,7 @@
-CLASS none/bnx
-	CLASS none/bnx$a
+CLASS none/bnx net/minecraft/client/particle/ParticleSomething
+	CLASS none/bnx$a FactoryHappy
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -10,9 +10,9 @@ CLASS none/bnx
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
-	CLASS none/bnx$b
+	CLASS none/bnx$b FactorySomething
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
diff --git a/mappings/net/minecraft/client/particle/ParticleSpell.mapping b/mappings/net/minecraft/client/particle/ParticleSpell.mapping
index a9918c2b7e..a8750ed61a 100644
--- a/mappings/net/minecraft/client/particle/ParticleSpell.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleSpell.mapping
@@ -1,7 +1,7 @@
 CLASS none/bnu net/minecraft/client/particle/ParticleSpell
 	CLASS none/bnu$a FactoryMobAmbient
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -12,7 +12,7 @@ CLASS none/bnu net/minecraft/client/particle/ParticleSpell
 			ARG 8 extra
 	CLASS none/bnu$b FactoryInstant
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -23,7 +23,7 @@ CLASS none/bnu net/minecraft/client/particle/ParticleSpell
 			ARG 8 extra
 	CLASS none/bnu$c FactoryMob
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -32,9 +32,9 @@ CLASS none/bnu net/minecraft/client/particle/ParticleSpell
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
-	CLASS none/bnu$d Factory
+	CLASS none/bnu$d FactoryDefault
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -43,9 +43,9 @@ CLASS none/bnu net/minecraft/client/particle/ParticleSpell
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
-	CLASS none/bnu$e FactoryWitchMagic
+	CLASS none/bnu$e FactoryWitch
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -54,4 +54,5 @@ CLASS none/bnu net/minecraft/client/particle/ParticleSpell
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
+	FIELD a RAND Ljava/util/Random;
 	METHOD a update ()V
diff --git a/mappings/net/minecraft/client/particle/ParticleSweepAttack.mapping b/mappings/net/minecraft/client/particle/ParticleSweepAttack.mapping
index ae52e4cdd2..ebba0a218f 100644
--- a/mappings/net/minecraft/client/particle/ParticleSweepAttack.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleSweepAttack.mapping
@@ -1,7 +1,7 @@
 CLASS none/bmp net/minecraft/client/particle/ParticleSweepAttack
 	CLASS none/bmp$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
@@ -10,8 +10,19 @@ CLASS none/bmp net/minecraft/client/particle/ParticleSweepAttack
 			ARG 6 velocityY
 			ARG 7 velocityZ
 			ARG 8 extra
+	FIELD L age_ I
+	FIELD M maxAge_ I
+	FIELD N textureManager Lnone/bxf;
+	FIELD a TEX Lnone/kp;
+	METHOD <init> (Lnone/bxf;Lnone/aiw;DDDDDD)V
+		ARG 0 textureManager
+		ARG 1 world
+		ARG 2 x
+		ARG 3 y
+		ARG 4 z
 	METHOD a update ()V
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
 	METHOD b getParticleGroup ()I
diff --git a/mappings/net/minecraft/client/particle/ParticleBubble.mapping b/mappings/net/minecraft/client/particle/ParticleWaterBubble.mapping
similarity index 73%
rename from mappings/net/minecraft/client/particle/ParticleBubble.mapping
rename to mappings/net/minecraft/client/particle/ParticleWaterBubble.mapping
index 685fa0140d..1469146eaa 100644
--- a/mappings/net/minecraft/client/particle/ParticleBubble.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleWaterBubble.mapping
@@ -1,7 +1,7 @@
-CLASS none/bms net/minecraft/client/particle/ParticleBubble
+CLASS none/bms net/minecraft/client/particle/ParticleWaterBubble
 	CLASS none/bms$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
diff --git a/mappings/net/minecraft/client/particle/ParticleSplash.mapping b/mappings/net/minecraft/client/particle/ParticleWaterSplash.mapping
similarity index 71%
rename from mappings/net/minecraft/client/particle/ParticleSplash.mapping
rename to mappings/net/minecraft/client/particle/ParticleWaterSplash.mapping
index 5be55eafd2..7fc2aface0 100644
--- a/mappings/net/minecraft/client/particle/ParticleSplash.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleWaterSplash.mapping
@@ -1,7 +1,7 @@
-CLASS none/bnv net/minecraft/client/particle/ParticleSplash
+CLASS none/bnv net/minecraft/client/particle/ParticleWaterSplash
 	CLASS none/bnv$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
diff --git a/mappings/net/minecraft/client/particle/ParticleSuspend.mapping b/mappings/net/minecraft/client/particle/ParticleWaterSuspend.mapping
similarity index 73%
rename from mappings/net/minecraft/client/particle/ParticleSuspend.mapping
rename to mappings/net/minecraft/client/particle/ParticleWaterSuspend.mapping
index 8fd018f388..b68415cf1a 100644
--- a/mappings/net/minecraft/client/particle/ParticleSuspend.mapping
+++ b/mappings/net/minecraft/client/particle/ParticleWaterSuspend.mapping
@@ -1,7 +1,7 @@
-CLASS none/bnw net/minecraft/client/particle/ParticleSuspend
+CLASS none/bnw net/minecraft/client/particle/ParticleWaterSuspend
 	CLASS none/bnw$a Factory
 		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
+			ARG 0 id
 			ARG 1 world
 			ARG 2 x
 			ARG 3 y
diff --git a/mappings/net/minecraft/particle/ParticleType.mapping b/mappings/net/minecraft/particle/ParticleType.mapping
index b70ff39143..ba77213fbd 100644
--- a/mappings/net/minecraft/particle/ParticleType.mapping
+++ b/mappings/net/minecraft/particle/ParticleType.mapping
@@ -1,57 +1,57 @@
 CLASS none/dd net/minecraft/particle/ParticleType
 	FIELD A FLAME Lnone/dd;
-	FIELD B LAVA Lnone/dd;
+	FIELD B LAVA_EMBER Lnone/dd;
 	FIELD C FOOTSTEP Lnone/dd;
 	FIELD D CLOUD Lnone/dd;
-	FIELD E REDDUST Lnone/dd;
-	FIELD F SNOWBALL_POOF Lnone/dd;
-	FIELD G SNOW_SHOVEL Lnone/dd;
+	FIELD E RED_DUST Lnone/dd;
+	FIELD F SNOWBALL Lnone/dd;
+	FIELD G SNOW_GOLEM Lnone/dd;
 	FIELD H SLIME Lnone/dd;
-	FIELD I HEART Lnone/dd;
+	FIELD I EMOTION_LOVE Lnone/dd;
 	FIELD J BARRIER Lnone/dd;
-	FIELD K ICON_CRACK Lnone/dd;
+	FIELD K ITEM_CRACK Lnone/dd;
 	FIELD L BLOCK_CRACK Lnone/dd;
 	FIELD M BLOCK_DUST Lnone/dd;
-	FIELD N DROPLET Lnone/dd;
+	FIELD N RAIN_SPLASH Lnone/dd;
 	FIELD O TAKE Lnone/dd;
-	FIELD P MOB_APPEARANCE Lnone/dd;
+	FIELD P ELDER_GUARDIAN_APPEARNCE Lnone/dd;
 	FIELD Q DRAGON_BREATH Lnone/dd;
 	FIELD R END_ROD Lnone/dd;
-	FIELD S DAMAGE_INDICATOR Lnone/dd;
+	FIELD S DAMAGE Lnone/dd;
 	FIELD T SWEEP_ATTACK Lnone/dd;
-	FIELD U FALLING_DUST Lnone/dd;
+	FIELD U BLOCK_FALLING_DUST Lnone/dd;
 	FIELD V name Ljava/lang/String;
 	FIELD W id I
 	FIELD X ignoreRange Z
 	FIELD Y argCount I
 	FIELD Z ID_MAP Ljava/util/Map;
-	FIELD a EXPLODE Lnone/dd;
+	FIELD a EXPLOSION_SMOKE Lnone/dd;
 	FIELD aa NAME_MAP Ljava/util/Map;
-	FIELD b LARGE_EXPLODE Lnone/dd;
-	FIELD c HUGE_EXPLOSION Lnone/dd;
+	FIELD b EXPLOSION_LARGE Lnone/dd;
+	FIELD c EXPLOSION_HUGE Lnone/dd;
 	FIELD d FIREWORKS_SPARK Lnone/dd;
-	FIELD e BUBBLE Lnone/dd;
-	FIELD f SPLASH Lnone/dd;
-	FIELD g WAKE Lnone/dd;
-	FIELD h SUSPEND Lnone/dd;
+	FIELD e WATER_BUBBLE Lnone/dd;
+	FIELD f WATER_SPLASH Lnone/dd;
+	FIELD g FISHING Lnone/dd;
+	FIELD h WATER_SUSPEND Lnone/dd;
 	FIELD i DEPTH_SUSPEND Lnone/dd;
-	FIELD j CRIT Lnone/dd;
-	FIELD k MAGIC_CRIT Lnone/dd;
-	FIELD l SMOKE Lnone/dd;
-	FIELD m LARGE_SMOKE Lnone/dd;
+	FIELD j DAMAGE_CRIT Lnone/dd;
+	FIELD k DAMAGE_CRIT_MAGIC Lnone/dd;
+	FIELD l FIRE_SMOKE Lnone/dd;
+	FIELD m FIRE_SMOKE_LARGE Lnone/dd;
 	FIELD n SPELL Lnone/dd;
-	FIELD o INSTANT_SPELL Lnone/dd;
-	FIELD p MOB_SPELL Lnone/dd;
-	FIELD q MOB_SPELL_AMBIENT Lnone/dd;
-	FIELD r WITCH_MAGIC Lnone/dd;
-	FIELD s DRIP_WATER Lnone/dd;
-	FIELD t DRIP_LAVA Lnone/dd;
-	FIELD u ANGRY_VILLAGER Lnone/dd;
-	FIELD v HAPPY_VILLAGER Lnone/dd;
+	FIELD o SPELL_INSTANT Lnone/dd;
+	FIELD p SPELL_MOB Lnone/dd;
+	FIELD q SPELL_MOB_AMBIENT Lnone/dd;
+	FIELD r SPELL_WITCH Lnone/dd;
+	FIELD s WATER_LEAK Lnone/dd;
+	FIELD t LAVA_LEAK Lnone/dd;
+	FIELD u EMOTION_ANGRY Lnone/dd;
+	FIELD v EMOTION_HAPPY Lnone/dd;
 	FIELD w TOWN_AURA Lnone/dd;
 	FIELD x NOTE Lnone/dd;
 	FIELD y PORTAL Lnone/dd;
-	FIELD z ENCHANTMENT_TABLE Lnone/dd;
+	FIELD z ENCHANT_GLYPH Lnone/dd;
 	METHOD <init> (Ljava/lang/String;ILjava/lang/String;IZ)V
 		ARG 3 name
 		ARG 4 id
diff --git a/mappings/none/bnr.mapping b/mappings/none/bnr.mapping
index 4349842a03..7d76cf94af 100644
--- a/mappings/none/bnr.mapping
+++ b/mappings/none/bnr.mapping
@@ -1,2 +1,15 @@
 CLASS none/bnr
+	FIELD M targetColorRed F
+	FIELD N targetColorGreen F
+	FIELD O targetColorBlue F
+	FIELD P changesColor Z
+	METHOD <init> (Lnone/aiw;DDDIIF)V
+		ARG 0 world
+		ARG 1 x
+		ARG 2 y
+		ARG 3 z
 	METHOD a update ()V
+	METHOD c setColor (I)V
+		ARG 0 color
+	METHOD d setTargetColor (I)V
+		ARG 0 color
diff --git a/mappings/none/bnt.mapping b/mappings/none/bnt.mapping
deleted file mode 100644
index 158e31c3b4..0000000000
--- a/mappings/none/bnt.mapping
+++ /dev/null
@@ -1,16 +0,0 @@
-CLASS none/bnt
-	CLASS none/bnt$a
-		METHOD a createParticle (ILnone/aiw;DDDDDD[I)Lnone/bnl;
-			ARG 0 particleId
-			ARG 1 world
-			ARG 2 x
-			ARG 3 y
-			ARG 4 z
-			ARG 5 velocityX
-			ARG 6 velocityY
-			ARG 7 velocityZ
-			ARG 8 extra
-	METHOD a update ()V
-	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
-		ARG 0 vertexBuffer
-		ARG 1 entity
diff --git a/mappings/none/boa.mapping b/mappings/none/boa.mapping
index 6a51c49fcc..0fd51bf8e0 100644
--- a/mappings/none/boa.mapping
+++ b/mappings/none/boa.mapping
@@ -3,4 +3,5 @@ CLASS none/boa
 	METHOD a buildGeometry (Lnone/bon;Lnone/sg;FFFFFF)V
 		ARG 0 vertexBuffer
 		ARG 1 entity
+		ARG 2 deltaTicks
 	METHOD b getParticleGroup ()I