FIx issues (#680)

* FIx misnamed things

* Game options and mysterious setblockstate boolean

* a

* Remove duplicate class, remove enum constant from Unit

mappings/net/minecraft/block/Block.mapping

@@ -19,15 +19,15 @@ CLASS bml net/minecraft/block/Block
 		FIELD f resistance F
 		FIELD g hardness F
 		FIELD h randomTicks Z
-		FIELD i friction F
+		FIELD i slipperiness F
 		FIELD j dropTableId Lqs;
 		FIELD k dynamicBounds Z
 		METHOD <init> (Lcld;Lcle;)V
 			ARG 1 material
 			ARG 2 materialColor
 		METHOD a noCollision ()Lbml$c;
-		METHOD a friction (F)Lbml$c;
+		METHOD a slipperiness (F)Lbml$c;
-			ARG 1 friction
+			ARG 1 slipperiness
 		METHOD a strength (FF)Lbml$c;
 			ARG 1 hardness
 			ARG 2 resistance
@@ -56,7 +56,7 @@ CLASS bml net/minecraft/block/Block
 	FIELD a FACINGS [Lfa;
 	FIELD b SOLID_MEDIUM_SQUARE_SHAPE Lcsp;
 	FIELD c SOLID_SMALL_SQUARE_SHAPE Lcsp;
-	FIELD d friction F
+	FIELD d slipperiness F
 	FIELD e defaultState Lbvj;
 	FIELD f dynamicBounds Z
 	FIELD g dropTableId Lqs;
@@ -240,6 +240,7 @@ CLASS bml net/minecraft/block/Block
 		ARG 3 pos
 		ARG 4 block
 		ARG 5 neighborPos
+		ARG 6 moved
 	METHOD a dropStacks (Lbvj;Lbhh;Lev;Lbtm;)V
 		ARG 0 state
 		ARG 1 world
@@ -288,7 +289,7 @@ CLASS bml net/minecraft/block/Block
 		ARG 2 world
 		ARG 3 pos
 		ARG 4 flags
-	METHOD a skipRenderingSide (Lbvj;Lbvj;Lfa;)Z
+	METHOD a isSideInvisible (Lbvj;Lbvj;Lfa;)Z
 		ARG 1 state
 		ARG 2 neighbor
 		ARG 3 facing
@@ -461,7 +462,7 @@ CLASS bml net/minecraft/block/Block
 		ARG 1 state
 		ARG 2 view
 		ARG 3 blockPos
-	METHOD m getFrictionCoefficient ()F
+	METHOD m getSlipperiness ()F
 	METHOD m hasRandomTicks (Lbvj;)Z
 		ARG 1 state
 	METHOD n getStateFactory ()Lbvk;

mappings/net/minecraft/block/BlockState.mapping

@@ -84,6 +84,7 @@ CLASS bvj net/minecraft/block/BlockState
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 oldState
+		ARG 4 moved
 	METHOD a scheduledTick (Lbhh;Lev;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 pos
@@ -99,7 +100,7 @@ CLASS bvj net/minecraft/block/BlockState
 		ARG 1 mirror
 	METHOD a rotate (Lbqw;)Lbvj;
 		ARG 1 rotation
-	METHOD a skipRenderingSide (Lbvj;Lfa;)Z
+	METHOD a isSideInvisible (Lbvj;Lfa;)Z
 		ARG 1 neighbor
 		ARG 2 facing
 	METHOD a getDroppedStacks (Lcol$a;)Ljava/util/List;
@@ -137,6 +138,7 @@ CLASS bvj net/minecraft/block/BlockState
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 newState
+		ARG 4 moved
 	METHOD b onRandomTick (Lbhh;Lev;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/client/audio/EntityTrackingSoundInstance.mapping

@@ -1,2 +0,0 @@
-CLASS dwm net/minecraft/client/audio/EntityTrackingSoundInstance
-	FIELD o entity Laif;

mappings/net/minecraft/client/audio/GuardianAttackSoundInstance.mapping

@@ -1,2 +0,0 @@
-CLASS dwn net/minecraft/client/audio/GuardianAttackSoundInstance
-	FIELD o guardian Lauf;

mappings/net/minecraft/client/audio/RidingMinecartSoundInstance.mapping

@@ -1,3 +0,0 @@
-CLASS dwo net/minecraft/client/audio/RidingMinecartSoundInstance
-	FIELD o minecart Laxl;
-	FIELD p distance F

mappings/net/minecraft/client/audio/TickableSoundInstance.mapping

@@ -1,3 +0,0 @@
-CLASS dwv net/minecraft/client/audio/TickableSoundInstance
-	METHOD n isDone ()Z
-	METHOD o tick ()V

mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping

@@ -9,7 +9,7 @@ CLASS dhi net/minecraft/client/network/ClientPlayNetworkHandler
 	FIELD i advancementHandler Ldhf;
 	FIELD j commandSource Ldhj;
 	FIELD k tagManager Lzd;
-	FIELD l queryHandler Lcvb;
+	FIELD l dataQueryHandler Lcvb;
 	FIELD m chunkLoadDistance I
 	FIELD n random Ljava/util/Random;
 	FIELD o commandDispatcher Lcom/mojang/brigadier/CommandDispatcher;
@@ -34,5 +34,5 @@ CLASS dhi net/minecraft/client/network/ClientPlayNetworkHandler
 	METHOD h getCommandDispatcher ()Lcom/mojang/brigadier/CommandDispatcher;
 	METHOD i getWorld ()Ldhl;
 	METHOD j getTagManager ()Lzd;
-	METHOD k getQueryHandler ()Lcvb;
+	METHOD k getDataQueryHandler ()Lcvb;
 	METHOD l getSessionId ()Ljava/util/UUID;

mappings/net/minecraft/client/network/DataQueryHandler.mapping

@@ -1,4 +1,4 @@
-CLASS cvb net/minecraft/client/network/QueryHandler
+CLASS cvb net/minecraft/client/network/DataQueryHandler
 	FIELD a networkHandler Ldhi;
 	FIELD b expectedTransactionId I
 	FIELD c queryConsumer Ljava/util/function/Consumer;

mappings/net/minecraft/client/network/DebugRendererInfoManager.mapping

@@ -6,6 +6,6 @@ CLASS np net/minecraft/client/network/DebugRendererInfoManager
 		ARG 1 mob
 		ARG 2 goalSelector
 	METHOD a sendPathfindingData (Lbhh;Laip;Lcng;F)V
-	METHOD a sendBlockUpdate (Lbhh;Lev;)V
+	METHOD a sendNeighborUpdate (Lbhh;Lev;)V
 	METHOD a sendStructureStart (Lbhi;Lcil;)V
 	METHOD c sendPointOfInterest (Lvg;Lev;)V

mappings/net/minecraft/client/options/BooleanOption.mapping

@@ -1,4 +1,4 @@
-CLASS cuw net/minecraft/client/options/BooleanGameOption
+CLASS cuw net/minecraft/client/options/BooleanOption
 	FIELD Q getter Ljava/util/function/Predicate;
 	FIELD R setter Ljava/util/function/BiConsumer;
 	METHOD <init> (Ljava/lang/String;Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V

mappings/net/minecraft/client/options/CyclingOption.mapping

@@ -0,0 +1,12 @@
+CLASS cva net/minecraft/client/options/CyclingOption
+	FIELD Q setter Ljava/util/function/BiConsumer;
+	FIELD R messageProvider Ljava/util/function/BiFunction;
+	METHOD <init> (Ljava/lang/String;Ljava/util/function/BiConsumer;Ljava/util/function/BiFunction;)V
+		ARG 1 key
+		ARG 2 setter
+		ARG 3 messageProvider
+	METHOD a cycle (Lcvm;I)V
+		ARG 1 options
+		ARG 2 amount
+	METHOD c getMessage (Lcvm;)Ljava/lang/String;
+		ARG 1 options

mappings/net/minecraft/client/options/DoubleOption.mapping

@@ -1,4 +1,4 @@
-CLASS cvo net/minecraft/client/options/DoubleGameOption
+CLASS cvo net/minecraft/client/options/DoubleOption
 	FIELD Q interval F
 	FIELD R min D
 	FIELD S max D

mappings/net/minecraft/client/options/LogarithmicGameOption.mapping

@@ -1 +0,0 @@
-CLASS cvh net/minecraft/client/options/LogarithmicGameOption

mappings/net/minecraft/client/options/LogarithmicOption.mapping

@@ -0,0 +1 @@
+CLASS cvh net/minecraft/client/options/LogarithmicOption

mappings/net/minecraft/client/options/Option.mapping

@@ -1,4 +1,4 @@
-CLASS cvl net/minecraft/client/options/GameOption
+CLASS cvl net/minecraft/client/options/Option
 	FIELD A AUTO_SUGGESTIONS Lcuw;
 	FIELD B CHAT_COLOR Lcuw;
 	FIELD C CHAT_LINKS Lcuw;
@@ -45,7 +45,7 @@ CLASS cvl net/minecraft/client/options/GameOption
 	METHOD <init> (Ljava/lang/String;)V
 		ARG 1 key
 	METHOD a getDisplayPrefix ()Ljava/lang/String;
-	METHOD a createOptionButton (Lcvm;III)Lcwm;
+	METHOD a createButton (Lcvm;III)Lcwm;
 		ARG 1 options
 		ARG 2 x
 		ARG 3 y

mappings/net/minecraft/client/options/StringGameOption.mapping

@@ -1,11 +0,0 @@
-CLASS cva net/minecraft/client/options/StringGameOption
-	FIELD Q getter Ljava/util/function/BiConsumer;
-	FIELD R setter Ljava/util/function/BiFunction;
-	METHOD <init> (Ljava/lang/String;Ljava/util/function/BiConsumer;Ljava/util/function/BiFunction;)V
-		ARG 1 key
-		ARG 2 getter
-		ARG 3 setter
-	METHOD a (Lcvm;I)V
-		ARG 1 options
-	METHOD c get (Lcvm;)Ljava/lang/String;
-		ARG 1 options

mappings/net/minecraft/client/particle/Particle.mapping

@@ -42,7 +42,7 @@ CLASS dit net/minecraft/client/particle/Particle
 		ARG 8 velocityX
 		ARG 10 velocityY
 		ARG 12 velocityZ
-	METHOD a update ()V
+	METHOD a tick ()V
 	METHOD a move (DDD)V
 		ARG 1 dx
 		ARG 3 dy
@@ -61,7 +61,7 @@ CLASS dit net/minecraft/client/particle/Particle
 		ARG 1 bufferBuilder
 		ARG 2 camera
 		ARG 3 tickDelta
-	METHOD b getTextureSheet ()Ldix;
+	METHOD b getType ()Ldix;
 	METHOD b setPos (DDD)V
 		ARG 1 x
 		ARG 3 y

mappings/net/minecraft/client/particle/ParticleManager.mapping

@@ -4,7 +4,8 @@ CLASS div net/minecraft/client/particle/ParticleManager
 		METHOD a setSprites (Ljava/util/List;)V
 			ARG 1 sprites
 	FIELD a world Lbhh;
-	FIELD c particleQueues Ljava/util/Map;
+	FIELD b PARTICLE_TEXTURE_SHEETS Ljava/util/List;
+	FIELD c particles Ljava/util/Map;
 	FIELD d newEmitterParticles Ljava/util/Queue;
 	FIELD e textureManager Lduh;
 	FIELD f random Ljava/util/Random;
@@ -43,7 +44,7 @@ CLASS div net/minecraft/client/particle/ParticleManager
 	METHOD a registerFactory (Lge;Ldiw;)V
 		ARG 1 type
 		ARG 2 factory
-	METHOD a updateParticleQueue (Ljava/util/Collection;)V
+	METHOD a tickParticles (Ljava/util/Collection;)V
 	METHOD a (Lwz$a;Lxe;Lage;Lage;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 helper
 		ARG 3 prepareProfiler
@@ -51,7 +52,7 @@ CLASS div net/minecraft/client/particle/ParticleManager
 		ARG 5 prepareExecutor
 		ARG 6 applyExecutor
 	METHOD b tick ()V
-	METHOD b updateParticle (Ldit;)V
+	METHOD b tickParticle (Ldit;)V
 	METHOD b createParticle (Lgd;DDDDDD)Ldit;
 		ARG 1 parameters
 		ARG 2 x

mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping

@@ -1,4 +1,4 @@
-CLASS dwh net/minecraft/client/audio/AbstractSoundInstance
+CLASS dwh net/minecraft/client/sound/AbstractSoundInstance
 	FIELD a sound Ldwr;
 	FIELD b category Lyl;
 	FIELD c id Lqs;

mappings/net/minecraft/client/sound/AlUtil.mapping

@@ -1,4 +1,4 @@
-CLASS ctg net/minecraft/client/audio/AlUtil
+CLASS ctg net/minecraft/client/sound/AlUtil
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	METHOD a getErrorMessage (I)Ljava/lang/String;
 		ARG 0 errorCode

mappings/net/minecraft/client/sound/AmbientSoundLoops.mapping

@@ -1,4 +1,4 @@
-CLASS dwx net/minecraft/client/audio/AmbientSoundLoops
+CLASS dwx net/minecraft/client/sound/AmbientSoundLoops
 	CLASS dwx$a MusicLoop
 		FIELD o player Ldjv;
 		METHOD <init> (Ldjv;Lyj;)V

mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping

@@ -1,4 +1,4 @@
-CLASS dww net/minecraft/client/audio/AmbientSoundPlayer
+CLASS dww net/minecraft/client/sound/AmbientSoundPlayer
 	FIELD a player Ldjv;
 	FIELD b soundManager Ldxu;
 	FIELD c ticksUntilPlay I

mappings/net/minecraft/client/sound/AudioStream.mapping

@@ -1,3 +1,3 @@
-CLASS dxn net/minecraft/client/audio/AudioStream
+CLASS dxn net/minecraft/client/sound/AudioStream
 	METHOD a getFormat ()Ljavax/sound/sampled/AudioFormat;
 	METHOD b getBuffer ()Ljava/nio/ByteBuffer;

mappings/net/minecraft/client/sound/BubbleColumnSoundPlayer.mapping

@@ -1,4 +1,4 @@
-CLASS dwk net/minecraft/client/audio/BubbleColumnSoundPlayer
+CLASS dwk net/minecraft/client/sound/BubbleColumnSoundPlayer
 	FIELD a player Ldjv;
 	FIELD b hasPlayedForCurrentColumn Z
 	FIELD c firstTick Z

mappings/net/minecraft/client/sound/Channel.mapping

@@ -1,4 +1,4 @@
-CLASS dxo net/minecraft/client/audio/Channel
+CLASS dxo net/minecraft/client/sound/Channel
 	CLASS dxo$a SourceManager
 		FIELD b source Lctc;
 		FIELD c stopped Z

mappings/net/minecraft/client/sound/ElytraSoundInstance.mapping

@@ -1,4 +1,4 @@
-CLASS dwl net/minecraft/client/audio/ElytraSoundInstance
+CLASS dwl net/minecraft/client/sound/ElytraSoundInstance
 	FIELD o player Ldjv;
 	FIELD p tickCount I
 	METHOD <init> (Ldjv;)V

mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping

@@ -0,0 +1,2 @@
+CLASS dwm net/minecraft/client/sound/EntityTrackingSoundInstance
+	FIELD o entity Laif;

mappings/net/minecraft/client/sound/GuardianAttackSoundInstance.mapping

@@ -0,0 +1,2 @@
+CLASS dwn net/minecraft/client/sound/GuardianAttackSoundInstance
+	FIELD o guardian Lauf;

mappings/net/minecraft/client/sound/Listener.mapping

@@ -1,4 +1,4 @@
-CLASS cte net/minecraft/client/audio/Listener
+CLASS cte net/minecraft/client/sound/Listener
 	FIELD b volume F
 	METHOD a getVolume ()F
 	METHOD a setVolume (F)V

mappings/net/minecraft/client/sound/ListenerSoundInstance.mapping

@@ -1,4 +1,4 @@
-CLASS dxt net/minecraft/client/audio/ListenerSoundInstance
+CLASS dxt net/minecraft/client/sound/ListenerSoundInstance
 	METHOD a onSoundPlayed (Ldwu;Ldxv;)V
 		ARG 1 sound
 		ARG 2 soundSet

mappings/net/minecraft/client/sound/MinecartSoundInstance.mapping

@@ -1,4 +1,4 @@
-CLASS dwp net/minecraft/client/audio/MinecartSoundInstance
+CLASS dwp net/minecraft/client/sound/MinecartSoundInstance
 	FIELD o player Lavx;
 	FIELD p minecart Laxl;
 	METHOD <init> (Lavx;Laxl;)V

mappings/net/minecraft/client/sound/MovingSoundInstance.mapping

@@ -1,4 +1,4 @@
-CLASS dwi net/minecraft/client/audio/MovingSoundInstance
+CLASS dwi net/minecraft/client/sound/MovingSoundInstance
 	FIELD n done Z
 	METHOD <init> (Lyj;Lyl;)V
 		ARG 1 sound

mappings/net/minecraft/client/sound/MusicTracker.mapping

@@ -1,4 +1,4 @@
-CLASS dxp net/minecraft/client/audio/MusicTracker
+CLASS dxp net/minecraft/client/sound/MusicTracker
 	CLASS dxp$a MusicType
 		FIELD i sound Lyj;
 		FIELD j minDelay I

mappings/net/minecraft/client/sound/OggAudioStream.mapping

@@ -1,4 +1,4 @@
-CLASS ctf net/minecraft/client/audio/OggAudioStream
+CLASS ctf net/minecraft/client/sound/OggAudioStream
 	CLASS ctf$a ChannelList
 		FIELD a buffers Ljava/util/List;
 		FIELD b size I

mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping

@@ -1,4 +1,4 @@
-CLASS dwq net/minecraft/client/audio/PositionedSoundInstance
+CLASS dwq net/minecraft/client/sound/PositionedSoundInstance
 	METHOD <init> (Lqs;Lyl;FFZILdwu$a;FFFZ)V
 		ARG 1 id
 		ARG 2 category

mappings/net/minecraft/client/sound/RidingMinecartSoundInstance.mapping

@@ -0,0 +1,3 @@
+CLASS dwo net/minecraft/client/sound/RidingMinecartSoundInstance
+	FIELD o minecart Laxl;
+	FIELD p distance F

mappings/net/minecraft/client/sound/Sound.mapping

@@ -1,4 +1,4 @@
-CLASS dwr net/minecraft/client/audio/Sound
+CLASS dwr net/minecraft/client/sound/Sound
 	CLASS dwr$a RegistrationType
 		FIELD b SOUND_EVENT Ldwr$a;
 		FIELD c name Ljava/lang/String;

mappings/net/minecraft/client/sound/SoundContainer.mapping

@@ -1,4 +1,4 @@
-CLASS dxw net/minecraft/client/audio/SoundContainer
+CLASS dxw net/minecraft/client/sound/SoundContainer
 	METHOD a preload (Ldxr;)V
 		ARG 1 soundSystem
 	METHOD e getWeight ()I

mappings/net/minecraft/client/sound/SoundEngine.mapping

@@ -1,4 +1,4 @@
-CLASS ctd net/minecraft/client/audio/SoundEngine
+CLASS ctd net/minecraft/client/sound/SoundEngine
 	CLASS ctd$a SourceSet
 		METHOD a createSource ()Lctc;
 		METHOD a release (Lctc;)Z

mappings/net/minecraft/client/sound/SoundEntry.mapping

@@ -1,4 +1,4 @@
-CLASS dws net/minecraft/client/audio/SoundEntry
+CLASS dws net/minecraft/client/sound/SoundEntry
 	FIELD a sounds Ljava/util/List;
 	FIELD b replace Z
 	FIELD c subtitle Ljava/lang/String;

mappings/net/minecraft/client/sound/SoundEntryDeserializer.mapping

@@ -1,4 +1,4 @@
-CLASS dwt net/minecraft/client/audio/SoundEntryDeserializer
+CLASS dwt net/minecraft/client/sound/SoundEntryDeserializer
 	METHOD a deserializeSounds (Lcom/google/gson/JsonObject;)Ljava/util/List;
 		ARG 1 json
 	METHOD a deserializeType (Lcom/google/gson/JsonObject;Ldwr$a;)Ldwr$a;

mappings/net/minecraft/client/sound/SoundExecutor.mapping

@@ -1,4 +1,4 @@
-CLASS dxs net/minecraft/client/audio/SoundExecutor
+CLASS dxs net/minecraft/client/sound/SoundExecutor
 	FIELD a thread Ljava/lang/Thread;
 	FIELD b stopped Z
 	METHOD a restart ()V

mappings/net/minecraft/client/sound/SoundInstance.mapping

@@ -1,4 +1,4 @@
-CLASS dwu net/minecraft/client/audio/SoundInstance
+CLASS dwu net/minecraft/client/sound/SoundInstance
 	CLASS dwu$a AttenuationType
 	METHOD a getId ()Lqs;
 	METHOD a getSoundSet (Ldxu;)Ldxv;

mappings/net/minecraft/client/sound/SoundLoader.mapping

@@ -1,4 +1,4 @@
-CLASS dxq net/minecraft/client/audio/SoundLoader
+CLASS dxq net/minecraft/client/sound/SoundLoader
 	FIELD a resourceManager Lxe;
 	FIELD b loadedSounds Ljava/util/Map;
 	METHOD <init> (Lxe;)V

mappings/net/minecraft/client/sound/SoundManager.mapping

@@ -1,4 +1,4 @@
-CLASS dxu net/minecraft/client/audio/SoundManager
+CLASS dxu net/minecraft/client/sound/SoundManager
 	CLASS dxu$a SoundList
 		FIELD a loadedSounds Ljava/util/Map;
 		METHOD a addTo (Ljava/util/Map;Ldxr;)V

mappings/net/minecraft/client/sound/SoundSystem.mapping

@@ -1,4 +1,4 @@
-CLASS dxr net/minecraft/client/audio/SoundSystem
+CLASS dxr net/minecraft/client/sound/SoundSystem
 	FIELD a MARKER Lorg/apache/logging/log4j/Marker;
 	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD c unknownSounds Ljava/util/Set;

mappings/net/minecraft/client/sound/Source.mapping

@@ -1,4 +1,4 @@
-CLASS ctc net/minecraft/client/audio/Source
+CLASS ctc net/minecraft/client/sound/Source
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b pointer I
 	FIELD c playing Ljava/util/concurrent/atomic/AtomicBoolean;

mappings/net/minecraft/client/sound/StaticSound.mapping

@@ -1,4 +1,4 @@
-CLASS cth net/minecraft/client/audio/StaticSound
+CLASS cth net/minecraft/client/sound/StaticSound
 	FIELD a sample Ljava/nio/ByteBuffer;
 	FIELD b format Ljavax/sound/sampled/AudioFormat;
 	FIELD c hasBuffer Z

mappings/net/minecraft/client/sound/TickableSoundInstance.mapping

@@ -0,0 +1,3 @@
+CLASS dwv net/minecraft/client/sound/TickableSoundInstance
+	METHOD n isDone ()Z
+	METHOD o tick ()V

mappings/net/minecraft/client/sound/WeightedSoundSet.mapping

@@ -1,4 +1,4 @@
-CLASS dxv net/minecraft/client/audio/WeightedSoundSet
+CLASS dxv net/minecraft/client/sound/WeightedSoundSet
 	FIELD a sounds Ljava/util/List;
 	FIELD b random Ljava/util/Random;
 	FIELD c id Lqs;

mappings/net/minecraft/client/texture/Sprite.mapping

@@ -2,12 +2,13 @@ CLASS dug net/minecraft/client/texture/Sprite
 	FIELD a width I
 	FIELD b height I
 	FIELD c images [Lctw;
-	FIELD d frameOffsets [I
+	FIELD d frameXs [I
+	FIELD e frameYs [I
 	FIELD f interpolatedImages [Lctw;
 	FIELD g x I
 	FIELD h y I
-	FIELD i framePos I
+	FIELD i frameIndex I
-	FIELD j ticks I
+	FIELD j frameTicks I
 	FIELD k id Lqs;
 	FIELD l animationMetadata Ldvi;
 	FIELD m uMin F
@@ -27,6 +28,10 @@ CLASS dug net/minecraft/client/texture/Sprite
 	METHOD a isDivisibleBy (II)Z
 		ARG 0 number
 		ARG 1 divisor
+	METHOD a isPixelTransparent (III)Z
+		ARG 1 frame
+		ARG 2 x
+		ARG 3 y
 	METHOD a init (IIII)V
 		ARG 1 width
 		ARG 2 height
@@ -60,6 +65,7 @@ CLASS dug net/minecraft/client/texture/Sprite
 	METHOD c srgbToLinear (I)F
 	METHOD c getFramePixel (IIII)I
 		ARG 1 frame
+		ARG 2 image
 		ARG 3 x
 		ARG 4 y
 	METHOD d upload (I)V
@@ -71,7 +77,7 @@ CLASS dug net/minecraft/client/texture/Sprite
 	METHOD k getMinV ()F
 	METHOD l getMaxV ()F
 	METHOD m getId ()Lqs;
-	METHOD n tick ()V
+	METHOD n tickAnimation ()V
 	METHOD o getFrameCount ()I
 	METHOD p isAnimated ()Z
 	METHOD q upload ()V

mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping

@@ -1,5 +1,9 @@
 CLASS duf net/minecraft/client/texture/SpriteAtlasTexture
 	CLASS duf$a Data
+		FIELD a spriteIds Ljava/util/Set;
+		FIELD b width I
+		FIELD c height I
+		FIELD d sprites Ljava/util/List;
 	FIELD f BLOCK_ATLAS_TEX Lqs;
 	FIELD g PARTICLE_ATLAS_TEX Lqs;
 	FIELD h PAINTING_ATLAS_TEX Lqs;
@@ -8,11 +12,11 @@ CLASS duf net/minecraft/client/texture/SpriteAtlasTexture
 	FIELD k animatedSprites Ljava/util/List;
 	FIELD l spritesToLoad Ljava/util/Set;
 	FIELD m sprites Ljava/util/Map;
-	FIELD n pathPrefix Ljava/lang/String;
+	FIELD n atlasPath Ljava/lang/String;
 	FIELD o maxTextureSize I
 	FIELD p mipLevel I
 	FIELD q missingSprite Ldug;
-	METHOD a updateAnimatedSprites ()V
+	METHOD a tickAnimatedSprites ()V
 	METHOD a setMipLevel (I)V
 	METHOD a upload (Lduf$a;)V
 	METHOD a getSprite (Ljava/lang/String;)Ldug;

mappings/net/minecraft/enchantment/Enchantment.mapping

@@ -14,6 +14,7 @@ CLASS bfi net/minecraft/enchantment/Enchantment
 		ARG 3 slotTypes
 	METHOD a getMaximumLevel ()I
 	METHOD a getMinimumPower (I)I
+		ARG 1 level
 	METHOD a getProtectionAmount (ILaho;)I
 		ARG 1 level
 		ARG 2 source

mappings/net/minecraft/entity/LivingEntity.mapping

@@ -203,7 +203,7 @@ CLASS aio net/minecraft/entity/LivingEntity
 	METHOD d setSleepingPosition (Lev;)V
 	METHOD da getMovementSpeed ()F
 	METHOD db tickNewAi ()V
-	METHOD dc doPushLogic ()V
+	METHOD dc tickPushing ()V
 	METHOD dd isUsingRiptide ()Z
 	METHOD de canMoveVoluntarily ()Z
 	METHOD df getAbsorptionAmount ()F
@@ -238,7 +238,7 @@ CLASS aio net/minecraft/entity/LivingEntity
 	METHOD f getArrowType (Lbca;)Lbca;
 	METHOD g playEquipmentBreakEffects (Lbca;)V
 		ARG 1 item
-	METHOD k updateState ()V
+	METHOD k tickMovement ()V
 	METHOD k getNextBreathInWater (I)I
 		ARG 1 breath
 	METHOD l getHandSwingDuration ()I
@@ -261,6 +261,6 @@ CLASS aio net/minecraft/entity/LivingEntity
 		ARG 1 tickDelta
 	METHOD q setAbsorptionAmount (F)V
 		ARG 1 amount
-	METHOD v_ isChild ()Z
+	METHOD v_ isBaby ()Z
 	METHOD w_ isClimbing ()Z
 	METHOD z onAttacking (Laif;)V

mappings/net/minecraft/particle/BlockStateParticleEffect.mapping

@@ -1,4 +1,4 @@
-CLASS ga net/minecraft/particle/BlockStateParticleParameters
+CLASS ga net/minecraft/particle/BlockStateParticleEffect
 	FIELD a PARAMETERS_FACTORY Lgd$a;
 	FIELD b type Lge;
 	FIELD c blockState Lbvj;

mappings/net/minecraft/particle/DustParticleEffect.mapping

@@ -1,4 +1,4 @@
-CLASS gb net/minecraft/particle/DustParticleParameters
+CLASS gb net/minecraft/particle/DustParticleEffect
 	FIELD a RED Lgb;
 	FIELD b PARAMETERS_FACTORY Lgd$a;
 	FIELD c red F

mappings/net/minecraft/particle/ItemStackParticleEffect.mapping

@@ -1,8 +1,8 @@
-CLASS gc net/minecraft/particle/ItemStackParticleParameters
+CLASS gc net/minecraft/particle/ItemStackParticleEffect
 	FIELD a PARAMETERS_FACTORY Lgd$a;
-	FIELD b particleType Lge;
+	FIELD b type Lge;
 	FIELD c stack Lbca;
 	METHOD <init> (Lge;Lbca;)V
-		ARG 1 particleType
+		ARG 1 type
 		ARG 2 stack
 	METHOD c getItemStack ()Lbca;

mappings/net/minecraft/particle/ParticleEffect.mapping

@@ -1,4 +1,4 @@
-CLASS gd net/minecraft/particle/ParticleParameters
+CLASS gd net/minecraft/particle/ParticleEffect
 	CLASS gd$a Factory
 		METHOD b read (Lge;Lcom/mojang/brigadier/StringReader;)Lgd;
 			ARG 1 type

mappings/net/minecraft/util/Unit.mapping

@@ -0,0 +1 @@
+CLASS aaa net/minecraft/util/Unit

mappings/net/minecraft/util/Void.mapping

@@ -1 +0,0 @@
-CLASS aaa net/minecraft/util/Void

mappings/net/minecraft/util/math/ChunkPos.mapping

@@ -1,4 +1,4 @@
-CLASS bgt net/minecraft/world/chunk/ChunkPos
+CLASS bgt net/minecraft/util/math/ChunkPos
 	CLASS bgt$1
 		METHOD tryAdvance (Ljava/util/function/Consumer;)Z
 			ARG 1 consumer

mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping

@@ -19,7 +19,7 @@ CLASS bif net/minecraft/world/biome/DefaultBiomeFeatures
 		ARG 0 biome
 	METHOD J addSavannaTallGrass (Lbie;)V
 		ARG 0 biome
-	METHOD K addShatteredSavanaGrass (Lbie;)V
+	METHOD K addShatteredSavannaGrass (Lbie;)V
 		ARG 0 biome
 	METHOD L addSavannaGrass (Lbie;)V
 		ARG 0 biome