1.14.3-pre4

build.gradle

@@ -7,8 +7,8 @@ buildscript {
 		}
 	}
 	dependencies {
-		classpath "net.fabricmc:weave:0.3.1.17+"
+		classpath "net.fabricmc:weave:0.4.0.19"
-		classpath "net.fabricmc:stitch:0.1.2.51+"
+		classpath "net.fabricmc:stitch:0.2.0.52"
 		classpath "commons-io:commons-io:2.6"
 		classpath "com.google.guava:guava:28.0-jre"
 		classpath 'de.undercouch:gradle-download-task:3.4.3'
@@ -22,7 +22,7 @@ plugins {
 	id 'maven-publish'
 }
 
-def minecraft_version = "1.14.3-pre3"
+def minecraft_version = "1.14.3-pre4"
 
 def ENV = System.getenv()
 // Fetch build number from Jenkins
@@ -49,8 +49,8 @@ configurations {
 }
 
 dependencies {
-	enigmaRuntime "net.fabricmc:stitch:0.1.2.51+"
+	enigmaRuntime "net.fabricmc:stitch:0.2.0.52"
-	enigmaRuntime "cuchaz:enigma:0.13.1.116:all"
+	enigmaRuntime "cuchaz:enigma:0.14.0.120:all"
 }
 
 def mappingsDir = file("mappings")
@@ -199,8 +199,12 @@ task yarn(dependsOn: setupYarn) {
 			spawn: true
 		) {
 			jvmarg(value: "-Xmx2048m")
+			arg(value: '-jar')
 			arg(value: mergedFile.getAbsolutePath())
+			arg(value: '-mappings')
 			arg(value: mappingsDir.getAbsolutePath())
+			arg(value: '-profile')
+			arg(value: 'enigma_profile.json')
 		}
 	}
 }

enigma_profile.json

@@ -0,0 +1,10 @@
+{
+    "services" : {
+        "name_proposal" : {
+            "id": "stitch:name_proposal"
+        },
+        "jar_indexer" : {
+            "id": "stitch:jar_indexer"
+        }
+    }
+}

mappings/com/mojang/blaze3d/platform/GLX.mapping

@@ -1,5 +1,5 @@
 CLASS com/mojang/blaze3d/platform/GLX
-	CLASS com/mojang/blaze3d/platform/GLX$a FBOMode
+	CLASS a FBOMode
 	METHOD glActiveTexture (I)V
 		ARG 0 texture
 	METHOD glAttachShader (II)V

mappings/com/mojang/blaze3d/platform/GlStateManager.mapping

@@ -1,88 +1,88 @@
 CLASS com/mojang/blaze3d/platform/GlStateManager
-	CLASS com/mojang/blaze3d/platform/GlStateManager$a AlphaTestState
+	CLASS a AlphaTestState
 		FIELD a capState Lcom/mojang/blaze3d/platform/GlStateManager$c;
 		FIELD b func I
 		FIELD c ref F
-	CLASS com/mojang/blaze3d/platform/GlStateManager$b BlendFuncState
+	CLASS b BlendFuncState
 		FIELD a capState Lcom/mojang/blaze3d/platform/GlStateManager$c;
 		FIELD b sfactor I
 		FIELD c dfactor I
 		FIELD d srcAlpha I
 		FIELD e dstAlpha I
-	CLASS com/mojang/blaze3d/platform/GlStateManager$c CapabilityTracker
+	CLASS c CapabilityTracker
 		FIELD a cap I
 		FIELD b state Z
 		METHOD a disable ()V
 		METHOD a setState (Z)V
 		METHOD b enable ()V
-	CLASS com/mojang/blaze3d/platform/GlStateManager$d ClearState
+	CLASS d ClearState
 		FIELD a clearDepth D
 		FIELD b clearColor Lcom/mojang/blaze3d/platform/GlStateManager$e;
-	CLASS com/mojang/blaze3d/platform/GlStateManager$e Color4
+	CLASS e Color4
 		FIELD a red F
 		FIELD b green F
 		FIELD c blue F
 		FIELD d alpha F
-	CLASS com/mojang/blaze3d/platform/GlStateManager$f LogicOpState
+	CLASS f LogicOpState
 		FIELD a capState Lcom/mojang/blaze3d/platform/GlStateManager$c;
 		FIELD b opcode I
-	CLASS com/mojang/blaze3d/platform/GlStateManager$g ColorMask
+	CLASS g ColorMask
 		FIELD a red Z
 		FIELD b green Z
 		FIELD c blue Z
 		FIELD d alpha Z
-	CLASS com/mojang/blaze3d/platform/GlStateManager$h ColorMaterialState
+	CLASS h ColorMaterialState
 		FIELD a capState Lcom/mojang/blaze3d/platform/GlStateManager$c;
 		FIELD b face I
 		FIELD c mode I
-	CLASS com/mojang/blaze3d/platform/GlStateManager$i FaceSides
+	CLASS i FaceSides
 		FIELD d glValue I
-	CLASS com/mojang/blaze3d/platform/GlStateManager$j CullFaceState
+	CLASS j CullFaceState
 		FIELD a capState Lcom/mojang/blaze3d/platform/GlStateManager$c;
 		FIELD b mode I
-	CLASS com/mojang/blaze3d/platform/GlStateManager$k DepthTestState
+	CLASS k DepthTestState
 		FIELD a capState Lcom/mojang/blaze3d/platform/GlStateManager$c;
 		FIELD b mask Z
 		FIELD c func I
-	CLASS com/mojang/blaze3d/platform/GlStateManager$l FogMode
+	CLASS l FogMode
 		FIELD d glValue I
-	CLASS com/mojang/blaze3d/platform/GlStateManager$m FogState
+	CLASS m FogState
 		FIELD a capState Lcom/mojang/blaze3d/platform/GlStateManager$c;
 		FIELD b mode I
 		FIELD c density F
 		FIELD d start F
 		FIELD e end F
-	CLASS com/mojang/blaze3d/platform/GlStateManager$n LogicOp
+	CLASS n LogicOp
 		FIELD q glValue I
-	CLASS com/mojang/blaze3d/platform/GlStateManager$o PolygonOffsetState
+	CLASS o PolygonOffsetState
 		FIELD a capFill Lcom/mojang/blaze3d/platform/GlStateManager$c;
 		FIELD b capLine Lcom/mojang/blaze3d/platform/GlStateManager$c;
 		FIELD c factor F
 		FIELD d units F
-	CLASS com/mojang/blaze3d/platform/GlStateManager$p RenderMode
+	CLASS p RenderMode
 		FIELD a DEFAULT Lcom/mojang/blaze3d/platform/GlStateManager$p;
 		FIELD b PLAYER_SKIN Lcom/mojang/blaze3d/platform/GlStateManager$p;
 		FIELD c TRANSPARENT_MODEL Lcom/mojang/blaze3d/platform/GlStateManager$p;
 		METHOD a begin ()V
 		METHOD b end ()V
-	CLASS com/mojang/blaze3d/platform/GlStateManager$q StencilSubState
+	CLASS q StencilSubState
 		FIELD a func I
-	CLASS com/mojang/blaze3d/platform/GlStateManager$r StencilState
+	CLASS r StencilState
 		FIELD a subState Lcom/mojang/blaze3d/platform/GlStateManager$q;
-	CLASS com/mojang/blaze3d/platform/GlStateManager$s TexCoord
+	CLASS s TexCoord
-	CLASS com/mojang/blaze3d/platform/GlStateManager$t TexGenCoordState
+	CLASS t TexGenCoordState
 		FIELD a capState Lcom/mojang/blaze3d/platform/GlStateManager$c;
 		FIELD b coord I
 		FIELD c mode I
-	CLASS com/mojang/blaze3d/platform/GlStateManager$u TexGenState
+	CLASS u TexGenState
 		FIELD a s Lcom/mojang/blaze3d/platform/GlStateManager$t;
 		FIELD b t Lcom/mojang/blaze3d/platform/GlStateManager$t;
 		FIELD c r Lcom/mojang/blaze3d/platform/GlStateManager$t;
 		FIELD d q Lcom/mojang/blaze3d/platform/GlStateManager$t;
-	CLASS com/mojang/blaze3d/platform/GlStateManager$v Texture2DState
+	CLASS v Texture2DState
 		FIELD a capState Lcom/mojang/blaze3d/platform/GlStateManager$c;
 		FIELD b boundTexture I
-	CLASS com/mojang/blaze3d/platform/GlStateManager$w Viewport
+	CLASS w Viewport
 		FIELD b x I
 		FIELD c y I
 		FIELD d width I

mappings/net/minecraft/advancement/Advancement.mapping

@@ -1,5 +1,5 @@
 CLASS q net/minecraft/advancement/Advancement
-	CLASS q$a Task
+	CLASS a Task
 		FIELD a parentId Lqt;
 		FIELD b parentObj Lq;
 		FIELD c display Lz;

mappings/net/minecraft/advancement/AdvancementManager.mapping

@@ -1,5 +1,5 @@
 CLASS r net/minecraft/advancement/AdvancementManager
-	CLASS r$a Listener
+	CLASS a Listener
 		METHOD a onClear ()V
 		METHOD a onRootAdded (Lq;)V
 		METHOD b onRootRemoved (Lq;)V

mappings/net/minecraft/advancement/AdvancementProgress.mapping

@@ -1,5 +1,5 @@
 CLASS s net/minecraft/advancement/AdvancementProgress
-	CLASS s$a Serializer
+	CLASS a Serializer
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 functionJson
 			ARG 2 unused

mappings/net/minecraft/advancement/AdvancementRewards.mapping

@@ -1,5 +1,5 @@
 CLASS t net/minecraft/advancement/AdvancementRewards
-	CLASS t$a Builder
+	CLASS a Builder
 		FIELD a experience I
 		FIELD b loot Ljava/util/List;
 		FIELD c recipes Ljava/util/List;
@@ -9,7 +9,7 @@ CLASS t net/minecraft/advancement/AdvancementRewards
 		METHOD b setExperience (I)Lt$a;
 		METHOD c recipe (Lqt;)Lt$a;
 		METHOD d addRecipe (Lqt;)Lt$a;
-	CLASS t$b Deserializer
+	CLASS b Deserializer
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 functionJson
 			ARG 2 unused

mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping

@@ -1,5 +1,5 @@
 CLASS ae net/minecraft/advancement/criterion/BredAnimalsCriterion
-	CLASS ae$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
@@ -9,7 +9,7 @@ CLASS ae net/minecraft/advancement/criterion/BredAnimalsCriterion
 			ARG 3 child
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS ae$b Conditions
+	CLASS b Conditions
 		FIELD a parent Lav;
 		FIELD b partner Lav;
 		FIELD c child Lav;

mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS af net/minecraft/advancement/criterion/BrewedPotionCriterion
-	CLASS af$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a handle (Lbdt;)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS af$b Conditions
+	CLASS b Conditions
 		FIELD a potion Lbdt;
 		METHOD a matches (Lbdt;)Z
 		METHOD c any ()Laf$b;

mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS ag net/minecraft/advancement/criterion/ChangedDimensionCriterion
-	CLASS ag$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a handle (Lbyi;Lbyi;)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS ag$b Conditions
+	CLASS b Conditions
 		FIELD a from Lbyi;
 		FIELD b to Lbyi;
 		METHOD a to (Lbyi;)Lag$b;

mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS ah net/minecraft/advancement/criterion/ChanneledLightningCriterion
-	CLASS ah$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a handle (Lvj;Ljava/util/Collection;)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS ah$b Conditions
+	CLASS b Conditions
 		FIELD a victims [Lav;
 		METHOD a matches (Lvj;Ljava/util/Collection;)Z
 		METHOD a create ([Lav;)Lah$b;

mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS ai net/minecraft/advancement/criterion/ConstructBeaconCriterion
-	CLASS ai$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a handle (Lbtn;)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS ai$b Conditions
+	CLASS b Conditions
 		FIELD a level Lbi$d;
 		METHOD a level (Lbi$d;)Lai$b;
 		METHOD a matches (Lbtn;)Z

mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS aj net/minecraft/advancement/criterion/ConsumeItemCriterion
-	CLASS aj$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a handle (Lbce;)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS aj$b Conditions
+	CLASS b Conditions
 		FIELD a item Lbc;
 		METHOD a matches (Lbce;)Z
 		METHOD a item (Lbhl;)Laj$b;

mappings/net/minecraft/advancement/criterion/Criterion.mapping

@@ -1,5 +1,5 @@
 CLASS x net/minecraft/advancement/criterion/Criterion
-	CLASS x$a ConditionsContainer
+	CLASS a ConditionsContainer
 		FIELD a conditions Ly;
 		FIELD b advancement Lq;
 		FIELD c id Ljava/lang/String;

mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS ak net/minecraft/advancement/criterion/CuredZombieVillagerCriterion
-	CLASS ak$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a handle (Lvj;Lavh;Lavo;)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS ak$b Conditions
+	CLASS b Conditions
 		FIELD a zombie Lav;
 		FIELD b villager Lav;
 		METHOD a matches (Lvj;Lavh;Lavo;)Z

mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS ao net/minecraft/advancement/criterion/EffectsChangedCriterion
-	CLASS ao$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a handle (Lvj;)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS ao$b Conditions
+	CLASS b Conditions
 		FIELD a effects Lbj;
 		METHOD a create (Lbj;)Lao$b;
 		METHOD a matches (Lvj;)Z

mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping

@@ -1,5 +1,5 @@
 CLASS ap net/minecraft/advancement/criterion/EnchantedItemCriterion
-	CLASS ap$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
@@ -7,7 +7,7 @@ CLASS ap net/minecraft/advancement/criterion/EnchantedItemCriterion
 			ARG 1 level
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS ap$b Conditions
+	CLASS b Conditions
 		FIELD a item Lbc;
 		FIELD b levels Lbi$d;
 		METHOD a matches (Lbce;I)Z

mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS ar net/minecraft/advancement/criterion/EnterBlockCriterion
-	CLASS ar$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a handle (Lbvo;)V
 		METHOD a addConditon (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS ar$b Conditions
+	CLASS b Conditions
 		FIELD a block Lbmq;
 		FIELD b state Ljava/util/Map;
 		METHOD a block (Lbmq;)Lar$b;

mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping

@@ -1,5 +1,5 @@
 CLASS au net/minecraft/advancement/criterion/EntityHurtPlayerCriterion
-	CLASS au$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
@@ -10,7 +10,7 @@ CLASS au net/minecraft/advancement/criterion/EntityHurtPlayerCriterion
 			ARG 4 blocked
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS au$b Conditions
+	CLASS b Conditions
 		FIELD a damage Lal;
 		METHOD a create (Lal$a;)Lau$b;
 		METHOD a matches (Lvj;Lahu;FFZ)Z

mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping

@@ -1,5 +1,5 @@
 CLASS ax net/minecraft/advancement/criterion/FilledBucketCriterion
-	CLASS ax$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD <init> (Lrc;)V
@@ -8,7 +8,7 @@ CLASS ax net/minecraft/advancement/criterion/FilledBucketCriterion
 		METHOD a handle (Lbce;)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS ax$b Conditions
+	CLASS b Conditions
 		FIELD a item Lbc;
 		METHOD a create (Lbc;)Lax$b;
 		METHOD a matches (Lbce;)Z

mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping

@@ -1,5 +1,5 @@
 CLASS ay net/minecraft/advancement/criterion/FishingRodHookedCriterion
-	CLASS ay$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD <init> (Lrc;)V
@@ -8,7 +8,7 @@ CLASS ay net/minecraft/advancement/criterion/FishingRodHookedCriterion
 		METHOD a handle (Lvj;Lbce;Latn;Ljava/util/Collection;)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS ay$b Conditions
+	CLASS b Conditions
 		FIELD a rod Lbc;
 		FIELD b entity Lav;
 		FIELD c item Lbc;

mappings/net/minecraft/advancement/criterion/ImpossibleCriterion.mapping

@@ -1,3 +1,3 @@
 CLASS az net/minecraft/advancement/criterion/ImpossibleCriterion
-	CLASS az$a Conditions
+	CLASS a Conditions
 	FIELD a ID Lqt;

mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS ba net/minecraft/advancement/criterion/InventoryChangedCriterion
-	CLASS ba$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a handle (Lawa;)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS ba$b Conditions
+	CLASS b Conditions
 		FIELD a occupied Lbi$d;
 		FIELD b full Lbi$d;
 		FIELD c empty Lbi$d;

mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS bb net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion
-	CLASS bb$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a handle (Lbce;I)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS bb$b Conditions
+	CLASS b Conditions
 		FIELD a item Lbc;
 		FIELD b durability Lbi$d;
 		FIELD c delta Lbi$d;

mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS bd net/minecraft/advancement/criterion/KilledByCrossbowCriterion
-	CLASS bd$a Handler
+	CLASS a Handler
 		FIELD a tracker Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a trigger (Lvj;Ljava/util/Collection;I)V
 		METHOD a add (Lx$a;)V
 		METHOD b remove (Lx$a;)V
-	CLASS bd$b Conditions
+	CLASS b Conditions
 		FIELD a victims [Lav;
 		FIELD b uniqueEntityTypes Lbi$d;
 		METHOD a create (Lbi$d;)Lbd$b;

mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping

@@ -1,5 +1,5 @@
 CLASS bf net/minecraft/advancement/criterion/LevitationCriterion
-	CLASS bf$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
@@ -8,7 +8,7 @@ CLASS bf net/minecraft/advancement/criterion/LevitationCriterion
 			ARG 2 duration
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS bf$b Conditions
+	CLASS b Conditions
 		FIELD a distance Lan;
 		FIELD b duration Lbi$d;
 		METHOD a create (Lan;)Lbf$b;

mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping

@@ -1,5 +1,5 @@
 CLASS bh net/minecraft/advancement/criterion/LocationArrivalCriterion
-	CLASS bh$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
@@ -8,7 +8,7 @@ CLASS bh net/minecraft/advancement/criterion/LocationArrivalCriterion
 			ARG 2 y
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS bh$b Conditions
+	CLASS b Conditions
 		FIELD a location Lbg;
 		METHOD a create (Lbg;)Lbh$b;
 		METHOD a matches (Lvi;DDD)Z

mappings/net/minecraft/advancement/criterion/NetherTravelCriterion.mapping

@@ -1,5 +1,5 @@
 CLASS bl net/minecraft/advancement/criterion/NetherTravelCriterion
-	CLASS bl$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
@@ -9,7 +9,7 @@ CLASS bl net/minecraft/advancement/criterion/NetherTravelCriterion
 			ARG 3 exitedY
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS bl$b Conditions
+	CLASS b Conditions
 		FIELD a entered Lbg;
 		FIELD b exited Lbg;
 		FIELD c distance Lan;

mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS be net/minecraft/advancement/criterion/OnKilledCriterion
-	CLASS be$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a handle (Lvj;Lail;Lahu;)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS be$b Conditions
+	CLASS b Conditions
 		FIELD a entity Lav;
 		FIELD b killingBlow Lam;
 		METHOD a createPlayerKilledEntity (Lav$a;)Lbe$b;

mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping

@@ -1,5 +1,5 @@
 CLASS bm net/minecraft/advancement/criterion/PlacedBlockCriterion
-	CLASS bm$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
@@ -9,7 +9,7 @@ CLASS bm net/minecraft/advancement/criterion/PlacedBlockCriterion
 			ARG 3 item
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS bm$b Conditions
+	CLASS b Conditions
 		FIELD a block Lbmq;
 		FIELD b state Ljava/util/Map;
 		FIELD c location Lbg;

mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping

@@ -1,5 +1,5 @@
 CLASS bn net/minecraft/advancement/criterion/PlayerHurtEntityCriterion
-	CLASS bn$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
@@ -7,7 +7,7 @@ CLASS bn net/minecraft/advancement/criterion/PlayerHurtEntityCriterion
 			ARG 1 entity
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS bn$b Conditions
+	CLASS b Conditions
 		FIELD a damage Lal;
 		FIELD b entity Lav;
 		METHOD a create (Lal$a;)Lbn$b;

mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS bo net/minecraft/advancement/criterion/RecipeUnlockedCriterion
-	CLASS bo$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a handle (Lbem;)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS bo$b Conditions
+	CLASS b Conditions
 		FIELD a recipe Lqt;
 		METHOD a matches (Lbem;)Z
 	FIELD a ID Lqt;

mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS bp net/minecraft/advancement/criterion/ShotCrossbowCriterion
-	CLASS bp$a Handler
+	CLASS a Handler
 		FIELD a tracker Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a trigger (Lbce;)V
 		METHOD a add (Lx$a;)V
 		METHOD b remove (Lx$a;)V
-	CLASS bp$b Conditions
+	CLASS b Conditions
 		FIELD a item Lbc;
 		METHOD a matches (Lbce;)Z
 		METHOD a create (Lbhl;)Lbp$b;

mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS bq net/minecraft/advancement/criterion/SummonedEntityCriterion
-	CLASS bq$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a handle (Lvj;Lail;)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS bq$b Conditions
+	CLASS b Conditions
 		FIELD a entity Lav;
 		METHOD a create (Lav$a;)Lbq$b;
 		METHOD a matches (Lvj;Lail;)Z

mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping

@@ -1,5 +1,5 @@
 CLASS br net/minecraft/advancement/criterion/TameAnimalCriterion
-	CLASS br$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b Conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
@@ -7,7 +7,7 @@ CLASS br net/minecraft/advancement/criterion/TameAnimalCriterion
 			ARG 1 entity
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS br$b Conditions
+	CLASS b Conditions
 		FIELD a entity Lav;
 		METHOD a create (Lav;)Lbr$b;
 		METHOD a matches (Lvj;Laqv;)Z

mappings/net/minecraft/advancement/criterion/TickCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS bs net/minecraft/advancement/criterion/TickCriterion
-	CLASS bs$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a addCondition (Lx$a;)V
 		METHOD b handle ()V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS bs$b Conditions
+	CLASS b Conditions
 	FIELD a ID Lqt;
 	FIELD b handlers Ljava/util/Map;
 	METHOD a handle (Lvj;)V

mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS bu net/minecraft/advancement/criterion/UsedEnderEyeCriterion
-	CLASS bu$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a handle (D)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS bu$b Conditions
+	CLASS b Conditions
 		FIELD a distance Lbi$c;
 		METHOD a matches (D)Z
 	FIELD a id Lqt;

mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping

@@ -1,12 +1,12 @@
 CLASS bv net/minecraft/advancement/criterion/UsedTotemCriterion
-	CLASS bv$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
 		METHOD a handle (Lbce;)V
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS bv$b Conditions
+	CLASS b Conditions
 		FIELD a item Lbc;
 		METHOD a matches (Lbce;)Z
 		METHOD a create (Lbhl;)Lbv$b;

mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping

@@ -1,5 +1,5 @@
 CLASS bt net/minecraft/advancement/criterion/VillagerTradeCriterion
-	CLASS bt$a Handler
+	CLASS a Handler
 		FIELD a manager Lrc;
 		FIELD b conditions Ljava/util/Set;
 		METHOD a isEmpty ()Z
@@ -7,7 +7,7 @@ CLASS bt net/minecraft/advancement/criterion/VillagerTradeCriterion
 			ARG 1 villager
 		METHOD a addCondition (Lx$a;)V
 		METHOD b removeCondition (Lx$a;)V
-	CLASS bt$b Conditions
+	CLASS b Conditions
 		FIELD a item Lav;
 		FIELD b villager Lbc;
 		METHOD a matches (Lvj;Lavk;Lbce;)Z

mappings/net/minecraft/block/Block.mapping

@@ -1,5 +1,5 @@
 CLASS bmq net/minecraft/block/Block
-	CLASS bmq$a NeighborGroup
+	CLASS a NeighborGroup
 		FIELD a self Lbvo;
 		FIELD b other Lbvo;
 		FIELD c facing Lfa;
@@ -9,8 +9,8 @@ CLASS bmq net/minecraft/block/Block
 			ARG 3 facing
 		METHOD equals (Ljava/lang/Object;)Z
 			ARG 1 o
-	CLASS bmq$b OffsetType
+	CLASS b OffsetType
-	CLASS bmq$c Settings
+	CLASS c Settings
 		FIELD a material Lclj;
 		FIELD b materialColor Lclk;
 		FIELD c collidable Z

mappings/net/minecraft/block/BlockState.mapping

@@ -1,5 +1,5 @@
 CLASS bvo net/minecraft/block/BlockState
-	CLASS bvo$a ShapeCache
+	CLASS a ShapeCache
 		FIELD a DIRECTIONS [Lfa;
 		FIELD b opaque Z
 		FIELD c fullOpaque Z

mappings/net/minecraft/block/ChestBlock.mapping

@@ -1,9 +1,9 @@
 CLASS bnf net/minecraft/block/ChestBlock
-	CLASS bnf$2
+	CLASS 2
-		CLASS bnf$2$1
+		CLASS 1
 			METHOD createMenu (ILawa;Lawb;)Layf;
 				ARG 1 syncId
-	CLASS bnf$a PropertyRetriever
+	CLASS a PropertyRetriever
 		METHOD b getFromSingleChest (Lbtv;)Ljava/lang/Object;
 			ARG 1 chest
 		METHOD b getFromDoubleChest (Lbtv;Lbtv;)Ljava/lang/Object;

mappings/net/minecraft/block/ComposterBlock.mapping

@@ -1,6 +1,6 @@
 CLASS bnl net/minecraft/block/ComposterBlock
-	CLASS bnl$a DummyInventory
+	CLASS a DummyInventory
-	CLASS bnl$b ComposterInventory
+	CLASS b ComposterInventory
 		FIELD a state Lbvo;
 		FIELD b world Lbhn;
 		FIELD c pos Lev;
@@ -9,7 +9,7 @@ CLASS bnl net/minecraft/block/ComposterBlock
 			ARG 1 state
 			ARG 2 world
 			ARG 3 pos
-	CLASS bnl$c FullComposterInventory
+	CLASS c FullComposterInventory
 		FIELD a state Lbvo;
 		FIELD b world Lbhn;
 		FIELD c pos Lev;

mappings/net/minecraft/block/Material.mapping

@@ -1,5 +1,5 @@
 CLASS clj net/minecraft/block/Material
-	CLASS clj$a Builder
+	CLASS a Builder
 		FIELD a pistonBehavior Lcll;
 		FIELD b blocksMovement Z
 		FIELD c burnable Z

mappings/net/minecraft/block/PortalBlock.mapping

@@ -1,5 +1,5 @@
 CLASS bqe net/minecraft/block/PortalBlock
-	CLASS bqe$a AreaHelper
+	CLASS a AreaHelper
 		FIELD a world Lbhn;
 		FIELD b axis Lfa$a;
 		FIELD c negativeDir Lfa;

mappings/net/minecraft/block/PressurePlateBlock.mapping

@@ -1,5 +1,5 @@
 CLASS bqp net/minecraft/block/PressurePlateBlock
-	CLASS bqp$a ActivationRule
+	CLASS a ActivationRule
 	FIELD d POWERED Lbwg;
 	FIELD e type Lbqp$a;
 	METHOD <init> (Lbqp$a;Lbmq$c;)V

mappings/net/minecraft/block/RedstoneTorchBlock.mapping

@@ -1,5 +1,5 @@
 CLASS bqw net/minecraft/block/RedstoneTorchBlock
-	CLASS bqw$a BurnoutEntry
+	CLASS a BurnoutEntry
 		FIELD a pos Lev;
 		FIELD b time J
 		METHOD <init> (Lev;J)V

mappings/net/minecraft/block/SkullBlock.mapping

@@ -1,6 +1,6 @@
 CLASS brl net/minecraft/block/SkullBlock
-	CLASS brl$a SkullType
+	CLASS a SkullType
-	CLASS brl$b Type
+	CLASS b Type
 	FIELD a ROTATION Lbwo;
 	FIELD b SHAPE Lcsv;
 	METHOD h (Lbvo;Lbgw;Lev;)Lcsv;

mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping

@@ -1,9 +1,9 @@
 CLASS fw net/minecraft/block/dispenser/DispenserBehavior
-	CLASS fw$18
+	CLASS 18
 		METHOD dispense (Lew;Lbce;)Lbce;
 			ARG 1 location
 			ARG 2 stack
-	CLASS fw$19
+	CLASS 19
 		METHOD dispense (Lew;Lbce;)Lbce;
 			ARG 1 location
 			ARG 2 stack

mappings/net/minecraft/block/entity/BannerPattern.mapping

@@ -1,5 +1,5 @@
 CLASS btk net/minecraft/block/entity/BannerPattern
-	CLASS btk$a Builder
+	CLASS a Builder
 		FIELD a patterns Ljava/util/List;
 		METHOD a build ()Lij;
 		METHOD a with (Lbtk;Lbbb;)Lbtk$a;

mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping

@@ -1,5 +1,5 @@
 CLASS btn net/minecraft/block/entity/BeaconBlockEntity
-	CLASS btn$a BeamSegment
+	CLASS a BeamSegment
 		FIELD a color [F
 		FIELD b height I
 		METHOD <init> ([F)V

mappings/net/minecraft/block/entity/BlockEntityType.mapping

@@ -1,5 +1,5 @@
 CLASS bts net/minecraft/block/entity/BlockEntityType
-	CLASS bts$a Builder
+	CLASS a Builder
 		FIELD a supplier Ljava/util/function/Supplier;
 		FIELD b blocks Ljava/util/Set;
 		METHOD <init> (Ljava/util/function/Supplier;Ljava/util/Set;)V

mappings/net/minecraft/block/entity/CommandBlockBlockEntity.mapping

@@ -1,5 +1,5 @@
 CLASS btw net/minecraft/block/entity/CommandBlockBlockEntity
-	CLASS btw$a Type
+	CLASS a Type
 	FIELD a powered Z
 	FIELD b auto Z
 	FIELD c conditionMet Z

mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping

@@ -1,5 +1,5 @@
 CLASS bum net/minecraft/block/entity/ShulkerBoxBlockEntity
-	CLASS bum$a AnimationStage
+	CLASS a AnimationStage
 	FIELD a AVAILABLE_SLOTS [I
 	FIELD b inventory Lfj;
 	FIELD c viewerCount I

mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping

@@ -1,5 +1,5 @@
 CLASS bur net/minecraft/block/entity/StructureBlockBlockEntity
-	CLASS bur$a Action
+	CLASS a Action
 	FIELD a structureName Lqt;
 	FIELD b author Ljava/lang/String;
 	FIELD c metadata Ljava/lang/String;

mappings/net/minecraft/block/pattern/BlockPattern.mapping

@@ -1,8 +1,8 @@
 CLASS bvt net/minecraft/block/pattern/BlockPattern
-	CLASS bvt$a BlockStateCacheLoader
+	CLASS a BlockStateCacheLoader
 		FIELD a world Lbhp;
 		FIELD b forceLoad Z
-	CLASS bvt$b Result
+	CLASS b Result
 		FIELD a frontTopLeft Lev;
 		FIELD b forwards Lfa;
 		FIELD c up Lfa;
@@ -16,7 +16,7 @@ CLASS bvt net/minecraft/block/pattern/BlockPattern
 		METHOD c getUp ()Lfa;
 		METHOD d getWidth ()I
 		METHOD e getHeight ()I
-	CLASS bvt$c TeleportTarget
+	CLASS c TeleportTarget
 		FIELD a pos Lcsb;
 		FIELD b velocity Lcsb;
 		FIELD c yaw I

mappings/net/minecraft/client/MinecraftClientGame.mapping

@@ -1,5 +1,5 @@
 CLASS cvi net/minecraft/client/MinecraftClientGame
-	CLASS cvi$a PerformanceMetricsImpl
+	CLASS a PerformanceMetricsImpl
 		FIELD a minTime I
 		FIELD b maxTime I
 		FIELD c averageTime I

mappings/net/minecraft/client/RunArgs.mapping

@@ -1,5 +1,5 @@
 CLASS ddt net/minecraft/client/RunArgs
-	CLASS ddt$a Directories
+	CLASS a Directories
 		FIELD a runDir Ljava/io/File;
 		FIELD b resourcePackDir Ljava/io/File;
 		FIELD c assetDir Ljava/io/File;
@@ -10,7 +10,7 @@ CLASS ddt net/minecraft/client/RunArgs
 			ARG 3 assetDir
 			ARG 4 assetIndex
 		METHOD a getResourceIndex ()Lduu;
-	CLASS ddt$b Game
+	CLASS b Game
 		FIELD a demo Z
 		FIELD b version Ljava/lang/String;
 		FIELD c versionType Ljava/lang/String;
@@ -18,13 +18,13 @@ CLASS ddt net/minecraft/client/RunArgs
 			ARG 1 demo
 			ARG 2 version
 			ARG 3 versionType
-	CLASS ddt$c AutoConnect
+	CLASS c AutoConnect
 		FIELD a serverIP Ljava/lang/String;
 		FIELD b serverPort I
 		METHOD <init> (Ljava/lang/String;I)V
 			ARG 1 serverIP
 			ARG 2 serverPort
-	CLASS ddt$d Network
+	CLASS d Network
 		FIELD a session Lcvz;
 		FIELD c profileProperties Lcom/mojang/authlib/properties/PropertyMap;
 		FIELD d netProxy Ljava/net/Proxy;

mappings/net/minecraft/client/color/world/BiomeColors.mapping

@@ -1,5 +1,5 @@
 CLASS dkg net/minecraft/client/color/world/BiomeColors
-	CLASS dkg$a Provider
+	CLASS a Provider
 		METHOD getColor (Lbij;Lev;)I
 			ARG 1 biome
 			ARG 2 pos

mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping

@@ -1,5 +1,5 @@
 CLASS cyf net/minecraft/client/font/GlyphAtlasTexture
-	CLASS cyf$a Slot
+	CLASS a Slot
 		FIELD a x I
 		FIELD b y I
 		FIELD c width I

mappings/net/minecraft/client/font/TextRenderer.mapping

@@ -1,5 +1,5 @@
 CLASS cwg net/minecraft/client/font/TextRenderer
-	CLASS cwg$a Rectangle
+	CLASS a Rectangle
 		FIELD a xMin F
 		FIELD b yMin F
 		FIELD c xMax F

mappings/net/minecraft/client/font/TextureFont.mapping

@@ -1,5 +1,5 @@
 CLASS cym net/minecraft/client/font/TextureFont
-	CLASS cym$a Loader
+	CLASS a Loader
 		FIELD a filename Lqt;
 		FIELD b chars Ljava/util/List;
 		FIELD c height I
@@ -17,7 +17,7 @@ CLASS cym net/minecraft/client/font/TextureFont
 			ARG 3 characterHeight
 			ARG 4 charPosX
 			ARG 5 charPosY
-	CLASS cym$b TextureFontGlyph
+	CLASS b TextureFontGlyph
 		FIELD a scaleFactor F
 		FIELD b image Lcuc;
 		FIELD c x I

mappings/net/minecraft/client/font/TrueTypeFont.mapping

@@ -1,5 +1,5 @@
 CLASS ctr net/minecraft/client/font/TrueTypeFont
-	CLASS ctr$a TtfGlyph
+	CLASS a TtfGlyph
 		FIELD b width I
 		FIELD c height I
 		FIELD d bearingX F

mappings/net/minecraft/client/font/UnicodeTextureFont.mapping

@@ -1,12 +1,12 @@
 CLASS cyp net/minecraft/client/font/UnicodeTextureFont
-	CLASS cyp$a Loader
+	CLASS a Loader
 		FIELD a sizes Lqt;
 		FIELD b template Ljava/lang/String;
 		METHOD <init> (Lqt;Ljava/lang/String;)V
 			ARG 1 sizes
 			ARG 2 template
 		METHOD a fromJson (Lcom/google/gson/JsonObject;)Lcyn;
-	CLASS cyp$b UnicodeTextureGlyph
+	CLASS b UnicodeTextureGlyph
 		FIELD a width I
 		FIELD b height I
 		FIELD c unpackSkipPixels I

mappings/net/minecraft/client/gl/GlShader.mapping

@@ -1,5 +1,5 @@
 CLASS cum net/minecraft/client/gl/GlShader
-	CLASS cum$a Type
+	CLASS a Type
 		FIELD a VERTEX Lcum$a;
 		FIELD b FRAGMENT Lcum$a;
 		FIELD c name Ljava/lang/String;

mappings/net/minecraft/client/gl/ShaderParseException.mapping

@@ -1,5 +1,5 @@
 CLASS qw net/minecraft/client/gl/ShaderParseException
-	CLASS qw$a JsonStackTrace
+	CLASS a JsonStackTrace
 		FIELD a fileName Ljava/lang/String;
 		FIELD b faultyElements Ljava/util/List;
 		METHOD a add (Ljava/lang/String;)V

mappings/net/minecraft/client/gui/MapRenderer.mapping

@@ -1,5 +1,5 @@
 CLASS cwj net/minecraft/client/gui/MapRenderer
-	CLASS cwj$a MapTexture
+	CLASS a MapTexture
 		FIELD b mapState Lcob;
 		FIELD c texture Ldud;
 		FIELD d id Lqt;

mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping

@@ -1,5 +1,5 @@
 CLASS cxh net/minecraft/client/gui/hud/PlayerListHud
-	CLASS cxh$a EntryOrderComparator
+	CLASS a EntryOrderComparator
 	FIELD a ENTRY_ORDERING Lcom/google/common/collect/Ordering;
 	FIELD b client Lcvo;
 	FIELD c inGameHud Lcwh;

mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping

@@ -1,5 +1,5 @@
 CLASS cxl net/minecraft/client/gui/hud/SubtitlesHud
-	CLASS cxl$a SubtitleEntry
+	CLASS a SubtitleEntry
 		FIELD b text Ljava/lang/String;
 		FIELD c time J
 		FIELD d pos Lcsb;

mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping

@@ -1,6 +1,6 @@
 CLASS ddk net/minecraft/client/gui/hud/spectator/SpectatorMenu
-	CLASS ddk$a CloseSpectatorMenuCommand
+	CLASS a CloseSpectatorMenuCommand
-	CLASS ddk$b ChangePageSpectatorMenuCommand
+	CLASS b ChangePageSpectatorMenuCommand
 		FIELD a direction I
 		FIELD b enabled Z
 		METHOD <init> (IZ)V

mappings/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.mapping

@@ -1,5 +1,5 @@
 CLASS ddq net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu
-	CLASS ddq$a TeleportToSpecificTeamCommand
+	CLASS a TeleportToSpecificTeamCommand
 		FIELD b team Lcsz;
 		FIELD c skinId Lqt;
 		FIELD d scoreboardEntries Ljava/util/List;

mappings/net/minecraft/client/gui/screen/BackupPromptScreen.mapping

@@ -1,5 +1,5 @@
 CLASS cyv net/minecraft/client/gui/screen/BackupPromptScreen
-	CLASS cyv$a Callback
+	CLASS a Callback
 	FIELD a callback Lcyv$a;
 	FIELD b parent Lczx;
 	FIELD c subtitle Ljn;

mappings/net/minecraft/client/gui/screen/ChatScreen.mapping

@@ -1,5 +1,5 @@
 CLASS cyx net/minecraft/client/gui/screen/ChatScreen
-	CLASS cyx$a SuggestionWindow
+	CLASS a SuggestionWindow
 		FIELD b area Ldkz;
 		FIELD c suggestions Lcom/mojang/brigadier/suggestion/Suggestions;
 		FIELD d input Ljava/lang/String;

mappings/net/minecraft/client/gui/screen/ContainerScreenRegistry.mapping

@@ -1,5 +1,5 @@
 CLASS czo net/minecraft/client/gui/screen/ContainerScreenRegistry
-	CLASS czo$a GuiFactory
+	CLASS a GuiFactory
 		METHOD a openScreen (Ljn;Lazg;Lcvo;I)V
 			ARG 1 name
 			ARG 2 containerType

mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping

@@ -1,6 +1,6 @@
 CLASS czb net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen
-	CLASS czb$a BuffetBiomesListWidget
+	CLASS a BuffetBiomesListWidget
-		CLASS czb$a$a BuffetBiomeItem
+		CLASS a BuffetBiomeItem
 			FIELD b biome Lqt;
 			METHOD <init> (Lczb$a;Lqt;)V
 				ARG 2 biome

mappings/net/minecraft/client/gui/screen/CustomizeFlatLevelScreen.mapping

@@ -1,6 +1,6 @@
 CLASS czc net/minecraft/client/gui/screen/CustomizeFlatLevelScreen
-	CLASS czc$a SuperflatLayersListWidget
+	CLASS a SuperflatLayersListWidget
-		CLASS czc$a$a SuperflatLayerItem
+		CLASS a SuperflatLayerItem
 			METHOD mouseClicked (DDI)Z
 				ARG 1 mouseX
 				ARG 3 mouseY

mappings/net/minecraft/client/gui/screen/LanguageOptionsScreen.mapping

@@ -1,6 +1,6 @@
 CLASS czl net/minecraft/client/gui/screen/LanguageOptionsScreen
-	CLASS czl$a LanguageSelectionListWidget
+	CLASS a LanguageSelectionListWidget
-		CLASS czl$a$a LanguageItem
+		CLASS a LanguageItem
 			FIELD b languageDefinition Ldvk;
 			METHOD <init> (Lczl$a;Ldvk;)V
 				ARG 2 languageDefinition

mappings/net/minecraft/client/gui/screen/PresetsScreen.mapping

@@ -1,7 +1,7 @@
 CLASS czu net/minecraft/client/gui/screen/PresetsScreen
-	CLASS czu$a SuperflatPreset
+	CLASS a SuperflatPreset
-	CLASS czu$b SuperflatPresetsListWidget
+	CLASS b SuperflatPresetsListWidget
-		CLASS czu$b$a SuperflatPresetItem
+		CLASS a SuperflatPresetItem
 			METHOD mouseClicked (DDI)Z
 				ARG 1 mouseX
 				ARG 3 mouseY

mappings/net/minecraft/client/gui/screen/StatsScreen.mapping

@@ -1,13 +1,13 @@
 CLASS dae net/minecraft/client/gui/screen/StatsScreen
-	CLASS dae$a CustomStatsListWidget
+	CLASS a CustomStatsListWidget
-		CLASS dae$a$a CustomStatItem
+		CLASS a CustomStatItem
-	CLASS dae$b ItemStatsListWidget
+	CLASS b ItemStatsListWidget
-		CLASS dae$b$b ItemStatItem
+		CLASS b ItemStatItem
 		METHOD renderDecorations (II)V
 			ARG 1 mouseX
 			ARG 2 mouseY
-	CLASS dae$c EntityStatsListWidget
+	CLASS c EntityStatsListWidget
-		CLASS dae$c$a EntityStatItem
+		CLASS a EntityStatItem
 	FIELD a parent Lczx;
 	FIELD c generalButton Ldae$a;
 	FIELD d itemsButton Ldae$b;

mappings/net/minecraft/client/gui/screen/TitleScreen.mapping

@@ -1,5 +1,5 @@
 CLASS dab net/minecraft/client/gui/screen/TitleScreen
-	CLASS dab$a Warning
+	CLASS a Warning
 		FIELD b line2Width I
 		FIELD c startX I
 		FIELD d startY I

mappings/net/minecraft/client/gui/screen/controls/ControlsListWidget.mapping

@@ -1,9 +1,9 @@
 CLASS dan net/minecraft/client/gui/screen/controls/ControlsListWidget
-	CLASS dan$a CategoryEntry
+	CLASS a CategoryEntry
 		FIELD b name Ljava/lang/String;
 		FIELD c nameWidth I
-	CLASS dan$b Entry
+	CLASS b Entry
-	CLASS dan$c KeyBindingEntry
+	CLASS c KeyBindingEntry
 		FIELD b binding Lcvl;
 		FIELD c bindingName Ljava/lang/String;
 		FIELD d editButton Lcwu;

mappings/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.mapping

@@ -1,5 +1,5 @@
 CLASS daq net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen
-	CLASS daq$a SuggestionWindow
+	CLASS a SuggestionWindow
 		FIELD b area Ldkz;
 		FIELD c suggestions Lcom/mojang/brigadier/suggestion/Suggestions;
 		FIELD d typedText Ljava/lang/String;

mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping

@@ -1,19 +1,19 @@
 CLASS dau net/minecraft/client/gui/screen/ingame/BeaconScreen
-	CLASS dau$a CancelButtonWidget
+	CLASS a CancelButtonWidget
 		METHOD <init> (Ldau;II)V
 			ARG 2 x
 			ARG 3 y
 		METHOD renderToolTip (II)V
 			ARG 1 mouseX
 			ARG 2 mouseY
-	CLASS dau$b DoneButtonWidget
+	CLASS b DoneButtonWidget
 		METHOD <init> (Ldau;II)V
 			ARG 2 x
 			ARG 3 y
 		METHOD renderToolTip (II)V
 			ARG 1 mouseX
 			ARG 2 mouseY
-	CLASS dau$c EffectButtonWidget
+	CLASS c EffectButtonWidget
 		FIELD b effect Laid;
 		FIELD c sprite Ldun;
 		FIELD d primary Z
@@ -25,7 +25,7 @@ CLASS dau net/minecraft/client/gui/screen/ingame/BeaconScreen
 		METHOD renderToolTip (II)V
 			ARG 1 mouseX
 			ARG 2 mouseY
-	CLASS dau$d BaseButtonWidget
+	CLASS d BaseButtonWidget
 		FIELD a disabled Z
 		METHOD <init> (II)V
 			ARG 1 x
@@ -38,7 +38,7 @@ CLASS dau net/minecraft/client/gui/screen/ingame/BeaconScreen
 			ARG 1 mouseX
 			ARG 2 mouseY
 			ARG 3 delta
-	CLASS dau$e IconButtonWidget
+	CLASS e IconButtonWidget
 		FIELD a u I
 		FIELD b v I
 		METHOD <init> (IIII)V

mappings/net/minecraft/client/gui/screen/ingame/BookEditScreen.mapping

@@ -1,5 +1,5 @@
 CLASS daw net/minecraft/client/gui/screen/ingame/BookEditScreen
-	CLASS daw$a Position
+	CLASS a Position
 		FIELD b x I
 		FIELD c y I
 	FIELD a player Lawb;

mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping

@@ -1,5 +1,5 @@
 CLASS dax net/minecraft/client/gui/screen/ingame/BookScreen
-	CLASS dax$a Contents
+	CLASS a Contents
 		METHOD a getLineCount ()I
 		METHOD a getLine (I)Ljn;
 			ARG 1 line
@@ -7,10 +7,10 @@ CLASS dax net/minecraft/client/gui/screen/ingame/BookScreen
 			ARG 0 stack
 		METHOD b getLineOrDefault (I)Ljn;
 			ARG 1 line
-	CLASS dax$b WritableBookContents
+	CLASS b WritableBookContents
 		FIELD a lines Ljava/util/List;
 		METHOD b getLines (Lbce;)Ljava/util/List;
-	CLASS dax$c WrittenBookContents
+	CLASS c WrittenBookContents
 		FIELD a lines Ljava/util/List;
 		METHOD b getLines (Lbce;)Ljava/util/List;
 	FIELD a EMPTY_PROVIDER Ldax$a;

mappings/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.mapping

@@ -1,12 +1,12 @@
 CLASS dbe net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen
-	CLASS dbe$a
+	CLASS a
 		METHOD <init> (Lagz;III)V
 			ARG 1 invSlot
 			ARG 2 xPosition
 			ARG 3 <Position
-	CLASS dbe$b CreativeContainer
+	CLASS b CreativeContainer
 		FIELD c itemList Lfj;
-	CLASS dbe$c CreativeSlot
+	CLASS c CreativeSlot
 		FIELD b slot Lazs;
 	FIELD l TEXTURE Lqt;
 	FIELD m inventory Lahl;

mappings/net/minecraft/client/gui/screen/ingame/MerchantScreen.mapping

@@ -1,5 +1,5 @@
 CLASS dbs net/minecraft/client/gui/screen/ingame/MerchantScreen
-	CLASS dbs$a WidgetButtonPage
+	CLASS a WidgetButtonPage
 		METHOD renderToolTip (II)V
 			ARG 1 mouseX
 			ARG 2 mouseY

mappings/net/minecraft/client/gui/screen/ingame/StructureBlockScreen.mapping

@@ -1,5 +1,5 @@
 CLASS dbz net/minecraft/client/gui/screen/ingame/StructureBlockScreen
-	CLASS dbz$1
+	CLASS 1
 		METHOD charTyped (CI)Z
 			ARG 1 chr
 			ARG 2 keyCode

mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping

@@ -1,8 +1,8 @@
 CLASS dcd net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget
-	CLASS dcd$a Entry
+	CLASS a Entry
-	CLASS dcd$b ScanningEntry
+	CLASS b ScanningEntry
 		FIELD a client Lcvo;
-	CLASS dcd$c LanServerListEntry
+	CLASS c LanServerListEntry
 		FIELD a client Lcvo;
 		FIELD b server Ldxp;
 		FIELD c screen Ldcc;
@@ -15,7 +15,7 @@ CLASS dcd net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidge
 			ARG 1 mouseX
 			ARG 3 mouseY
 			ARG 5 button
-	CLASS dcd$d ServerItem
+	CLASS d ServerItem
 		FIELD b screen Ldcc;
 		FIELD c client Lcvo;
 		FIELD d server Ldhu;

mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternatesWidget.mapping

@@ -1,6 +1,6 @@
 CLASS dcj net/minecraft/client/gui/screen/recipebook/RecipeAlternatesWidget
-	CLASS dcj$a AlternateButtonWidget
+	CLASS a AlternateButtonWidget
-		CLASS dcj$a$a InputSlot
+		CLASS a InputSlot
 		FIELD a slots Ljava/util/List;
 		FIELD c recipe Lbem;
 		FIELD d isCraftable Z
@@ -14,7 +14,7 @@ CLASS dcj net/minecraft/client/gui/screen/recipebook/RecipeAlternatesWidget
 			ARG 1 mouseX
 			ARG 2 mouseY
 			ARG 3 delta
-	CLASS dcj$b
+	CLASS b
 		METHOD <init> (Ldcj;IILbem;Z)V
 			ARG 2 x
 			ARG 3 y

mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots.mapping

@@ -1,5 +1,5 @@
 CLASS dci net/minecraft/client/gui/screen/recipebook/RecipeBookGhostSlots
-	CLASS dci$a GhostInputSlot
+	CLASS a GhostInputSlot
 		FIELD b ingredient Lbej;
 		FIELD c x I
 		FIELD d y I

mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackListWidget.mapping

@@ -1,5 +1,5 @@
 CLASS dcx net/minecraft/client/gui/screen/resourcepack/ResourcePackListWidget
-	CLASS dcx$a ResourcePackEntry
+	CLASS a ResourcePackEntry
 		FIELD a client Lcvo;
 		FIELD b screen Ldcu;
 		FIELD c widget Ldcx;

mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping

@@ -1,5 +1,5 @@
 CLASS ddg net/minecraft/client/gui/screen/world/WorldListWidget
-	CLASS ddg$a LevelItem
+	CLASS a LevelItem
 		FIELD b client Lcvo;
 		FIELD c screen Lddf;
 		FIELD d level Lcok;

mappings/net/minecraft/client/gui/widget/AlwaysSelectedEntryListWidget.mapping

@@ -1,2 +1,2 @@
 CLASS cxe net/minecraft/client/gui/widget/AlwaysSelectedEntryListWidget
-	CLASS cxe$a Entry
+	CLASS a Entry

mappings/net/minecraft/client/gui/widget/ButtonListWidget.mapping

@@ -1,5 +1,5 @@
 CLASS cxg net/minecraft/client/gui/widget/ButtonListWidget
-	CLASS cxg$a ButtonEntry
+	CLASS a ButtonEntry
 		FIELD a buttons Ljava/util/List;
 		METHOD <init> (Ljava/util/List;)V
 			ARG 1 buttons

mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping

@@ -1,5 +1,5 @@
 CLASS cwu net/minecraft/client/gui/widget/ButtonWidget
-	CLASS cwu$a PressAction
+	CLASS a PressAction
 		METHOD onPress (Lcwu;)V
 			ARG 1 button
 	METHOD <init> (IIIILjava/lang/String;Lcwu$a;)V

mappings/net/minecraft/client/gui/widget/ElementListWidget.mapping

@@ -1,5 +1,5 @@
 CLASS cwy net/minecraft/client/gui/widget/ElementListWidget
-	CLASS cwy$a Entry
+	CLASS a Entry
 		FIELD a focused Lcxq;
 		FIELD b dragging Z
 		METHOD setDragging (Z)V

mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping

@@ -1,5 +1,5 @@
 CLASS cwq net/minecraft/client/gui/widget/EntryListWidget
-	CLASS cwq$a Entry
+	CLASS a Entry
 		METHOD isMouseOver (DD)Z
 			ARG 1 mouseX
 			ARG 3 mouseY
@@ -13,7 +13,7 @@ CLASS cwq net/minecraft/client/gui/widget/EntryListWidget
 			ARG 7 mouseY
 			ARG 8 hovering
 			ARG 9 delta
-	CLASS cwq$b Entries
+	CLASS b Entries
 		FIELD b entries Ljava/util/List;
 		METHOD add (ILjava/lang/Object;)V
 			ARG 1 index

mappings/net/minecraft/client/gui/widget/LockButtonWidget.mapping

@@ -1,5 +1,5 @@
 CLASS cxd net/minecraft/client/gui/widget/LockButtonWidget
-	CLASS cxd$a IconLocation
+	CLASS a IconLocation
 		FIELD g u I
 		FIELD h v I
 		METHOD <init> (Ljava/lang/String;III)V

mappings/net/minecraft/client/item/TooltipContext.mapping

@@ -1,5 +1,5 @@
 CLASS bdm net/minecraft/client/item/TooltipContext
-	CLASS bdm$a Default
+	CLASS a Default
 		FIELD c advanced Z
 		METHOD <init> (Ljava/lang/String;IZ)V
 			ARG 3 advanced

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

@@ -1,5 +1,5 @@
 CLASS dhl net/minecraft/client/network/ClientAdvancementManager
-	CLASS dhl$a Listener
+	CLASS a Listener
 		METHOD a setProgress (Lq;Ls;)V
 		METHOD e selectTab (Lq;)V
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;

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

@@ -1,9 +1,9 @@
 CLASS dxq net/minecraft/client/network/LanServerQueryManager
-	CLASS dxq$a LanServerDetector
+	CLASS a LanServerDetector
 		FIELD a entryList Ldxq$b;
 		FIELD b multicastAddress Ljava/net/InetAddress;
 		FIELD c socket Ljava/net/MulticastSocket;
-	CLASS dxq$b LanServerEntryList
+	CLASS b LanServerEntryList
 		FIELD a serverEntries Ljava/util/List;
 		FIELD b dirty Z
 		METHOD a needsUpdate ()Z

mappings/net/minecraft/client/network/packet/BossBarS2CPacket.mapping

@@ -1,5 +1,5 @@
 CLASS kr net/minecraft/client/network/packet/BossBarS2CPacket
-	CLASS kr$a Type
+	CLASS a Type
 	FIELD a uuid Ljava/util/UUID;
 	FIELD b type Lkr$a;
 	FIELD c name Ljn;

mappings/net/minecraft/client/network/packet/ChunkDeltaUpdateS2CPacket.mapping

@@ -1,5 +1,5 @@
 CLASS ku net/minecraft/client/network/packet/ChunkDeltaUpdateS2CPacket
-	CLASS ku$a ChunkDeltaRecord
+	CLASS a ChunkDeltaRecord
 		FIELD b pos S
 		FIELD c state Lbvo;
 		METHOD a getBlockPos ()Lev;

mappings/net/minecraft/client/network/packet/CombatEventS2CPacket.mapping

@@ -1,5 +1,5 @@
 CLASS ma net/minecraft/client/network/packet/CombatEventS2CPacket
-	CLASS ma$a Type
+	CLASS a Type
 	FIELD a type Lma$a;
 	FIELD b entityId I
 	FIELD c attackerEntityId I

mappings/net/minecraft/client/network/packet/CommandTreeS2CPacket.mapping

@@ -1,5 +1,5 @@
 CLASS kw net/minecraft/client/network/packet/CommandTreeS2CPacket
-	CLASS kw$a CommandNodeData
+	CLASS a CommandNodeData
 		FIELD a argumentBuilder Lcom/mojang/brigadier/builder/ArgumentBuilder;
 		FIELD b flags B
 		FIELD c redirectNodeIndex I

mappings/net/minecraft/client/network/packet/EntityAttributesS2CPacket.mapping

@@ -1,5 +1,5 @@
 CLASS nm net/minecraft/client/network/packet/EntityAttributesS2CPacket
-	CLASS nm$a Entry
+	CLASS a Entry
 		FIELD b id Ljava/lang/String;
 		FIELD c baseValue D
 		FIELD d modifiers Ljava/util/Collection;

mappings/net/minecraft/client/network/packet/EntityS2CPacket.mapping

@@ -1,7 +1,7 @@
 CLASS lt net/minecraft/client/network/packet/EntityS2CPacket
-	CLASS lt$a MoveRelative
+	CLASS a MoveRelative
-	CLASS lt$b RotateAndMoveRelative
+	CLASS b RotateAndMoveRelative
-	CLASS lt$c Rotate
+	CLASS c Rotate
 	FIELD a id I
 	FIELD b deltaX S
 	FIELD c deltaY S

mappings/net/minecraft/client/network/packet/PlayerListS2CPacket.mapping

@@ -1,6 +1,6 @@
 CLASS mb net/minecraft/client/network/packet/PlayerListS2CPacket
-	CLASS mb$a Action
+	CLASS a Action
-	CLASS mb$b Entry
+	CLASS b Entry
 		FIELD b latency I
 		FIELD c gameMode Lbhj;
 		FIELD d profile Lcom/mojang/authlib/GameProfile;

mappings/net/minecraft/client/network/packet/PlayerPositionLookS2CPacket.mapping

@@ -1,5 +1,5 @@
 CLASS md net/minecraft/client/network/packet/PlayerPositionLookS2CPacket
-	CLASS md$a Flag
+	CLASS a Flag
 		FIELD f shift I
 		METHOD a getMask ()I
 		METHOD a getFlags (I)Ljava/util/Set;

mappings/net/minecraft/client/network/packet/TitleS2CPacket.mapping

@@ -1,5 +1,5 @@
 CLASS nd net/minecraft/client/network/packet/TitleS2CPacket
-	CLASS nd$a Action
+	CLASS a Action
 	FIELD a action Lnd$a;
 	FIELD b text Ljn;
 	FIELD c fadeInTicks I

mappings/net/minecraft/client/network/packet/UnlockRecipesS2CPacket.mapping

@@ -1,5 +1,5 @@
 CLASS me net/minecraft/client/network/packet/UnlockRecipesS2CPacket
-	CLASS me$a Action
+	CLASS a Action
 	FIELD a action Lme$a;
 	FIELD b recipeIdsToChange Ljava/util/List;
 	FIELD c recipeIdsToInit Ljava/util/List;

mappings/net/minecraft/client/network/packet/WorldBorderS2CPacket.mapping

@@ -1,5 +1,5 @@
 CLASS ml net/minecraft/client/network/packet/WorldBorderS2CPacket
-	CLASS ml$a Type
+	CLASS a Type
 	FIELD a type Lml$a;
 	FIELD b portalTeleportPosLimit I
 	FIELD c centerX D

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

@@ -1,5 +1,5 @@
 CLASS dhu net/minecraft/client/options/ServerEntry
-	CLASS dhu$a ResourcePackState
+	CLASS a ResourcePackState
 		FIELD d name Ljn;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 			ARG 3 name

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

@@ -1,5 +1,5 @@
 CLASS dia net/minecraft/client/particle/BarrierParticle
-	CLASS dia$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDLbhl;)V
 		ARG 1 world
 		ARG 2 x

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

@@ -1,5 +1,5 @@
 CLASS djq net/minecraft/client/particle/BlockCrackParticle
-	CLASS djq$a Factory
+	CLASS a Factory
 	FIELD C block Lbvo;
 	FIELD F blockPos Lev;
 	METHOD <init> (Lbhm;DDDDDDLbvo;)V

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

@@ -1,5 +1,5 @@
 CLASS din net/minecraft/client/particle/BlockFallingDustParticle
-	CLASS din$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDFFFLdjm;)V
 		ARG 1 world
 		ARG 2 x

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

@@ -1,5 +1,5 @@
 CLASS dii net/minecraft/client/particle/BlockLeakParticle
-	CLASS dii$a DrippingLavaParticle
+	CLASS a DrippingLavaParticle
 		METHOD <init> (Lbhm;DDDLcle;Lge;)V
 			ARG 1 world
 			ARG 2 x
@@ -7,7 +7,7 @@ CLASS dii net/minecraft/client/particle/BlockLeakParticle
 			ARG 6 z
 			ARG 8 fluid
 			ARG 9 nextParticle
-	CLASS dii$b FallingParticle
+	CLASS b FallingParticle
 		FIELD C nextParticle Lge;
 		METHOD <init> (Lbhm;DDDLcle;Lge;)V
 			ARG 1 world
@@ -16,7 +16,7 @@ CLASS dii net/minecraft/client/particle/BlockLeakParticle
 			ARG 6 z
 			ARG 8 fluid
 			ARG 9 nextParticle
-	CLASS dii$c DrippingParticle
+	CLASS c DrippingParticle
 		FIELD C nextParticle Lge;
 		METHOD <init> (Lbhm;DDDLcle;Lge;)V
 			ARG 1 world
@@ -25,22 +25,22 @@ CLASS dii net/minecraft/client/particle/BlockLeakParticle
 			ARG 6 z
 			ARG 8 fluid
 			ARG 9 nextParticle
-	CLASS dii$d LandingParticle
+	CLASS d LandingParticle
-	CLASS dii$e FallingLavaFactory
+	CLASS e FallingLavaFactory
 		FIELD a spriteProvider Ldjm;
 		METHOD <init> (Ldjm;)V
 			ARG 1 spriteProvider
-	CLASS dii$f DrippingLavaFactory
+	CLASS f DrippingLavaFactory
 		FIELD a spriteProvider Ldjm;
 		METHOD <init> (Ldjm;)V
 			ARG 1 spriteProvider
-	CLASS dii$g LandingLavaFactory
+	CLASS g LandingLavaFactory
 		FIELD a spriteProvider Ldjm;
-	CLASS dii$h FallingWaterFactory
+	CLASS h FallingWaterFactory
 		FIELD a spriteProvider Ldjm;
 		METHOD <init> (Ldjm;)V
 			ARG 1 spriteProvider
-	CLASS dii$i DrippingWaterFactory
+	CLASS i DrippingWaterFactory
 		FIELD a spriteProvider Ldjm;
 	FIELD C fluid Lcle;
 	METHOD <init> (Lbhm;DDDLcle;)V

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

@@ -1,5 +1,5 @@
 CLASS did net/minecraft/client/particle/BubbleColumnUpParticle
-	CLASS did$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDDD)V
 		ARG 1 world
 		ARG 2 x

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

@@ -1,5 +1,5 @@
 CLASS die net/minecraft/client/particle/BubblePopParticle
-	CLASS die$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDDDLdjm;)V
 		ARG 2 x
 		ARG 4 y

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

@@ -1,6 +1,6 @@
 CLASS dje net/minecraft/client/particle/CloudParticle
-	CLASS dje$a CloudFactory
+	CLASS a CloudFactory
-	CLASS dje$b SneezeFactory
+	CLASS b SneezeFactory
 	METHOD <init> (Lbhm;DDDDDDLdjm;)V
 		ARG 2 x
 		ARG 4 y

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

@@ -1,7 +1,7 @@
 CLASS dib net/minecraft/client/particle/CrackParticle
-	CLASS dib$a ItemFactory
+	CLASS a ItemFactory
-	CLASS dib$b SlimeballFactory
+	CLASS b SlimeballFactory
-	CLASS dib$c SnowballFactory
+	CLASS c SnowballFactory
 	METHOD <init> (Lbhm;DDDDDDLbce;)V
 		ARG 1 world
 		ARG 2 x

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

@@ -1,5 +1,5 @@
 CLASS djv net/minecraft/client/particle/CurrentDownParticle
-	CLASS djv$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDD)V
 		ARG 2 x
 		ARG 4 y

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

@@ -1,6 +1,6 @@
 CLASS dig net/minecraft/client/particle/DamageParticle
-	CLASS dig$a DefaultFactory
+	CLASS a DefaultFactory
-	CLASS dig$b EnchantedHitFactory
+	CLASS b EnchantedHitFactory
 	METHOD <init> (Lbhm;DDDDDD)V
 		ARG 1 world
 		ARG 2 x

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

@@ -1,5 +1,5 @@
 CLASS dih net/minecraft/client/particle/DragonBreathParticle
-	CLASS dih$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDDDLdjm;)V
 		ARG 1 world
 		ARG 2 x

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

@@ -1,5 +1,5 @@
 CLASS diw net/minecraft/client/particle/ElderGuardianAppearanceParticle
-	CLASS diw$a Factory
+	CLASS a Factory
 	FIELD C guardian Laiu;
 	METHOD <init> (Lbhm;DDD)V
 		ARG 2 x

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

@@ -1,6 +1,6 @@
 CLASS diq net/minecraft/client/particle/EmotionParticle
-	CLASS diq$a AngryVillagerFactory
+	CLASS a AngryVillagerFactory
-	CLASS diq$b HeartFactory
+	CLASS b HeartFactory
 	METHOD <init> (Lbhm;DDD)V
 		ARG 2 x
 		ARG 4 y

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

@@ -1,6 +1,6 @@
 CLASS dik net/minecraft/client/particle/EnchantGlyphParticle
-	CLASS dik$a NautilusFactory
+	CLASS a NautilusFactory
-	CLASS dik$b EnchantFactory
+	CLASS b EnchantFactory
 	FIELD C startX D
 	FIELD F startY D
 	FIELD G startZ D

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

@@ -1,5 +1,5 @@
 CLASS dil net/minecraft/client/particle/EndRodParticle
-	CLASS dil$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDDDLdjm;)V
 		ARG 2 x
 		ARG 4 y

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

@@ -1,5 +1,5 @@
 CLASS dis net/minecraft/client/particle/ExplosionEmitterParticle
-	CLASS dis$a Factory
+	CLASS a Factory
 	FIELD C age_ I
 	FIELD D maxAge_ I
 	METHOD <init> (Lbhm;DDD)V

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

@@ -1,5 +1,5 @@
 CLASS dir net/minecraft/client/particle/ExplosionLargeParticle
-	CLASS dir$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDLdjm;)V
 		ARG 2 x
 		ARG 4 y

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

@@ -1,5 +1,5 @@
 CLASS dim net/minecraft/client/particle/ExplosionSmokeParticle
-	CLASS dim$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDDDLdjm;)V
 		ARG 1 world
 		ARG 2 x

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

@@ -1,5 +1,5 @@
 CLASS diu net/minecraft/client/particle/FireSmokeLargeParticle
-	CLASS diu$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDDDLdjm;)V
 		ARG 1 world
 		ARG 2 x

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

@@ -1,5 +1,5 @@
 CLASS dji net/minecraft/client/particle/FireSmokeParticle
-	CLASS dji$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDDDFLdjm;)V
 		ARG 2 x
 		ARG 4 y

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

@@ -1,11 +1,11 @@
 CLASS dio net/minecraft/client/particle/FireworksSparkParticle
-	CLASS dio$a FlashFactory
+	CLASS a FlashFactory
 		FIELD a spriteProvider Ldjm;
-	CLASS dio$b FlashParticle
+	CLASS b FlashParticle
 		METHOD <init> (Lbhm;DDD)V
 			ARG 1 x
 			ARG 2 y
-	CLASS dio$c ExplosionParticle
+	CLASS c ExplosionParticle
 		FIELD F trail Z
 		FIELD G flicker Z
 		FIELD H particleManager Ldjb;
@@ -17,11 +17,11 @@ CLASS dio net/minecraft/client/particle/FireworksSparkParticle
 			ARG 1 trail
 		METHOD b setFlicker (Z)V
 			ARG 1 flicker
-	CLASS dio$d ExplosionFactory
+	CLASS d ExplosionFactory
 		FIELD a spriteProvider Ldjm;
 		METHOD <init> (Ldjm;)V
 			ARG 1 spriteProvider
-	CLASS dio$e FireworkParticle
+	CLASS e FireworkParticle
 		FIELD C age I
 		FIELD D particleManager Ldjb;
 		FIELD E explosions Lij;

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

@@ -1,5 +1,5 @@
 CLASS dju net/minecraft/client/particle/FishingParticle
-	CLASS dju$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDDDLdjm;)V
 		ARG 2 x
 		ARG 4 y

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

@@ -1,5 +1,5 @@
 CLASS dip net/minecraft/client/particle/FlameParticle
-	CLASS dip$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDDD)V
 		ARG 2 x
 		ARG 4 y

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

@@ -1,5 +1,5 @@
 CLASS div net/minecraft/client/particle/LavaEmberParticle
-	CLASS div$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDD)V
 		ARG 2 x
 		ARG 4 y

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

@@ -1,5 +1,5 @@
 CLASS diy net/minecraft/client/particle/NoteParticle
-	CLASS diy$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDD)V
 		ARG 1 world
 		ARG 2 x

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

@@ -1,5 +1,5 @@
 CLASS djb net/minecraft/client/particle/ParticleManager
-	CLASS djb$a SimpleSpriteProvider
+	CLASS a SimpleSpriteProvider
 		FIELD b sprites Ljava/util/List;
 		METHOD a setSprites (Ljava/util/List;)V
 			ARG 1 sprites

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

@@ -1,5 +1,5 @@
 CLASS djf net/minecraft/client/particle/PortalParticle
-	CLASS djf$a Factory
+	CLASS a Factory
 	FIELD C startX D
 	FIELD F startY D
 	FIELD G startZ D

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

@@ -1,5 +1,5 @@
 CLASS djw net/minecraft/client/particle/RainSplashParticle
-	CLASS djw$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDD)V
 		ARG 1 world
 		ARG 2 x

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

@@ -1,5 +1,5 @@
 CLASS dij net/minecraft/client/particle/RedDustParticle
-	CLASS dij$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDDDLgc;Ldjm;)V
 		ARG 2 x
 		ARG 4 y

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

@@ -1,7 +1,7 @@
 CLASS djj net/minecraft/client/particle/SpellParticle
-	CLASS djj$a EntityAmbientFactory
+	CLASS a EntityAmbientFactory
-	CLASS djj$b InstantFactory
+	CLASS b InstantFactory
-	CLASS djj$c EntityFactory
+	CLASS c EntityFactory
-	CLASS djj$d DefaultFactory
+	CLASS d DefaultFactory
-	CLASS djj$e WitchFactory
+	CLASS e WitchFactory
 	FIELD C RANDOM Ljava/util/Random;

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

@@ -1,5 +1,5 @@
 CLASS djk net/minecraft/client/particle/SpitParticle
-	CLASS djk$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDDDLdjm;)V
 		ARG 1 world
 		ARG 2 x

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

@@ -1,5 +1,5 @@
 CLASS djn net/minecraft/client/particle/SquidInkParticle
-	CLASS djn$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDDDLdjm;)V
 		ARG 2 x
 		ARG 4 y

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

@@ -1,7 +1,7 @@
 CLASS djp net/minecraft/client/particle/SuspendParticle
-	CLASS djp$b DolphinFactory
+	CLASS b DolphinFactory
-	CLASS djp$c HappyVillagerFactory
+	CLASS c HappyVillagerFactory
-	CLASS djp$d MyceliumFactory
+	CLASS d MyceliumFactory
 	METHOD <init> (Lbhm;DDDDDD)V
 		ARG 2 x
 		ARG 4 y

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

@@ -1,5 +1,5 @@
 CLASS dhz net/minecraft/client/particle/SweepAttackParticle
-	CLASS dhz$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDLdjm;)V
 		ARG 2 x
 		ARG 4 y

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

@@ -1,5 +1,5 @@
 CLASS djs net/minecraft/client/particle/TotemParticle
-	CLASS djs$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDDDLdjm;)V
 		ARG 2 x
 		ARG 4 y

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

@@ -1,5 +1,5 @@
 CLASS dic net/minecraft/client/particle/WaterBubbleParticle
-	CLASS dic$a Factory
+	CLASS a Factory
 	METHOD <init> (Lbhm;DDDDDD)V
 		ARG 1 world
 		ARG 2 x

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

@@ -1,2 +1,2 @@
 CLASS djl net/minecraft/client/particle/WaterSplashParticle
-	CLASS djl$a SplashFactory
+	CLASS a SplashFactory

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

@@ -1,5 +1,5 @@
 CLASS djo net/minecraft/client/particle/WaterSuspendParticle
-	CLASS djo$a UnderwaterFactory
+	CLASS a UnderwaterFactory
 	METHOD <init> (Lbhm;DDD)V
 		ARG 2 x
 		ARG 4 y

mappings/net/minecraft/client/render/BufferBuilder.mapping

@@ -1,5 +1,5 @@
 CLASS cup net/minecraft/client/render/BufferBuilder
-	CLASS cup$a State
+	CLASS a State
 		FIELD b rawBuffer [I
 		FIELD c format Lcuv;
 		METHOD <init> (Lcup;[ILcuv;)V

mappings/net/minecraft/client/render/VertexFormatElement.mapping

@@ -1,5 +1,5 @@
 CLASS cuw net/minecraft/client/render/VertexFormatElement
-	CLASS cuw$a Format
+	CLASS a Format
 		FIELD b UBYTE Lcuw$a;
 		FIELD d USHORT Lcuw$a;
 		FIELD f UINT Lcuw$a;
@@ -13,7 +13,7 @@ CLASS cuw net/minecraft/client/render/VertexFormatElement
 		METHOD a getSize ()I
 		METHOD b getName ()Ljava/lang/String;
 		METHOD c getGlId ()I
-	CLASS cuw$b Type
+	CLASS b Type
 		FIELD c COLOR Lcuw$b;
 		FIELD e MATRIX Lcuw$b;
 		FIELD h name Ljava/lang/String;

mappings/net/minecraft/client/render/WorldRenderer.mapping

@@ -1,5 +1,5 @@
 CLASS dks net/minecraft/client/render/WorldRenderer
-	CLASS dks$a ChunkInfo
+	CLASS a ChunkInfo
 		FIELD b renderer Ldnk;
 		METHOD <init> (Ldks;Ldnk;Lfa;I)V
 			ARG 1 renderer

mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping

@@ -1,22 +1,22 @@
 CLASS dlk net/minecraft/client/render/block/BlockModelRenderer
-	CLASS dlk$a NeighborData
+	CLASS a NeighborData
 		FIELD g faces [Lfa;
 		FIELD h nonCubicWeight Z
 		METHOD a getData (Lfa;)Ldlk$a;
-	CLASS dlk$b AmbientOcclusionCalculator
+	CLASS b AmbientOcclusionCalculator
 		FIELD b colorMultiplier [F
 		FIELD c brightness [I
 		METHOD a getAmbientOcclusionBrightness (IIII)I
 		METHOD a getBrightness (IIIIFFFF)I
 		METHOD a apply (Lbgu;Lbvo;Lev;Lfa;[FLjava/util/BitSet;)V
-	CLASS dlk$c Translation
+	CLASS c Translation
 		FIELD g firstCorner I
 		FIELD h secondCorner I
 		FIELD i thirdCorner I
 		FIELD j fourthCorner I
 		FIELD k VALUES [Ldlk$c;
 		METHOD a getTranslations (Lfa;)Ldlk$c;
-	CLASS dlk$d BrightnessCache
+	CLASS d BrightnessCache
 		FIELD a enabled Z
 		FIELD b intCache Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap;
 		FIELD c floatCache Lit/unimi/dsi/fastutil/objects/Object2FloatLinkedOpenHashMap;
@@ -30,7 +30,7 @@ CLASS dlk net/minecraft/client/render/block/BlockModelRenderer
 			ARG 1 state
 			ARG 2 blockView
 			ARG 3 pos
-	CLASS dlk$e NeighborOrientation
+	CLASS e NeighborOrientation
 		FIELD m shape I
 	FIELD a colorMap Lcwb;
 	FIELD b brightnessCache Ljava/lang/ThreadLocal;

mappings/net/minecraft/client/render/block/entity/ConduitBlockEntityRenderer.mapping

@@ -1,14 +1,14 @@
 CLASS dmt net/minecraft/client/render/block/entity/ConduitBlockEntityRenderer
-	CLASS dmt$a CageModel
+	CLASS a CageModel
 		FIELD a cuboid Ldhh;
 		METHOD a render (FFFFFF)V
-	CLASS dmt$b EyeModel
+	CLASS b EyeModel
 		FIELD a cuboid Ldhh;
 		METHOD a render (FFFFFF)V
-	CLASS dmt$c BaseModel
+	CLASS c BaseModel
 		FIELD a cuboid Ldhh;
 		METHOD a render (FFFFFF)V
-	CLASS dmt$d WindModel
+	CLASS d WindModel
 		FIELD a cuboids [Ldhh;
 		METHOD a render (FFFFFF)V
 	FIELD c BASE_TEX Lqt;

mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping

@@ -1,5 +1,5 @@
 CLASS dng net/minecraft/client/render/chunk/ChunkBatcher
-	CLASS dng$a ChunkUploadTask
+	CLASS a ChunkUploadTask
 		FIELD b task Lcom/google/common/util/concurrent/ListenableFutureTask;
 		FIELD c priority D
 		METHOD <init> (Ldng;Lcom/google/common/util/concurrent/ListenableFutureTask;D)V

mappings/net/minecraft/client/render/chunk/ChunkRenderTask.mapping

@@ -1,6 +1,6 @@
 CLASS dnf net/minecraft/client/render/chunk/ChunkRenderTask
-	CLASS dnf$a Stage
+	CLASS a Stage
-	CLASS dnf$b Mode
+	CLASS b Mode
 	FIELD a chunkRenderer Ldnk;
 	FIELD b lock Ljava/util/concurrent/locks/ReentrantLock;
 	FIELD c completionActions Ljava/util/List;

mappings/net/minecraft/client/render/debug/ChunkLoadingDebugRenderer.mapping

@@ -1,5 +1,5 @@
 CLASS dnx net/minecraft/client/render/debug/ChunkLoadingDebugRenderer
-	CLASS dnx$a ServerData
+	CLASS a ServerData
 	FIELD a client Lcvo;
 	FIELD b lastUpdateTime D
 	FIELD d serverData Ldnx$a;

mappings/net/minecraft/client/render/debug/DebugRenderer.mapping

@@ -1,5 +1,5 @@
 CLASS dnz net/minecraft/client/render/debug/DebugRenderer
-	CLASS dnz$a Renderer
+	CLASS a Renderer
 		METHOD a render (J)V
 	FIELD a pathfindingDebugRenderer Ldoe;
 	FIELD b waterDebugRenderer Ldnz$a;

mappings/net/minecraft/client/render/entity/feature/TridentRiptideFeatureRenderer.mapping

@@ -1,5 +1,5 @@
 CLASS dtq net/minecraft/client/render/entity/feature/TridentRiptideFeatureRenderer
-	CLASS dtq$a TridentRiptideModel
+	CLASS a TridentRiptideModel
 	FIELD a TEXTURE Lqt;
 	FIELD b model Ldtq$a;
 	METHOD <init> (Ldrd;)V

mappings/net/minecraft/client/render/entity/feature/VillagerResourceMetadata.mapping

@@ -1,5 +1,5 @@
 CLASS dvr net/minecraft/client/render/entity/feature/VillagerResourceMetadata
-	CLASS dvr$a HatType
+	CLASS a HatType
 		FIELD d byName Ljava/util/Map;
 		FIELD e name Ljava/lang/String;
 		METHOD a getName ()Ljava/lang/String;

mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping

@@ -1,5 +1,5 @@
 CLASS dfb net/minecraft/client/render/entity/model/BipedEntityModel
-	CLASS dfb$a ArmPose
+	CLASS a ArmPose
 	FIELD f head Ldhh;
 	FIELD g headwear Ldhh;
 	FIELD h body Ldhh;

mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping

@@ -1,2 +1,2 @@
 CLASS dfn net/minecraft/client/render/entity/model/ParrotEntityModel
-	CLASS dfn$a Pose
+	CLASS a Pose

mappings/net/minecraft/client/render/model/BasicBakedModel.mapping

@@ -1,5 +1,5 @@
 CLASS dwj net/minecraft/client/render/model/BasicBakedModel
-	CLASS dwj$a Builder
+	CLASS a Builder
 		FIELD a quads Ljava/util/List;
 		FIELD b faceQuads Ljava/util/Map;
 		FIELD c itemPropertyOverrides Ldlw;

mappings/net/minecraft/client/render/model/CubeFace.mapping

@@ -1,12 +1,12 @@
 CLASS dkm net/minecraft/client/render/model/CubeFace
-	CLASS dkm$a DirectionIds
+	CLASS a DirectionIds
 		FIELD a SOUTH I
 		FIELD b UP I
 		FIELD c EAST I
 		FIELD d NORTH I
 		FIELD e DOWN I
 		FIELD f WEST I
-	CLASS dkm$b Corner
+	CLASS b Corner
 		FIELD a xSide I
 		FIELD b ySide I
 		FIELD c zSide I

mappings/net/minecraft/client/render/model/ModelLoader.mapping

@@ -1,5 +1,5 @@
 CLASS dwe net/minecraft/client/render/model/ModelLoader
-	CLASS dwe$a ModelLoaderException
+	CLASS a ModelLoaderException
 	FIELD A STATIC_DEFINITIONS Ljava/util/Map;
 	FIELD B resourceManager Lxg;
 	FIELD C spriteAtlas Ldum;

mappings/net/minecraft/client/render/model/MultipartBakedModel.mapping

@@ -1,5 +1,5 @@
 CLASS dwi net/minecraft/client/render/model/MultipartBakedModel
-	CLASS dwi$a Builder
+	CLASS a Builder
 		FIELD a components Ljava/util/List;
 		METHOD a build ()Ldwb;
 		METHOD a addComponent (Ljava/util/function/Predicate;Ldwb;)V

mappings/net/minecraft/client/render/model/MultipartUnbakedModel.mapping

@@ -1,5 +1,5 @@
 CLASS dme net/minecraft/client/render/model/MultipartUnbakedModel
-	CLASS dme$a Deserializer
+	CLASS a Deserializer
 		FIELD a context Ldlr$a;
 		METHOD <init> (Ldlr$a;)V
 			ARG 1 context

mappings/net/minecraft/client/render/model/WeightedBakedModel.mapping

@@ -1,11 +1,11 @@
 CLASS dwl net/minecraft/client/render/model/WeightedBakedModel
-	CLASS dwl$a Builder
+	CLASS a Builder
 		FIELD a models Ljava/util/List;
 		METHOD a getFirst ()Ldwb;
 		METHOD a add (Ldwb;I)Ldwl$a;
 			ARG 1 model
 			ARG 2 weight
-	CLASS dwl$b ModelEntry
+	CLASS b ModelEntry
 		FIELD b model Ldwb;
 		METHOD <init> (Ldwb;I)V
 			ARG 1 model

mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping

@@ -1,10 +1,10 @@
 CLASS dlq net/minecraft/client/render/model/json/JsonUnbakedModel
-	CLASS dlq$a TextureResolutionContext
+	CLASS a TextureResolutionContext
 		FIELD a root Ldlq;
 		FIELD b current Ldlq;
 		METHOD <init> (Ldlq;)V
 			ARG 1 root
-	CLASS dlq$b Deserializer
+	CLASS b Deserializer
 		METHOD a deserializeOverrides (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/List;
 			ARG 1 context
 			ARG 2 object

mappings/net/minecraft/client/render/model/json/ModelElement.mapping

@@ -1,5 +1,5 @@
 CLASS dlm net/minecraft/client/render/model/json/ModelElement
-	CLASS dlm$a Deserializer
+	CLASS a Deserializer
 		METHOD a deserializeFacesValidating (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/Map;
 			ARG 1 context
 			ARG 2 object

mappings/net/minecraft/client/render/model/json/ModelElementFace.mapping

@@ -1,5 +1,5 @@
 CLASS dln net/minecraft/client/render/model/json/ModelElementFace
-	CLASS dln$a Deserializer
+	CLASS a Deserializer
 		METHOD a (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ldln;
 			ARG 1 element
 			ARG 2 type

mappings/net/minecraft/client/render/model/json/ModelElementTexture.mapping

@@ -1,5 +1,5 @@
 CLASS dlp net/minecraft/client/render/model/json/ModelElementTexture
-	CLASS dlp$a Deserializer
+	CLASS a Deserializer
 		METHOD a (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ldlp;
 			ARG 1 element
 			ARG 2 type

mappings/net/minecraft/client/render/model/json/ModelItemOverride.mapping

@@ -1,5 +1,5 @@
 CLASS dlv net/minecraft/client/render/model/json/ModelItemOverride
-	CLASS dlv$a Deserializer
+	CLASS a Deserializer
 		METHOD a (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ldlv;
 			ARG 1 element
 			ARG 2 type

mappings/net/minecraft/client/render/model/json/ModelTransformation.mapping

@@ -1,5 +1,5 @@
 CLASS dly net/minecraft/client/render/model/json/ModelTransformation
-	CLASS dly$a Deserializer
+	CLASS a Deserializer
 		METHOD a parseModelTransformation (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;Ljava/lang/String;)Ldlx;
 			ARG 1 ctx
 			ARG 2 json
@@ -12,7 +12,7 @@ CLASS dly net/minecraft/client/render/model/json/ModelTransformation
 			ARG 1 functionJson
 			ARG 2 unused
 			ARG 3 context
-	CLASS dly$b Type
+	CLASS b Type
 	FIELD a NONE Ldly;
 	FIELD b globalTranslationX F
 	FIELD c globalTranslationY F

mappings/net/minecraft/client/render/model/json/ModelVariant.mapping

@@ -1,5 +1,5 @@
 CLASS dma net/minecraft/client/render/model/json/ModelVariant
-	CLASS dma$a Deserializer
+	CLASS a Deserializer
 		METHOD a deserializeRotation (Lcom/google/gson/JsonObject;)Ldwc;
 			ARG 1 object
 		METHOD b deserializeModel (Lcom/google/gson/JsonObject;)Lqt;

mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping

@@ -1,11 +1,11 @@
 CLASS dlr net/minecraft/client/render/model/json/ModelVariantMap
-	CLASS dlr$a DeserializationContext
+	CLASS a DeserializationContext
 		FIELD a gson Lcom/google/gson/Gson;
 		FIELD b stateFactory Lbvp;
 		METHOD a getStateFactory ()Lbvp;
 		METHOD a setStateFactory (Lbvp;)V
 			ARG 1 stateFactory
-	CLASS dlr$b Deserializer
+	CLASS b Deserializer
 		METHOD a deserializeVariants (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/Map;
 			ARG 1 context
 			ARG 2 object

mappings/net/minecraft/client/render/model/json/MultipartModelComponent.mapping

@@ -1,5 +1,5 @@
 CLASS dmg net/minecraft/client/render/model/json/MultipartModelComponent
-	CLASS dmg$a Deserializer
+	CLASS a Deserializer
 		METHOD a (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ldmg;
 			ARG 1 element
 			ARG 2 type

mappings/net/minecraft/client/render/model/json/Transformation.mapping

@@ -1,5 +1,5 @@
 CLASS dlx net/minecraft/client/render/model/json/Transformation
-	CLASS dlx$a Deserializer
+	CLASS a Deserializer
 		FIELD a DEFAULT_ROATATION Lb;
 		FIELD b DEFAULT_TRANSLATION Lb;
 		FIELD c DEFAULT_SCALE Lb;

mappings/net/minecraft/client/render/model/json/WeightedUnbakedModel.mapping

@@ -1,5 +1,5 @@
 CLASS dlz net/minecraft/client/render/model/json/WeightedUnbakedModel
-	CLASS dlz$a Deserializer
+	CLASS a Deserializer
 		METHOD a (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ldlz;
 			ARG 1 element
 			ARG 2 type

mappings/net/minecraft/client/search/IdentifierSearchableContainer.mapping

@@ -1,5 +1,5 @@
 CLASS dxh net/minecraft/client/search/IdentifierSearchableContainer
-	CLASS dxh$a Iterator
+	CLASS a Iterator
 	FIELD a byNamespace Ldxl;
 	FIELD b byPath Ldxl;
 	FIELD c identifierFinder Ljava/util/function/Function;

mappings/net/minecraft/client/search/SearchManager.mapping

@@ -1,5 +1,5 @@
 CLASS dxj net/minecraft/client/search/SearchManager
-	CLASS dxj$a Key
+	CLASS a Key
 	FIELD a ITEM_TOOLTIP Ldxj$a;
 	FIELD b ITEM_TAG Ldxj$a;
 	FIELD c RECIPE_OUTPUT Ldxj$a;

mappings/net/minecraft/client/search/TextSearchableContainer.mapping

@@ -1,4 +1,4 @@
 CLASS dxi net/minecraft/client/search/TextSearchableContainer
-	CLASS dxi$a Iterator
+	CLASS a Iterator
 	FIELD c byText Ldxl;
 	FIELD d textFinder Ljava/util/function/Function;

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

@@ -1,9 +1,9 @@
 CLASS dxe net/minecraft/client/sound/AmbientSoundLoops
-	CLASS dxe$a MusicLoop
+	CLASS a MusicLoop
 		FIELD o player Ldkb;
 		METHOD <init> (Ldkb;Lym;)V
 			ARG 1 player
 			ARG 2 soundEvent
-	CLASS dxe$b Underwater
+	CLASS b Underwater
 		FIELD o player Ldkb;
 		FIELD p transitionTimer I

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

@@ -1,5 +1,5 @@
 CLASS dxv net/minecraft/client/sound/Channel
-	CLASS dxv$a SourceManager
+	CLASS a SourceManager
 		FIELD b source Lcti;
 		FIELD c stopped Z
 		METHOD a isStopped ()Z

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

@@ -1,5 +1,5 @@
 CLASS dxw net/minecraft/client/sound/MusicTracker
-	CLASS dxw$a MusicType
+	CLASS a MusicType
 		FIELD i sound Lym;
 		FIELD j minDelay I
 		FIELD k maxDelay I

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

@@ -1,5 +1,5 @@
 CLASS ctl net/minecraft/client/sound/OggAudioStream
-	CLASS ctl$a ChannelList
+	CLASS a ChannelList
 		FIELD a buffers Ljava/util/List;
 		FIELD b size I
 		FIELD d buffer Ljava/nio/ByteBuffer;

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

@@ -1,5 +1,5 @@
 CLASS dwy net/minecraft/client/sound/Sound
-	CLASS dwy$a RegistrationType
+	CLASS a RegistrationType
 		FIELD b SOUND_EVENT Ldwy$a;
 		FIELD c name Ljava/lang/String;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V

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

@@ -1,16 +1,16 @@
 CLASS ctj net/minecraft/client/sound/SoundEngine
-	CLASS ctj$a SourceSet
+	CLASS a SourceSet
 		METHOD a createSource ()Lcti;
 		METHOD a release (Lcti;)Z
 		METHOD b close ()V
 		METHOD c getMaxSourceCount ()I
 		METHOD d getSourceCount ()I
-	CLASS ctj$b SourceSetImpl
+	CLASS b SourceSetImpl
 		FIELD a maxSourceCount I
 		FIELD b sources Ljava/util/Set;
 		METHOD <init> (I)V
 			ARG 1 maxSourceCount
-	CLASS ctj$c RunMode
+	CLASS c RunMode
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b devicePointer J
 	FIELD c contextPointer J

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

@@ -1,5 +1,5 @@
 CLASS dxb net/minecraft/client/sound/SoundInstance
-	CLASS dxb$a AttenuationType
+	CLASS a AttenuationType
 	METHOD a getId ()Lqt;
 	METHOD a getSoundSet (Ldyb;)Ldyc;
 		ARG 1 soundManager

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

@@ -1,5 +1,5 @@
 CLASS dyb net/minecraft/client/sound/SoundManager
-	CLASS dyb$a SoundList
+	CLASS a SoundList
 		FIELD a loadedSounds Ljava/util/Map;
 		METHOD a addTo (Ljava/util/Map;Ldxy;)V
 		METHOD a register (Lqt;Ldwz;Lxg;)V

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

@@ -1,5 +1,5 @@
 CLASS cuc net/minecraft/client/texture/NativeImage
-	CLASS cuc$a Format
+	CLASS a Format
 		FIELD e bytesPerPixel I
 		FIELD f pixelDataFormat I
 		METHOD a getBytesPerPixel ()I
@@ -7,7 +7,7 @@ CLASS cuc net/minecraft/client/texture/NativeImage
 		METHOD c setUnpackAlignment ()V
 		METHOD d getPixelDataFormat ()I
 		METHOD g hasLuminanceOrAlpha ()Z
-	CLASS cuc$c WriteCallback
+	CLASS c WriteCallback
 		FIELD a channel Ljava/nio/channels/WritableByteChannel;
 		FIELD b exception Ljava/io/IOException;
 		METHOD a throwStoredException ()V

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

@@ -1,5 +1,5 @@
 CLASS dvf net/minecraft/client/texture/PlayerSkinProvider
-	CLASS dvf$a SkinTextureAvailableCallback
+	CLASS a SkinTextureAvailableCallback
 	FIELD a EXECUTOR_SERVICE Ljava/util/concurrent/ExecutorService;
 	FIELD b textureManager Lduo;
 	FIELD c skinCacheDir Ljava/io/File;

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

@@ -1,5 +1,5 @@
 CLASS duj net/minecraft/client/texture/ResourceTexture
-	CLASS duj$a TextureData
+	CLASS a TextureData
 		FIELD a metadata Ldvy;
 		FIELD b image Lcuc;
 		FIELD c exception Ljava/io/IOException;

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

@@ -1,5 +1,5 @@
 CLASS dum net/minecraft/client/texture/SpriteAtlasTexture
-	CLASS dum$a Data
+	CLASS a Data
 		FIELD a spriteIds Ljava/util/Set;
 		FIELD b width I
 		FIELD c height I

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

@@ -1,5 +1,5 @@
 CLASS dle net/minecraft/client/texture/TextureCache
-	CLASS dle$a Manager
+	CLASS a Manager
 		FIELD a cacheMap Ljava/util/Map;
 		FIELD b filename Lqt;
 		FIELD c baseDir Ljava/lang/String;
@@ -9,7 +9,7 @@ CLASS dle net/minecraft/client/texture/TextureCache
 			ARG 1 cacheKey
 			ARG 2 patterns
 			ARG 3 colors
-	CLASS dle$b Entry
+	CLASS b Entry
 		FIELD a lastRequestTimeMillis J
 		FIELD b filename Lqt;
 	FIELD a BANNER Ldle$a;

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

@@ -1,11 +1,11 @@
 CLASS duk net/minecraft/client/texture/TextureStitcher
-	CLASS duk$a Holder
+	CLASS a Holder
 		FIELD a sprite Ldun;
 		FIELD b width I
 		FIELD c height I
 		METHOD <init> (Ldun;I)V
 			ARG 2 mipLevel
-	CLASS duk$b Slot
+	CLASS b Slot
 		FIELD a x I
 		FIELD b y I
 		FIELD c width I

mappings/net/minecraft/client/toast/SystemToast.mapping

@@ -1,5 +1,5 @@
 CLASS cxx net/minecraft/client/toast/SystemToast
-	CLASS cxx$a Type
+	CLASS a Type
 	FIELD f startTime J
 	FIELD g justUpdated Z
 	METHOD a show (Lcxz;Lcxx$a;Ljn;Ljn;)V

mappings/net/minecraft/client/toast/Toast.mapping

@@ -1,5 +1,5 @@
 CLASS cxy net/minecraft/client/toast/Toast
-	CLASS cxy$a Visibility
+	CLASS a Visibility
 		FIELD c sound Lym;
 		METHOD a play (Ldyb;)V
 	FIELD a TOASTS_TEX Lqt;

mappings/net/minecraft/client/toast/ToastManager.mapping

@@ -1,5 +1,5 @@
 CLASS cxz net/minecraft/client/toast/ToastManager
-	CLASS cxz$a Entry
+	CLASS a Entry
 		FIELD b instance Lcxy;
 		METHOD <init> (Lcxz;Lcxy;)V
 			ARG 1 instance

mappings/net/minecraft/client/toast/TutorialToast.mapping

@@ -1,5 +1,5 @@
 CLASS cya net/minecraft/client/toast/TutorialToast
-	CLASS cya$a Type
+	CLASS a Type
 		FIELD f textureSlotX I
 		FIELD g textureSlotY I
 		METHOD a drawIcon (Lcwi;II)V

mappings/net/minecraft/client/util/InputUtil.mapping

@@ -1,5 +1,5 @@
 CLASS ctx net/minecraft/client/util/InputUtil
-	CLASS ctx$a KeyCode
+	CLASS a KeyCode
 		FIELD a name Ljava/lang/String;
 		FIELD b type Lctx$b;
 		FIELD c keyCode I
@@ -12,7 +12,7 @@ CLASS ctx net/minecraft/client/util/InputUtil
 		METHOD c getName ()Ljava/lang/String;
 		METHOD equals (Ljava/lang/Object;)Z
 			ARG 1 o
-	CLASS ctx$b Type
+	CLASS b Type
 		FIELD a KEYSYM Lctx$b;
 		FIELD c MOUSE Lctx$b;
 		FIELD d mouseButtons [Ljava/lang/String;

mappings/net/minecraft/client/util/Session.mapping

@@ -1,5 +1,5 @@
 CLASS cvz net/minecraft/client/util/Session
-	CLASS cvz$a AccountType
+	CLASS a AccountType
 		METHOD a byName (Ljava/lang/String;)Lcvz$a;
 	FIELD a username Ljava/lang/String;
 	FIELD b uuid Ljava/lang/String;

mappings/net/minecraft/client/world/ClientChunkManager.mapping

@@ -1,5 +1,5 @@
 CLASS dhm net/minecraft/client/world/ClientChunkManager
-	CLASS dhm$a ClientChunkMap
+	CLASS a ClientChunkMap
 		FIELD b chunks Ljava/util/concurrent/atomic/AtomicReferenceArray;
 		FIELD c loadDistance I
 		FIELD d loadDiameter I

mappings/net/minecraft/command/EntitySelectorOptions.mapping

@@ -1,6 +1,6 @@
 CLASS ee net/minecraft/command/EntitySelectorOptions
-	CLASS ee$a SelectorHandler
+	CLASS a SelectorHandler
-	CLASS ee$b SelectorOption
+	CLASS b SelectorOption
 		FIELD a handler Lee$a;
 		FIELD b applicable Ljava/util/function/Predicate;
 		FIELD c description Ljn;

mappings/net/minecraft/command/arguments/ArgumentTypes.mapping

@@ -1,5 +1,5 @@
 CLASS ek net/minecraft/command/arguments/ArgumentTypes
-	CLASS ek$a Entry
+	CLASS a Entry
 		FIELD a argClass Ljava/lang/Class;
 		FIELD b serializer Lej;
 		FIELD c id Lqt;

mappings/net/minecraft/command/arguments/BlockPredicateArgumentType.mapping

@@ -1,5 +1,5 @@
 CLASS df net/minecraft/command/arguments/BlockPredicateArgumentType
-	CLASS df$a StatePredicate
+	CLASS a StatePredicate
 		FIELD a state Lbvo;
 		FIELD b properties Ljava/util/Set;
 		FIELD c nbt Lic;
@@ -9,8 +9,8 @@ CLASS df net/minecraft/command/arguments/BlockPredicateArgumentType
 			ARG 3 nbt
 		METHOD a (Lbvs;)Z
 			ARG 1 pos
-	CLASS df$b BlockPredicate
+	CLASS b BlockPredicate
-	CLASS df$c TagPredicate
+	CLASS c TagPredicate
 		FIELD a tag Lze;
 		FIELD b nbt Lic;
 		FIELD c properties Ljava/util/Map;

mappings/net/minecraft/command/arguments/EntityAnchorArgumentType.mapping

@@ -1,5 +1,5 @@
 CLASS ck net/minecraft/command/arguments/EntityAnchorArgumentType
-	CLASS ck$a EntityAnchor
+	CLASS a EntityAnchor
 		FIELD c anchors Ljava/util/Map;
 		FIELD d id Ljava/lang/String;
 		FIELD e offset Ljava/util/function/BiFunction;

mappings/net/minecraft/command/arguments/EntityArgumentType.mapping

@@ -1,5 +1,5 @@
 CLASS cl net/minecraft/command/arguments/EntityArgumentType
-	CLASS cl$a Serializer
+	CLASS a Serializer
 	FIELD a TOO_MANY_ENTITIES_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD b TOO_MANY_PLAYERS_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD c PLAYER_SELECTOR_HAS_ENTITIES_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;

mappings/net/minecraft/command/arguments/FunctionArgumentType.mapping

@@ -1,5 +1,5 @@
 CLASS dv net/minecraft/command/arguments/FunctionArgumentType
-	CLASS dv$a FunctionArgument
+	CLASS a FunctionArgument
 		METHOD a getFunctions (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection;
 		METHOD b getFunctionOrTag (Lcom/mojang/brigadier/context/CommandContext;)Lcom/mojang/datafixers/util/Either;
 	FIELD a EXAMPLES Ljava/util/Collection;

mappings/net/minecraft/command/arguments/GameProfileArgumentType.mapping

@@ -1,5 +1,5 @@
 CLASS cn net/minecraft/command/arguments/GameProfileArgumentType
-	CLASS cn$a GameProfileArgument
+	CLASS a GameProfileArgument
 	FIELD a UNKNOWN_PLAYER_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD b EXAMPLES Ljava/util/Collection;
 	METHOD a create ()Lcn;

mappings/net/minecraft/command/arguments/ItemPredicateArgumentType.mapping

@@ -1,9 +1,9 @@
 CLASS dz net/minecraft/command/arguments/ItemPredicateArgumentType
-	CLASS dz$a ItemPredicate
+	CLASS a ItemPredicate
 		FIELD a item Lbbz;
 		FIELD b compound Lic;
-	CLASS dz$b ItemPredicateArgument
+	CLASS b ItemPredicateArgument
-	CLASS dz$c TagPredicate
+	CLASS c TagPredicate
 		FIELD a tag Lze;
 		FIELD b compound Lic;
 		METHOD test (Ljava/lang/Object;)Z

mappings/net/minecraft/command/arguments/MessageArgumentType.mapping

@@ -1,10 +1,10 @@
 CLASS cp net/minecraft/command/arguments/MessageArgumentType
-	CLASS cp$a MessageFormat
+	CLASS a MessageFormat
 		FIELD a contents Ljava/lang/String;
 		FIELD b selectors [Lcp$b;
 		METHOD a format (Lcd;Z)Ljn;
 		METHOD a parse (Lcom/mojang/brigadier/StringReader;Z)Lcp$a;
-	CLASS cp$b MessageSelector
+	CLASS b MessageSelector
 		FIELD a start I
 		FIELD b end I
 		FIELD c selector Lec;

mappings/net/minecraft/command/arguments/NbtPathArgumentType.mapping

@@ -1,27 +1,27 @@
 CLASS cr net/minecraft/command/arguments/NbtPathArgumentType
-	CLASS cr$a AllListElementsNode
+	CLASS a AllListElementsNode
 		FIELD a INSTANCE Lcr$a;
-	CLASS cr$b CompoundChildNode
+	CLASS b CompoundChildNode
 		FIELD a name Ljava/lang/String;
-	CLASS cr$c ListIndexNode
+	CLASS c ListIndexNode
 		FIELD a index I
 		METHOD <init> (I)V
 			ARG 1 index
-	CLASS cr$e EqualListElementNode
+	CLASS e EqualListElementNode
 		FIELD a tag Lic;
 		FIELD b predicate Ljava/util/function/Predicate;
-	CLASS cr$f EqualCompundChildNode
+	CLASS f EqualCompundChildNode
 		FIELD a name Ljava/lang/String;
 		FIELD b tag Lic;
 		FIELD c predicate Ljava/util/function/Predicate;
 		METHOD <init> (Ljava/lang/String;Lic;)V
 			ARG 1 name
 			ARG 2 tag
-	CLASS cr$g EqualCompoundNode
+	CLASS g EqualCompoundNode
 		FIELD a predicate Ljava/util/function/Predicate;
 		METHOD <init> (Lic;)V
 			ARG 1 tag
-	CLASS cr$h NbtPath
+	CLASS h NbtPath
 		FIELD a string Ljava/lang/String;
 		FIELD b nodeEndIndices Lit/unimi/dsi/fastutil/objects/Object2IntMap;
 		FIELD c nodes [Lcr$i;
@@ -48,7 +48,7 @@ CLASS cr net/minecraft/command/arguments/NbtPathArgumentType
 			ARG 1 tag
 		METHOD d getParents (Lit;)Ljava/util/List;
 			ARG 1 tag
-	CLASS cr$i NbtPathNode
+	CLASS i NbtPathNode
 		METHOD a createParent ()Lit;
 		METHOD a remove (Lit;)I
 			ARG 1 tag

mappings/net/minecraft/command/arguments/NumberRangeArgumentType.mapping

@@ -1,10 +1,10 @@
 CLASS cx net/minecraft/command/arguments/NumberRangeArgumentType
-	CLASS cx$a FloatRangeArgumentType
+	CLASS a FloatRangeArgumentType
-		CLASS cx$a$a Serializer
+		CLASS a Serializer
 		FIELD a EXAMPLES Ljava/util/Collection;
-	CLASS cx$b IntRangeArgumentType
+	CLASS b IntRangeArgumentType
-		CLASS cx$b$a Serializer
+		CLASS a Serializer
 		FIELD a EXAMPLES Ljava/util/Collection;
 		METHOD a getRangeArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lbi$d;
-	CLASS cx$c NumberSerializer
+	CLASS c NumberSerializer
 	METHOD a create ()Lcx$b;

mappings/net/minecraft/command/arguments/OperationArgumentType.mapping

@@ -1,6 +1,6 @@
 CLASS cv net/minecraft/command/arguments/OperationArgumentType
-	CLASS cv$a Operation
+	CLASS a Operation
-	CLASS cv$b IntOperator
+	CLASS b IntOperator
 	FIELD a EXAMPLES Ljava/util/Collection;
 	FIELD b INVALID_OPERATION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	FIELD c DIVISION_ZERO_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;

mappings/net/minecraft/command/arguments/ScoreHolderArgumentType.mapping

@@ -1,12 +1,12 @@
 CLASS cz net/minecraft/command/arguments/ScoreHolderArgumentType
-	CLASS cz$a ScoreHolder
+	CLASS a ScoreHolder
 		METHOD getNames (Lcd;Ljava/util/function/Supplier;)Ljava/util/Collection;
 			ARG 1 source
-	CLASS cz$b SelectorScoreHolder
+	CLASS b SelectorScoreHolder
 		FIELD a selector Lec;
 		METHOD getNames (Lcd;Ljava/util/function/Supplier;)Ljava/util/Collection;
 			ARG 1 source
-	CLASS cz$c Serializer
+	CLASS c Serializer
 	FIELD a SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider;
 	FIELD b EXAMPLES Ljava/util/Collection;
 	FIELD c EMPTY_SCORE_HOLDER_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;

mappings/net/minecraft/command/suggestion/SuggestionProviders.mapping

@@ -1,5 +1,5 @@
 CLASS em net/minecraft/command/suggestion/SuggestionProviders
-	CLASS em$a LocalProvider
+	CLASS a LocalProvider
 		FIELD a provider Lcom/mojang/brigadier/suggestion/SuggestionProvider;
 		FIELD b name Lqt;
 		METHOD <init> (Lqt;Lcom/mojang/brigadier/suggestion/SuggestionProvider;)V

mappings/net/minecraft/container/BeaconContainer.mapping

@@ -1,5 +1,5 @@
 CLASS ayi net/minecraft/container/BeaconContainer
-	CLASS ayi$a SlotPayment
+	CLASS a SlotPayment
 	FIELD c paymentInv Lagz;
 	FIELD d paymentSlot Layi$a;
 	FIELD e context Layp;

mappings/net/minecraft/container/BrewingStandContainer.mapping

@@ -1,16 +1,16 @@
 CLASS ayk net/minecraft/container/BrewingStandContainer
-	CLASS ayk$a SlotFuel
+	CLASS a SlotFuel
 		METHOD <init> (Lagz;III)V
 			ARG 1 invSlot
 			ARG 2 xPosition
 			ARG 3 <Position
 		METHOD a_ matches (Lbce;)Z
-	CLASS ayk$b SlotIngredient
+	CLASS b SlotIngredient
 		METHOD <init> (Lagz;III)V
 			ARG 1 invSlot
 			ARG 2 xPosition
 			ARG 3 <Position
-	CLASS ayk$c SlotPotion
+	CLASS c SlotPotion
 		METHOD <init> (Lagz;III)V
 			ARG 1 invSlot
 			ARG 2 xPosition

mappings/net/minecraft/container/ContainerType.mapping

@@ -1,5 +1,5 @@
 CLASS azg net/minecraft/container/ContainerType
-	CLASS azg$a Factory
+	CLASS a Factory
 		METHOD create (ILawa;)Layf;
 			ARG 1 syncId
 			ARG 2 playerInventory

mappings/net/minecraft/container/GrindstoneContainer.mapping

@@ -1,5 +1,5 @@
 CLASS ayz net/minecraft/container/GrindstoneContainer
-	CLASS ayz$4
+	CLASS 4
 		METHOD a getExperience (Lbhm;)I
 			ARG 1 world
 		METHOD e getExperience (Lbce;)I

mappings/net/minecraft/container/Property.mapping

@@ -1,5 +1,5 @@
 CLASS ayt net/minecraft/container/Property
-	CLASS ayt$3
+	CLASS 3
 		FIELD a value I
 	FIELD a oldValue I
 	METHOD a create ()Layt;

mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping

@@ -1,5 +1,5 @@
 CLASS hj net/minecraft/data/server/recipe/CookingRecipeJsonFactory
-	CLASS hj$a CookingRecipeJsonProvider
+	CLASS a CookingRecipeJsonProvider
 		FIELD a recipeId Lqt;
 		FIELD b group Ljava/lang/String;
 		FIELD c ingredient Lbej;

mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping

@@ -1,5 +1,5 @@
 CLASS hh net/minecraft/data/server/recipe/ShapedRecipeJsonFactory
-	CLASS hh$a ShapedRecipeJsonProvider
+	CLASS a ShapedRecipeJsonProvider
 		FIELD b recipeId Lqt;
 		FIELD c output Lbbz;
 		FIELD d resultCount I

mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping

@@ -1,5 +1,5 @@
 CLASS hi net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory
-	CLASS hi$a ShapelessRecipeJsonProvider
+	CLASS a ShapelessRecipeJsonProvider
 		FIELD a recipeId Lqt;
 		FIELD b output Lbbz;
 		FIELD c count I

mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping

@@ -1,5 +1,5 @@
 CLASS hk net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory
-	CLASS hk$a SingleItemRecipeJsonProvider
+	CLASS a SingleItemRecipeJsonProvider
 		FIELD a recipeId Lqt;
 		FIELD b group Ljava/lang/String;
 		FIELD c input Lbej;

mappings/net/minecraft/datafixers/Schemas.mapping

@@ -1,11 +1,11 @@
 CLASS aah net/minecraft/datafixers/Schemas
-	CLASS aah$1
+	CLASS 1
 		METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;ZLjava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)V
 			ARG 1 outputSchema
 			ARG 2 changesType
 			ARG 3 name
 			ARG 4 type
-	CLASS aah$2
+	CLASS 2
 		METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;ZLjava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)V
 			ARG 1 outputSchema
 			ARG 2 changesType

mappings/net/minecraft/datafixers/fixes/BlockEntitySignTextStrictJsonFix.mapping

@@ -1,5 +1,5 @@
 CLASS aaw net/minecraft/datafixers/fixes/BlockEntitySignTextStrictJsonFix
-	CLASS aaw$1
+	CLASS 1
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 functionJson
 			ARG 2 unused

mappings/net/minecraft/datafixers/fixes/ChunkPalettedStorageFix.mapping

@@ -1,12 +1,12 @@
 CLASS abd net/minecraft/datafixers/fixes/ChunkPalettedStorageFix
-	CLASS abd$a ChunkNibbleArray
+	CLASS a ChunkNibbleArray
 		FIELD a contents [B
 		METHOD a get (III)I
 			ARG 1 x
 			ARG 2 y
-	CLASS abd$b Facing
+	CLASS b Facing
-		CLASS abd$b$a Axis
+		CLASS a Axis
-		CLASS abd$b$b Direction
+		CLASS b Direction
 			FIELD c offset I
 			METHOD a getOffset ()I
 		FIELD g axis Labd$b$a;
@@ -15,7 +15,7 @@ CLASS abd net/minecraft/datafixers/fixes/ChunkPalettedStorageFix
 			ARG 3 direction
 		METHOD a getDirection ()Labd$b$b;
 		METHOD b getAxis ()Labd$b$a;
-	CLASS abd$c Section
+	CLASS c Section
 		FIELD a y I
 		FIELD b paletteMap Lzl;
 		FIELD c paletteData Lcom/mojang/datafixers/Dynamic;
@@ -31,7 +31,7 @@ CLASS abd net/minecraft/datafixers/fixes/ChunkPalettedStorageFix
 		METHOD a setBlock (ILcom/mojang/datafixers/Dynamic;)V
 			ARG 1 pos
 		METHOD b visit (I)I
-	CLASS abd$d Level
+	CLASS d Level
 		FIELD a sides I
 		FIELD b sections [Labd$c;
 		FIELD c level Lcom/mojang/datafixers/Dynamic;

mappings/net/minecraft/enchantment/Enchantment.mapping

@@ -1,5 +1,5 @@
 CLASS bfn net/minecraft/enchantment/Enchantment
-	CLASS bfn$a Weight
+	CLASS a Weight
 		FIELD e weight I
 		METHOD <init> (Ljava/lang/String;II)V
 			ARG 3 weight

mappings/net/minecraft/enchantment/EnchantmentHelper.mapping

@@ -1,5 +1,5 @@
 CLASS bfp net/minecraft/enchantment/EnchantmentHelper
-	CLASS bfp$a Consumer
+	CLASS a Consumer
 		METHOD accept (Lbfn;I)V
 			ARG 1 enchantment
 			ARG 2 level

mappings/net/minecraft/enchantment/ProtectionEnchantment.mapping

@@ -1,5 +1,5 @@
 CLASS bga net/minecraft/enchantment/ProtectionEnchantment
-	CLASS bga$a Type
+	CLASS a Type
 		FIELD f name Ljava/lang/String;
 		FIELD g basePower I
 		FIELD h powerPerLevel I

mappings/net/minecraft/entity/EntityContextImpl.mapping

@@ -1,5 +1,5 @@
 CLASS csl net/minecraft/entity/EntityContextImpl
-	CLASS csl$1
+	CLASS 1
 		METHOD <init> (ZDLbbz;)V
 			ARG 1 sneaking
 	FIELD a ABSENT Lcsg;

mappings/net/minecraft/entity/EntityType.mapping

@@ -1,5 +1,5 @@
 CLASS aip net/minecraft/entity/EntityType
-	CLASS aip$a Builder
+	CLASS a Builder
 		FIELD a factory Laip$b;
 		FIELD b category Laiw;
 		FIELD c saveable Z
@@ -22,7 +22,7 @@ CLASS aip net/minecraft/entity/EntityType
 			ARG 1 id
 		METHOD b disableSaving ()Laip$a;
 		METHOD c makeFireImmune ()Laip$a;
-	CLASS aip$b EntityFactory
+	CLASS b EntityFactory
 		METHOD create (Laip;Lbhm;)Lail;
 			ARG 1 type
 			ARG 2 world

mappings/net/minecraft/entity/EquipmentSlot.mapping

@@ -1,5 +1,5 @@
 CLASS aiq net/minecraft/entity/EquipmentSlot
-	CLASS aiq$a Type
+	CLASS a Type
 	FIELD g type Laiq$a;
 	FIELD h entityId I
 	FIELD i armorStandId I

mappings/net/minecraft/entity/SpawnRestriction.mapping

@@ -1,11 +1,11 @@
 CLASS ajh net/minecraft/entity/SpawnRestriction
-	CLASS ajh$a Entry
+	CLASS a Entry
 		FIELD a heightMapType Lbyv$a;
 		FIELD b location Lajh$c;
 		METHOD <init> (Lbyv$a;Lajh$c;Lajh$b;)V
 			ARG 1 heightMapType
 			ARG 2 location
-	CLASS ajh$c Location
+	CLASS c Location
 	FIELD a mapping Ljava/util/Map;
 	METHOD a getLocation (Laip;)Lajh$c;
 		ARG 0 type

mappings/net/minecraft/entity/ai/brain/ScheduleBuilder.mapping

@@ -1,5 +1,5 @@
 CLASS axm net/minecraft/entity/ai/brain/ScheduleBuilder
-	CLASS axm$a ActivityEntry
+	CLASS a ActivityEntry
 		FIELD a startTime I
 		FIELD b activity Laxj;
 		METHOD <init> (ILaxj;)V

mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping

@@ -1,9 +1,9 @@
 CLASS akb net/minecraft/entity/ai/brain/task/CompositeTask
-	CLASS akb$a Order
+	CLASS a Order
 		FIELD c consumer Ljava/util/function/Consumer;
 		METHOD a apply (Lalv;)V
 			ARG 1 list
-	CLASS akb$b RunMode
+	CLASS b RunMode
 		FIELD a RUN_ALL Lakb$b;
 		FIELD b TRY_ALL Lakb$b;
 	FIELD a memoriesToForgetWhenStopped Ljava/util/Set;

mappings/net/minecraft/entity/ai/brain/task/Task.mapping

@@ -1,5 +1,5 @@
 CLASS ajv net/minecraft/entity/ai/brain/task/Task
-	CLASS ajv$a Status
+	CLASS a Status
 	FIELD a requiredMemoryState Ljava/util/Map;
 	FIELD b status Lajv$a;
 	FIELD c endTime J

mappings/net/minecraft/entity/ai/control/MoveControl.mapping

@@ -1,5 +1,5 @@
 CLASS ame net/minecraft/entity/ai/control/MoveControl
-	CLASS ame$a State
+	CLASS a State
 	FIELD a entity Laiv;
 	FIELD b targetX D
 	FIELD c targetY D

mappings/net/minecraft/entity/ai/goal/CrossbowAttackGoal.mapping

@@ -1,5 +1,5 @@
 CLASS aoa net/minecraft/entity/ai/goal/CrossbowAttackGoal
-	CLASS aoa$a Stage
+	CLASS a Stage
 	FIELD a actor Laun;
 	FIELD b stage Laoa$a;
 	FIELD c speed D

mappings/net/minecraft/entity/ai/goal/Goal.mapping

@@ -1,5 +1,5 @@
 CLASS amz net/minecraft/entity/ai/goal/Goal
-	CLASS amz$a Control
+	CLASS a Control
 	FIELD a controls Ljava/util/EnumSet;
 	METHOD C_ canStop ()Z
 	METHOD a canStart ()Z

mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping

@@ -1,5 +1,5 @@
 CLASS ajm net/minecraft/entity/attribute/EntityAttributeModifier
-	CLASS ajm$a Operation
+	CLASS a Operation
 		FIELD d VALUES [Lajm$a;
 		FIELD e id I
 		METHOD <init> (Ljava/lang/String;II)V

mappings/net/minecraft/entity/boss/BossBar.mapping

@@ -1,5 +1,5 @@
 CLASS agw net/minecraft/entity/boss/BossBar
-	CLASS agw$a Color
+	CLASS a Color
 		FIELD h name Ljava/lang/String;
 		FIELD i format Lc;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;Lc;)V
@@ -9,7 +9,7 @@ CLASS agw net/minecraft/entity/boss/BossBar
 		METHOD a byName (Ljava/lang/String;)Lagw$a;
 			ARG 0 name
 		METHOD b getName ()Ljava/lang/String;
-	CLASS agw$b Style
+	CLASS b Style
 		FIELD f name Ljava/lang/String;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 			ARG 3 name

mappings/net/minecraft/entity/data/DataTracker.mapping

@@ -1,5 +1,5 @@
 CLASS ql net/minecraft/entity/data/DataTracker
-	CLASS ql$a Entry
+	CLASS a Entry
 		FIELD a data Lqi;
 		FIELD b value Ljava/lang/Object;
 		FIELD c dirty Z

mappings/net/minecraft/entity/mob/BlazeEntity.mapping

@@ -1,9 +1,8 @@
 CLASS atx net/minecraft/entity/mob/BlazeEntity
-	CLASS atx$a ShootFireballGoal
+	CLASS a ShootFireballGoal
 		FIELD a blaze Latx;
 		METHOD <init> (Latx;)V
 			ARG 1 blaze
 	FIELD d BLAZE_FLAGS Lqi;
 	METHOD l isFireActive ()Z
 	METHOD r setFireActive (Z)V
-		ARG 1 active

mappings/net/minecraft/entity/mob/DrownedEntity.mapping

@@ -1,15 +1,15 @@
 CLASS aub net/minecraft/entity/mob/DrownedEntity
-	CLASS aub$a DrownedAttackGoal
+	CLASS a DrownedAttackGoal
 		FIELD d drowned Laub;
 		METHOD <init> (Laub;DZ)V
 			ARG 1 drowned
 			ARG 2 speed
-	CLASS aub$b LeaveWaterGoal
+	CLASS b LeaveWaterGoal
 		FIELD g drowned Laub;
 		METHOD <init> (Laub;D)V
 			ARG 1 drowned
 			ARG 2 speed
-	CLASS aub$c WanderAroundOnSurfaceGoal
+	CLASS c WanderAroundOnSurfaceGoal
 		FIELD a mob Lajb;
 		FIELD b x D
 		FIELD c y D
@@ -20,11 +20,11 @@ CLASS aub net/minecraft/entity/mob/DrownedEntity
 			ARG 1 mob
 			ARG 2 speed
 		METHOD g getWanderTarget ()Lcsb;
-	CLASS aub$d DrownedMoveControl
+	CLASS d DrownedMoveControl
 		FIELD i drowned Laub;
 		METHOD <init> (Laub;)V
 			ARG 1 drowned
-	CLASS aub$e
+	CLASS e
 		FIELD a drowned Laub;
 		FIELD b speed D
 		FIELD c minY I
@@ -32,7 +32,7 @@ CLASS aub net/minecraft/entity/mob/DrownedEntity
 			ARG 1 drowned
 			ARG 2 speed
 			ARG 4 minY
-	CLASS aub$f TridentAttackGoal
+	CLASS f TridentAttackGoal
 		FIELD a drowned Laub;
 	FIELD b waterNavigation Lapm;
 	FIELD bz targetingUnderwater Z

mappings/net/minecraft/entity/mob/EndermanEntity.mapping

@@ -1,13 +1,13 @@
 CLASS aud net/minecraft/entity/mob/EndermanEntity
-	CLASS aud$a ChasePlayerGoal
+	CLASS a ChasePlayerGoal
 		FIELD a enderman Laud;
 		METHOD <init> (Laud;)V
 			ARG 1 enderman
-	CLASS aud$b PlaceBlockGoal
+	CLASS b PlaceBlockGoal
 		FIELD a enderman Laud;
 		METHOD <init> (Laud;)V
 			ARG 1 enderman
-	CLASS aud$c TeleportTowardsPlayerGoal
+	CLASS c TeleportTowardsPlayerGoal
 		FIELD i enderman Laud;
 		FIELD j targetPlayer Lawb;
 		FIELD k lookAtPlayerWarmup I
@@ -18,7 +18,7 @@ CLASS aud net/minecraft/entity/mob/EndermanEntity
 			ARG 1 enderman
 		METHOD a (Laud;Laiu;)Z
 			ARG 1 playerEntity
-	CLASS aud$d PickUpBlockGoal
+	CLASS d PickUpBlockGoal
 		FIELD a enderman Laud;
 		METHOD <init> (Laud;)V
 			ARG 1 enderman

mappings/net/minecraft/entity/mob/EvokerEntity.mapping

@@ -1,15 +1,15 @@
 CLASS aug net/minecraft/entity/mob/EvokerEntity
-	CLASS aug$a ConjureFangsGoal
+	CLASS a ConjureFangsGoal
 		METHOD a conjureFangs (DDDDFI)V
 			ARG 1 x
 			ARG 3 z
 			ARG 5 maxY
 			ARG 7 y
 			ARG 10 warmup
-	CLASS aug$b LookAtTargetOrWololoTarget
+	CLASS b LookAtTargetOrWololoTarget
-	CLASS aug$c SummonVexGoal
+	CLASS c SummonVexGoal
 		FIELD e closeVexPredicate Laqd;
-	CLASS aug$d WololoGoal
+	CLASS d WololoGoal
 		FIELD e purpleSheepPredicate Laqd;
 	FIELD bz wololoTarget Larn;
 	METHOD a setWololoTarget (Larn;)V

mappings/net/minecraft/entity/mob/GhastEntity.mapping

@@ -1,16 +1,16 @@
 CLASS auh net/minecraft/entity/mob/GhastEntity
-	CLASS auh$a LookAtTargetGoal
+	CLASS a LookAtTargetGoal
 		FIELD a ghast Lauh;
 		METHOD <init> (Lauh;)V
 			ARG 1 ghast
-	CLASS auh$b GhastMoveControl
+	CLASS b GhastMoveControl
 		FIELD i ghast Lauh;
-	CLASS auh$c ShootFireballGoal
+	CLASS c ShootFireballGoal
 		FIELD a cooldown I
 		FIELD b ghast Lauh;
 		METHOD <init> (Lauh;)V
 			ARG 1 ghast
-	CLASS auh$d FlyRandomlyGoal
+	CLASS d FlyRandomlyGoal
 		FIELD a ghast Lauh;
 		METHOD <init> (Lauh;)V
 			ARG 1 ghast

mappings/net/minecraft/entity/mob/GuardianEntity.mapping

@@ -1,17 +1,17 @@
 CLASS auj net/minecraft/entity/mob/GuardianEntity
-	CLASS auj$a FireBeamGoal
+	CLASS a FireBeamGoal
 		FIELD a guardian Lauj;
 		FIELD b beamTicks I
 		FIELD c elder Z
 		METHOD <init> (Lauj;)V
 			ARG 1 guardian
-	CLASS auj$b GuardianTargetPredicate
+	CLASS b GuardianTargetPredicate
 		FIELD a owner Lauj;
 		METHOD <init> (Lauj;)V
 			ARG 1 owner
 		METHOD test (Ljava/lang/Object;)Z
 			ARG 1 context
-	CLASS auj$c GuardianMoveControl
+	CLASS c GuardianMoveControl
 		FIELD i guardian Lauj;
 		METHOD <init> (Lauj;)V
 			ARG 1 guardian

mappings/net/minecraft/entity/mob/IllagerEntity.mapping

@@ -1,6 +1,6 @@
 CLASS atv net/minecraft/entity/mob/IllagerEntity
-	CLASS atv$a State
+	CLASS a State
-	CLASS atv$b LongDoorInteractGoal
+	CLASS b LongDoorInteractGoal
 	METHOD <init> (Laip;Lbhm;)V
 		ARG 1 type
 	METHOD l getState ()Latv$a;

mappings/net/minecraft/entity/mob/IllusionerEntity.mapping

@@ -1,4 +1,4 @@
 CLASS aul net/minecraft/entity/mob/IllusionerEntity
-	CLASS aul$a BlindTargetGoal
+	CLASS a BlindTargetGoal
 		FIELD e targetId I
-	CLASS aul$b GiveInvisibilityGoal
+	CLASS b GiveInvisibilityGoal

mappings/net/minecraft/entity/mob/PatrolEntity.mapping

@@ -1,5 +1,5 @@
 CLASS auo net/minecraft/entity/mob/PatrolEntity
-	CLASS auo$a PatrolGoal
+	CLASS a PatrolGoal
 		FIELD a actor Lauo;
 		FIELD b leaderSpeed D
 		FIELD c fellowSpeed D

mappings/net/minecraft/entity/mob/PhantomEntity.mapping

@@ -1,17 +1,17 @@
 CLASS aup net/minecraft/entity/mob/PhantomEntity
-	CLASS aup$a PhantomMovementType
+	CLASS a PhantomMovementType
-	CLASS aup$b FindTargetGoal
+	CLASS b FindTargetGoal
 		FIELD b PLAYERS_IN_RANGE_PREDICATE Laqd;
 		FIELD c delay I
-	CLASS aup$c StartAttackGoal
+	CLASS c StartAttackGoal
-	CLASS aup$d PhantomBodyControl
+	CLASS d PhantomBodyControl
-	CLASS aup$e CircleMovementGoal
+	CLASS e CircleMovementGoal
-	CLASS aup$f PhantomLookControl
+	CLASS f PhantomLookControl
-	CLASS aup$g PhantomMoveControl
+	CLASS g PhantomMoveControl
 		METHOD <init> (Laup;Laiv;)V
 			ARG 2 owner
-	CLASS aup$h MovementGoal
+	CLASS h MovementGoal
-	CLASS aup$i SwoopMovementGoal
+	CLASS i SwoopMovementGoal
 	FIELD b SIZE Lqi;
 	FIELD bz movementType Laup$a;
 	METHOD a setPhantomSize (I)V

mappings/net/minecraft/entity/mob/RavagerEntity.mapping

@@ -1,6 +1,6 @@
 CLASS aut net/minecraft/entity/mob/RavagerEntity
-	CLASS aut$a AttackGoal
+	CLASS a AttackGoal
-	CLASS aut$b
+	CLASS b
 		METHOD <init> (Laiv;Lbhm;)V
 			ARG 1 world
 	FIELD bA stunTick I

mappings/net/minecraft/entity/mob/ShulkerEntity.mapping

@@ -1,16 +1,16 @@
 CLASS auv net/minecraft/entity/mob/ShulkerEntity
-	CLASS auv$a ShootBulletGoal
+	CLASS a ShootBulletGoal
 		FIELD b counter I
-	CLASS auv$b ShulkerBodyControl
+	CLASS b ShulkerBodyControl
-	CLASS auv$c SearchForTargetGoal
+	CLASS c SearchForTargetGoal
 		METHOD <init> (Lauv;)V
 			ARG 1 shulker
 		METHOD a (Laiu;)Z
 			ARG 0 entity
-	CLASS auv$d SearchForPlayerGoal
+	CLASS d SearchForPlayerGoal
 		METHOD <init> (Lauv;Lauv;)V
 			ARG 2 shulker
-	CLASS auv$e PeekGoal
+	CLASS e PeekGoal
 		FIELD b counter I
 	FIELD bA ATTR_COVERED_ARMOR_BONUS_UUID Ljava/util/UUID;
 	FIELD bB ATTR_COVERED_ARMOR_BONUS Lajm;

mappings/net/minecraft/entity/mob/SilverfishEntity.mapping

@@ -1,10 +1,10 @@
 CLASS auw net/minecraft/entity/mob/SilverfishEntity
-	CLASS auw$a WanderAndInfestGoal
+	CLASS a WanderAndInfestGoal
 		FIELD h direction Lfa;
 		FIELD i canInfest Z
 		METHOD <init> (Lauw;)V
 			ARG 1 silverfish
-	CLASS auw$b CallForHelpGoal
+	CLASS b CallForHelpGoal
 		FIELD a silverfish Lauw;
 		FIELD b delay I
 		METHOD <init> (Lauw;)V

mappings/net/minecraft/entity/mob/SlimeEntity.mapping

@@ -1,17 +1,17 @@
 CLASS auz net/minecraft/entity/mob/SlimeEntity
-	CLASS auz$a
+	CLASS a
 		FIELD a slime Lauz;
 		METHOD <init> (Lauz;)V
 			ARG 1 slime
-	CLASS auz$b
+	CLASS b
 		FIELD a slime Lauz;
 		METHOD <init> (Lauz;)V
 			ARG 1 slime
-	CLASS auz$c
+	CLASS c
 		FIELD a slime Lauz;
 		METHOD <init> (Lauz;)V
 			ARG 1 slime
-	CLASS auz$d SlimeMoveControl
+	CLASS d SlimeMoveControl
 		FIELD i targetYaw F
 		FIELD j ticksUntilJump I
 		FIELD k slime Lauz;
@@ -23,7 +23,7 @@ CLASS auz net/minecraft/entity/mob/SlimeEntity
 		METHOD a look (FZ)V
 			ARG 1 targetYaw
 			ARG 2 jumpOften
-	CLASS auz$e
+	CLASS e
 		FIELD a slime Lauz;
 		METHOD <init> (Lauz;)V
 			ARG 1 slime

mappings/net/minecraft/entity/mob/SpellcastingIllagerEntity.mapping

@@ -1,5 +1,5 @@
 CLASS ava net/minecraft/entity/mob/SpellcastingIllagerEntity
-	CLASS ava$a Spell
+	CLASS a Spell
 		FIELD g id I
 		FIELD h particleVelocity [D
 		METHOD <init> (Ljava/lang/String;IIDDD)V
@@ -9,8 +9,8 @@ CLASS ava net/minecraft/entity/mob/SpellcastingIllagerEntity
 			ARG 8 particleVelocityZ
 		METHOD a byId (I)Lava$a;
 			ARG 0 id
-	CLASS ava$b LookAtTargetGoal
+	CLASS b LookAtTargetGoal
-	CLASS ava$c CastSpellGoal
+	CLASS c CastSpellGoal
 		FIELD b spellCooldown I
 		FIELD c startTime I
 		METHOD g getSpellTicks ()I

mappings/net/minecraft/entity/mob/SpiderEntity.mapping

@@ -1,12 +1,12 @@
 CLASS avb net/minecraft/entity/mob/SpiderEntity
-	CLASS avb$a AttackGoal
+	CLASS a AttackGoal
 		METHOD <init> (Lavb;)V
 			ARG 1 spider
-	CLASS avb$b SpawnEffectData
+	CLASS b SpawnEffectData
 		FIELD a effect Laid;
 		METHOD a setEffect (Ljava/util/Random;)V
 			ARG 1 random
-	CLASS avb$c FollowTargetGoal
+	CLASS c FollowTargetGoal
 		METHOD <init> (Lavb;Ljava/lang/Class;)V
 			ARG 1 spider
 			ARG 2 targetEntityClass

mappings/net/minecraft/entity/mob/VexEntity.mapping

@@ -1,13 +1,13 @@
 CLASS avd net/minecraft/entity/mob/VexEntity
-	CLASS avd$a ChargeTargetGoal
+	CLASS a ChargeTargetGoal
-	CLASS avd$b TrackOwnerTargetGoal
+	CLASS b TrackOwnerTargetGoal
 		FIELD b TRACK_OWNER_PREDICATE Laqd;
 		METHOD <init> (Lavd;Lajb;)V
 			ARG 2 mob
-	CLASS avd$c VexMoveControl
+	CLASS c VexMoveControl
 		METHOD <init> (Lavd;Lavd;)V
 			ARG 2 owner
-	CLASS avd$d LookAtTargetGoal
+	CLASS d LookAtTargetGoal
 	FIELD bA lifeTicks I
 	FIELD b VEX_FLAGS Lqi;
 	FIELD bz alive Z

mappings/net/minecraft/entity/mob/VindicatorEntity.mapping

@@ -1,9 +1,9 @@
 CLASS ave net/minecraft/entity/mob/VindicatorEntity
-	CLASS ave$a BreakDoorGoal
+	CLASS a BreakDoorGoal
-	CLASS ave$b FollowEntityGoal
+	CLASS b FollowEntityGoal
 		METHOD <init> (Lave;)V
 			ARG 1 vindicator
-	CLASS ave$c AttackGoal
+	CLASS c AttackGoal
 		METHOD <init> (Lave;Lave;)V
 			ARG 2 vindicator
 	FIELD b DIFFICULTY_ALLOWS_DOOR_BREAKING_PREDICATE Ljava/util/function/Predicate;

mappings/net/minecraft/entity/mob/ZombieEntity.mapping

@@ -1,5 +1,5 @@
 CLASS avh net/minecraft/entity/mob/ZombieEntity
-	CLASS avh$a DestroyEggGoal
+	CLASS a DestroyEggGoal
 		METHOD <init> (Lavh;Lajb;DI)V
 			ARG 2 mob
 			ARG 3 speed

mappings/net/minecraft/entity/mob/ZombiePigmanEntity.mapping

@@ -1,8 +1,8 @@
 CLASS auq net/minecraft/entity/mob/ZombiePigmanEntity
-	CLASS auq$a FollowPlayerIfAngryGoal
+	CLASS a FollowPlayerIfAngryGoal
 		METHOD <init> (Lauq;)V
 			ARG 1 pigman
-	CLASS auq$b AvoidZombiesGoal
+	CLASS b AvoidZombiesGoal
 		METHOD <init> (Lauq;)V
 			ARG 1 pigman
 	FIELD bA angrySoundDelay I

mappings/net/minecraft/entity/passive/CatEntity.mapping

@@ -1,5 +1,5 @@
 CLASS aqw net/minecraft/entity/passive/CatEntity
-	CLASS aqw$a CatFleeGoal
+	CLASS a CatFleeGoal
 		FIELD i cat Laqw;
 		METHOD <init> (Laqw;Ljava/lang/Class;FDD)V
 			ARG 1 cat
@@ -7,7 +7,7 @@ CLASS aqw net/minecraft/entity/passive/CatEntity
 			ARG 3 distance
 			ARG 4 slowSpeed
 			ARG 6 fastSpeed
-	CLASS aqw$b SleepWithOwnerGoal
+	CLASS b SleepWithOwnerGoal
 		FIELD a cat Laqw;
 		FIELD b owner Lawb;
 		FIELD c bedPos Lev;
@@ -15,7 +15,7 @@ CLASS aqw net/minecraft/entity/passive/CatEntity
 		METHOD <init> (Laqw;)V
 			ARG 1 cat
 		METHOD h dropMorningGifts ()V
-	CLASS aqw$c TemptGoal
+	CLASS c TemptGoal
 		FIELD c player Lawb;
 		FIELD d cat Laqw;
 		METHOD <init> (Laqw;DLbej;Z)V

mappings/net/minecraft/entity/passive/DolphinEntity.mapping

@@ -1,18 +1,18 @@
 CLASS ara net/minecraft/entity/passive/DolphinEntity
-	CLASS ara$a DolphinMoveControl
+	CLASS a DolphinMoveControl
 		FIELD i dolphin Lara;
-	CLASS ara$b LeadToNearbyTreasureGoal
+	CLASS b LeadToNearbyTreasureGoal
 		FIELD a dolphin Lara;
 		METHOD <init> (Lara;)V
 			ARG 1 dolphin
-	CLASS ara$c SwimWithPlayerGoal
+	CLASS c SwimWithPlayerGoal
 		FIELD a dolphin Lara;
 		FIELD b speed D
 		FIELD c closestPlayer Lawb;
 		METHOD <init> (Lara;D)V
 			ARG 1 dolphin
 			ARG 2 speed
-	CLASS ara$d PlayWithItemsGoal
+	CLASS d PlayWithItemsGoal
 		METHOD a spitOutItem (Lbce;)V
 			ARG 1 stack
 	FIELD bA CLOSE_PLAYER_PREDICATE Laqd;

mappings/net/minecraft/entity/passive/FishEntity.mapping

@@ -1,9 +1,9 @@
 CLASS aqs net/minecraft/entity/passive/FishEntity
-	CLASS aqs$a FishMoveControl
+	CLASS a FishMoveControl
 		FIELD i fish Laqs;
 		METHOD <init> (Laqs;)V
 			ARG 1 owner
-	CLASS aqs$b SwimToRandomPlaceGoal
+	CLASS b SwimToRandomPlaceGoal
 		FIELD h fish Laqs;
 		METHOD <init> (Laqs;)V
 			ARG 1 fish

mappings/net/minecraft/entity/passive/FoxEntity.mapping

@@ -1,5 +1,5 @@
 CLASS arc net/minecraft/entity/passive/FoxEntity
-	CLASS arc$a DefendFriendGoal
+	CLASS a DefendFriendGoal
 		FIELD j offender Laiu;
 		FIELD k friend Laiu;
 		FIELD l lastAttackedTime I
@@ -8,71 +8,71 @@ CLASS arc net/minecraft/entity/passive/FoxEntity
 			ARG 3 checkVisibility
 			ARG 4 checkCanNavigate
 			ARG 5 targetPredicate
-	CLASS arc$b StopWanderingGoal
+	CLASS b StopWanderingGoal
 		FIELD a timer I
-	CLASS arc$c WorriableEntityFilter
+	CLASS c WorriableEntityFilter
 		METHOD test (Ljava/lang/Object;)Z
 			ARG 1 entity
-	CLASS arc$d CalmDownGoal
+	CLASS d CalmDownGoal
 		FIELD b WORRIABLE_ENTITY_PREDICATE Laqd;
 		METHOD g isAtFavoredLocation ()Z
 		METHOD h canCalmDown ()Z
-	CLASS arc$e MateGoal
+	CLASS e MateGoal
 		METHOD <init> (Larc;D)V
 			ARG 2 chance
-	CLASS arc$f EatSweetBerriesGoal
+	CLASS f EatSweetBerriesGoal
 		FIELD g timer I
 		METHOD <init> (Larc;DII)V
 			ARG 2 speed
 			ARG 4 rannge
 			ARG 5 maxYDifference
 		METHOD m eatSweetBerry ()V
-	CLASS arc$g FoxSwimGoal
+	CLASS g FoxSwimGoal
-	CLASS arc$h FollowParentGoal
+	CLASS h FollowParentGoal
 		FIELD b fox Larc;
 		METHOD <init> (Larc;Larc;D)V
 			ARG 2 fox
 			ARG 3 speed
-	CLASS arc$i FoxData
+	CLASS i FoxData
 		FIELD a type Larc$v;
 		FIELD b uses I
 		METHOD <init> (Larc$v;)V
 			ARG 1 type
-	CLASS arc$j LookAtEntityGoal
+	CLASS j LookAtEntityGoal
 		METHOD <init> (Larc;Laiv;Ljava/lang/Class;F)V
 			ARG 2 fox
 			ARG 3 targetType
 			ARG 4 range
-	CLASS arc$k FoxLookControl
+	CLASS k FoxLookControl
-	CLASS arc$l AttackGoal
+	CLASS l AttackGoal
 		METHOD <init> (Larc;DZ)V
 			ARG 2 speed
-	CLASS arc$m FoxMoveControl
+	CLASS m FoxMoveControl
-	CLASS arc$n EscapeWhenNotAggresiveGoal
+	CLASS n EscapeWhenNotAggresiveGoal
 		METHOD <init> (Larc;D)V
 			ARG 2 speed
-	CLASS arc$o JumpChasingGoal
+	CLASS o JumpChasingGoal
-	CLASS arc$p PickupItemGoal
+	CLASS p PickupItemGoal
-	CLASS arc$q GoToVillageGoal
+	CLASS q GoToVillageGoal
 		METHOD <init> (Larc;II)V
 			ARG 2 unused
 			ARG 3 searchRange
 		METHOD g canGoToVillage ()Z
-	CLASS arc$r SitDownAndLookAroundGoal
+	CLASS r SitDownAndLookAroundGoal
 		FIELD c lookX D
 		FIELD d lookZ D
 		FIELD e timer I
 		FIELD f counter I
 		METHOD j chooseNewAngle ()V
-	CLASS arc$s AvoidDaylightGoal
+	CLASS s AvoidDaylightGoal
 		FIELD c timer I
 		METHOD <init> (Larc;D)V
 			ARG 2 speed
-	CLASS arc$t DelayedCalmDownGoal
+	CLASS t DelayedCalmDownGoal
 		FIELD c timer I
 		METHOD j canNotCalmDown ()Z
-	CLASS arc$u MoveToHuntGoal
+	CLASS u MoveToHuntGoal
-	CLASS arc$v Type
+	CLASS v Type
 		FIELD c TYPES [Larc$v;
 		FIELD d NAME_TYPE_MAP Ljava/util/Map;
 		FIELD e id I

mappings/net/minecraft/entity/passive/LlamaEntity.mapping

@@ -1,5 +1,5 @@
 CLASS arz net/minecraft/entity/passive/LlamaEntity
-	CLASS arz$a ChaseWolvesGoal
+	CLASS a ChaseWolvesGoal
 		METHOD <init> (Larz;)V
 			ARG 1 llama
 	FIELD bI ATTR_STRENGTH Lqi;

mappings/net/minecraft/entity/passive/MooshroomEntity.mapping

@@ -1,5 +1,5 @@
 CLASS are net/minecraft/entity/passive/MooshroomEntity
-	CLASS are$a Type
+	CLASS a Type
 		FIELD c name Ljava/lang/String;
 		FIELD d mushroom Lbvo;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;Lbvo;)V

mappings/net/minecraft/entity/passive/OcelotEntity.mapping

@@ -1,5 +1,5 @@
 CLASS arf net/minecraft/entity/passive/OcelotEntity
-	CLASS arf$a FleeGoal
+	CLASS a FleeGoal
 		FIELD i ocelot Larf;
 		METHOD <init> (Larf;Ljava/lang/Class;FDD)V
 			ARG 1 ocelot
@@ -7,7 +7,7 @@ CLASS arf net/minecraft/entity/passive/OcelotEntity
 			ARG 3 distance
 			ARG 4 slowSpeed
 			ARG 6 fastSpeed
-	CLASS arf$b OcelotTemptGoal
+	CLASS b OcelotTemptGoal
 		FIELD c ocelot Larf;
 		METHOD <init> (Larf;DLbej;Z)V
 			ARG 1 ocelot

mappings/net/minecraft/entity/passive/PandaEntity.mapping

@@ -1,5 +1,5 @@
 CLASS arg net/minecraft/entity/passive/PandaEntity
-	CLASS arg$a Gene
+	CLASS a Gene
 		FIELD h VALUES [Larg$a;
 		FIELD i id I
 		FIELD j name Ljava/lang/String;
@@ -19,12 +19,12 @@ CLASS arg net/minecraft/entity/passive/PandaEntity
 			ARG 0 mainGene
 			ARG 1 hiddenGene
 		METHOD c isRecessive ()Z
-	CLASS arg$b AttackGoal
+	CLASS b AttackGoal
 		FIELD d panda Larg;
 		METHOD <init> (Larg;DZ)V
 			ARG 1 panda
 			ARG 2 speed
-	CLASS arg$c PandaFleeGoal
+	CLASS c PandaFleeGoal
 		FIELD i panda Larg;
 		METHOD <init> (Larg;Ljava/lang/Class;FDD)V
 			ARG 1 panda
@@ -32,7 +32,7 @@ CLASS arg net/minecraft/entity/passive/PandaEntity
 			ARG 3 distance
 			ARG 4 slowSpeed
 			ARG 6 fastSpeed
-	CLASS arg$d PandaMateGoal
+	CLASS d PandaMateGoal
 		FIELD d CLOSE_PLAYER_PREDICATE Laqd;
 		FIELD e panda Larg;
 		FIELD f nextAskPlayerForBambooAge I
@@ -40,37 +40,37 @@ CLASS arg net/minecraft/entity/passive/PandaEntity
 			ARG 1 panda
 			ARG 2 chance
 		METHOD h isBambooClose ()Z
-	CLASS arg$e SpawnData
+	CLASS e SpawnData
-	CLASS arg$f PandaRevengeGoal
+	CLASS f PandaRevengeGoal
 		FIELD a panda Larg;
 		METHOD <init> (Larg;[Ljava/lang/Class;)V
 			ARG 1 panda
 			ARG 2 noRevengeTypes
-	CLASS arg$g LieOnBackGoal
+	CLASS g LieOnBackGoal
 		FIELD a panda Larg;
 		FIELD b nextLieOnBackAge I
 		METHOD <init> (Larg;)V
 			ARG 1 panda
-	CLASS arg$h LookAtEntityGoal
+	CLASS h LookAtEntityGoal
 		FIELD f panda Larg;
 		METHOD <init> (Larg;Ljava/lang/Class;F)V
 			ARG 1 panda
 			ARG 2 targetType
 			ARG 3 range
-	CLASS arg$i PandaMoveControl
+	CLASS i PandaMoveControl
 		FIELD i panda Larg;
-	CLASS arg$j ExtinguishFireGoal
+	CLASS j ExtinguishFireGoal
 		FIELD f panda Larg;
 		METHOD <init> (Larg;D)V
 			ARG 1 panda
 			ARG 2 speed
-	CLASS arg$k PlayGoal
+	CLASS k PlayGoal
 		FIELD a panda Larg;
 		METHOD <init> (Larg;)V
 			ARG 1 panda
-	CLASS arg$l PickUpFoodGoal
+	CLASS l PickUpFoodGoal
 		FIELD b startAge I
-	CLASS arg$m SneezeGoal
+	CLASS m SneezeGoal
 		FIELD a panda Larg;
 		METHOD <init> (Larg;)V
 			ARG 1 panda

mappings/net/minecraft/entity/passive/PolarBearEntity.mapping

@@ -1,9 +1,9 @@
 CLASS arj net/minecraft/entity/passive/PolarBearEntity
-	CLASS arj$a FollowPlayersGoal
+	CLASS a FollowPlayersGoal
-	CLASS arj$b PolarBearEntityData
+	CLASS b PolarBearEntityData
-	CLASS arj$c PolarBearRevengeGoal
+	CLASS c PolarBearRevengeGoal
-	CLASS arj$d AttackGoal
+	CLASS d AttackGoal
-	CLASS arj$e PolarBearEscapeDangerGoal
+	CLASS e PolarBearEscapeDangerGoal
 	FIELD bA lastWarningAnimationProgress F
 	FIELD bB warningAnimationProgress F
 	FIELD bC warningSoundCooldown I

mappings/net/minecraft/entity/passive/PufferfishEntity.mapping

@@ -1,5 +1,5 @@
 CLASS ark net/minecraft/entity/passive/PufferfishEntity
-	CLASS ark$a
+	CLASS a
 		FIELD a pufferfish Lark;
 		METHOD <init> (Lark;)V
 			ARG 1 pufferfish

mappings/net/minecraft/entity/passive/RabbitEntity.mapping

@@ -1,8 +1,8 @@
 CLASS arl net/minecraft/entity/passive/RabbitEntity
-	CLASS arl$a RabbitAttackGoal
+	CLASS a RabbitAttackGoal
 		METHOD <init> (Larl;)V
 			ARG 1 rabbit
-	CLASS arl$b FleeGoal
+	CLASS b FleeGoal
 		FIELD i rabbit Larl;
 		METHOD <init> (Larl;Ljava/lang/Class;FDD)V
 			ARG 1 rabbit
@@ -10,25 +10,25 @@ CLASS arl net/minecraft/entity/passive/RabbitEntity
 			ARG 3 distance
 			ARG 4 slowSpeed
 			ARG 6 fastSpeed
-	CLASS arl$c RabbitEntityData
+	CLASS c RabbitEntityData
 		FIELD a type I
 		METHOD <init> (I)V
 			ARG 1 type
-	CLASS arl$d RabbitJumpControl
+	CLASS d RabbitJumpControl
 		FIELD c rabbit Larl;
 		METHOD <init> (Larl;Larl;)V
 			ARG 2 owner
 		METHOD c isActive ()Z
-	CLASS arl$e RabbitMoveControl
+	CLASS e RabbitMoveControl
 		FIELD i rabbit Larl;
 		METHOD <init> (Larl;)V
 			ARG 1 owner
-	CLASS arl$f EscapeDangerGoal
+	CLASS f EscapeDangerGoal
 		FIELD f rabbit Larl;
 		METHOD <init> (Larl;D)V
 			ARG 1 rabbit
 			ARG 2 speed
-	CLASS arl$g EatCarrotCropGoal
+	CLASS g EatCarrotCropGoal
 		FIELD g rabbit Larl;
 		FIELD h wantsCarrots Z
 		METHOD <init> (Larl;)V

mappings/net/minecraft/entity/passive/SchoolingFishEntity.mapping

@@ -1,5 +1,5 @@
 CLASS aqu net/minecraft/entity/passive/SchoolingFishEntity
-	CLASS aqu$a Data
+	CLASS a Data
 		FIELD a leader Laqu;
 		METHOD <init> (Laqu;)V
 			ARG 1 leader

mappings/net/minecraft/entity/passive/SquidEntity.mapping

@@ -1,7 +1,7 @@
 CLASS arq net/minecraft/entity/passive/SquidEntity
-	CLASS arq$a EscapeAttackerGoal
+	CLASS a EscapeAttackerGoal
 		FIELD b timer I
-	CLASS arq$b SwimGoal
+	CLASS b SwimGoal
 		FIELD b squid Larq;
 		METHOD <init> (Larq;Larq;)V
 			ARG 2 squid

mappings/net/minecraft/entity/passive/TraderLlamaEntity.mapping

@@ -1,5 +1,5 @@
 CLASS asd net/minecraft/entity/passive/TraderLlamaEntity
-	CLASS asd$a DefendTraderGoal
+	CLASS a DefendTraderGoal
 		FIELD b llama Larz;
 		FIELD c offender Laiu;
 		FIELD d traderLastAttackedTime I

mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping

@@ -1,5 +1,5 @@
 CLASS arr net/minecraft/entity/passive/TropicalFishEntity
-	CLASS arr$a Variety
+	CLASS a Variety
 		FIELD m shape I
 		FIELD n pattern I
 		FIELD o VALUES [Larr$a;
@@ -12,7 +12,7 @@ CLASS arr net/minecraft/entity/passive/TropicalFishEntity
 			ARG 1 pattern
 		METHOD b getPattern ()I
 		METHOD c getTranslationKey ()Ljava/lang/String;
-	CLASS arr$b Data
+	CLASS b Data
 		FIELD b shape I
 		FIELD c pattern I
 		FIELD d baseColor I

mappings/net/minecraft/entity/passive/TurtleEntity.mapping

@@ -1,10 +1,10 @@
 CLASS ars net/minecraft/entity/passive/TurtleEntity
-	CLASS ars$a MateGoal
+	CLASS a MateGoal
 		FIELD d turtle Lars;
 		METHOD <init> (Lars;D)V
 			ARG 1 turtle
 			ARG 2 speed
-	CLASS ars$b GoHomeGoal
+	CLASS b GoHomeGoal
 		FIELD a turtle Lars;
 		FIELD b speed D
 		FIELD c noPath Z
@@ -12,36 +12,36 @@ CLASS ars net/minecraft/entity/passive/TurtleEntity
 		METHOD <init> (Lars;D)V
 			ARG 1 turtle
 			ARG 2 speed
-	CLASS ars$c WanderInWaterGoal
+	CLASS c WanderInWaterGoal
 		FIELD g turtle Lars;
 		METHOD <init> (Lars;D)V
 			ARG 1 turtle
 			ARG 2 speed
-	CLASS ars$d LayEggGoal
+	CLASS d LayEggGoal
 		FIELD g turtle Lars;
 		METHOD <init> (Lars;D)V
 			ARG 1 turtle
 			ARG 2 speed
-	CLASS ars$e TurtleMoveControl
+	CLASS e TurtleMoveControl
 		FIELD i turtle Lars;
 		METHOD <init> (Lars;)V
 			ARG 1 turtle
 		METHOD g updateVelocity ()V
-	CLASS ars$f TurtleEscapeDangerGoal
+	CLASS f TurtleEscapeDangerGoal
 		METHOD <init> (Lars;D)V
 			ARG 1 turtle
 			ARG 2 speed
-	CLASS ars$g TurtleSwimNavigation
+	CLASS g TurtleSwimNavigation
 		METHOD <init> (Lars;Lbhm;)V
 			ARG 1 owner
 			ARG 2 world
-	CLASS ars$h WanderOnLandGoal
+	CLASS h WanderOnLandGoal
 		FIELD h turtle Lars;
 		METHOD <init> (Lars;DI)V
 			ARG 1 turtle
 			ARG 2 speed
 			ARG 4 chance
-	CLASS ars$i ApproachFoodHoldingPlayerGoal
+	CLASS i ApproachFoodHoldingPlayerGoal
 		FIELD a CLOSE_ENTITY_PREDICATE Laqd;
 		FIELD b turtle Lars;
 		FIELD c speed D
@@ -54,7 +54,7 @@ CLASS ars net/minecraft/entity/passive/TurtleEntity
 			ARG 4 attractiveItem
 		METHOD a isAttractive (Lbce;)Z
 			ARG 1 stack
-	CLASS ars$j TravelGoal
+	CLASS j TravelGoal
 		FIELD a turtle Lars;
 		FIELD b speed D
 		FIELD c noPath Z

mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping

@@ -1,5 +1,5 @@
 CLASS avu net/minecraft/entity/passive/WanderingTraderEntity
-	CLASS avu$a WanderToTargetGoal
+	CLASS a WanderToTargetGoal
 		FIELD a trader Lavu;
 		FIELD b proximityDistance D
 		FIELD c speed D

mappings/net/minecraft/entity/passive/WolfEntity.mapping

@@ -1,5 +1,5 @@
 CLASS aru net/minecraft/entity/passive/WolfEntity
-	CLASS aru$a AvoidLlamaGoal
+	CLASS a AvoidLlamaGoal
 		FIELD j wolf Laru;
 		METHOD <init> (Laru;Laru;Ljava/lang/Class;FDD)V
 			ARG 2 wolf

mappings/net/minecraft/entity/player/ItemCooldownManager.mapping

@@ -1,5 +1,5 @@
 CLASS bca net/minecraft/entity/player/ItemCooldownManager
-	CLASS bca$a Entry
+	CLASS a Entry
 		FIELD b startTick I
 		FIELD c endTick I
 		METHOD <init> (Lbca;II)V

mappings/net/minecraft/entity/player/PlayerEntity.mapping

@@ -1,5 +1,5 @@
 CLASS awb net/minecraft/entity/player/PlayerEntity
-	CLASS awb$a SleepFailureReason
+	CLASS a SleepFailureReason
 		FIELD g text Ljn;
 		METHOD <init> (Ljava/lang/String;ILjn;)V
 			ARG 3 text

mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping

@@ -1,5 +1,5 @@
 CLASS atn net/minecraft/entity/projectile/FishingBobberEntity
-	CLASS atn$a State
+	CLASS a State
 	FIELD av state Latn$a;
 	FIELD aw lureLevel I
 	FIELD ax luckOfTheSeaLevel I

mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping

@@ -1,5 +1,5 @@
 CLASS awf net/minecraft/entity/projectile/ProjectileEntity
-	CLASS awf$a PickupPermission
+	CLASS a PickupPermission
 		METHOD a fromOrdinal (I)Lawf$a;
 	FIELD aA piercingKilledEntities Ljava/util/List;
 	FIELD ar PROJECTILE_FLAGS Lqi;

mappings/net/minecraft/entity/raid/Raid.mapping

@@ -1,9 +1,9 @@
 CLASS axf net/minecraft/entity/raid/Raid
-	CLASS axf$a Status
+	CLASS a Status
 		FIELD e VALUES [Laxf$a;
 		METHOD a getName ()Ljava/lang/String;
 		METHOD b fromName (Ljava/lang/String;)Laxf$a;
-	CLASS axf$b Member
+	CLASS b Member
 		FIELD f VALUES [Laxf$b;
 		FIELD g type Laip;
 		FIELD h countInWave [I

mappings/net/minecraft/entity/raid/RaiderEntity.mapping

@@ -1,20 +1,20 @@
 CLASS axg net/minecraft/entity/raid/RaiderEntity
-	CLASS axg$a PatrolApproachGoal
+	CLASS a PatrolApproachGoal
 		FIELD a closeRaiderPredicate Laqd;
 		FIELD c raider Laxg;
 		FIELD d squaredDistance F
 		METHOD <init> (Laxg;Latv;F)V
 			ARG 2 illager
 			ARG 3 distance
-	CLASS axg$b PickupBannerAsLeaderGoal
+	CLASS b PickupBannerAsLeaderGoal
 		FIELD b actor Laxg;
 		METHOD <init> (Laxg;Laxg;)V
 			ARG 2 actor
-	CLASS axg$c CelebrateGoal
+	CLASS c CelebrateGoal
 		FIELD b raider Laxg;
 		METHOD <init> (Laxg;Laxg;)V
 			ARG 2 raider
-	CLASS axg$d AttackHomeGoal
+	CLASS d AttackHomeGoal
 		FIELD a raider Laxg;
 		FIELD b speed D
 		FIELD c home Lev;

mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping

@@ -1,5 +1,5 @@
 CLASS axp net/minecraft/entity/vehicle/AbstractMinecartEntity
-	CLASS axp$a Type
+	CLASS a Type
 	FIELD b DAMAGE_WOBBLE_TICKS Lqi;
 	FIELD c DAMAGE_WOBBLE_SIDE Lqi;
 	FIELD d DAMAGE_WOBBLE_STRENGTH Lqi;

mappings/net/minecraft/entity/vehicle/BoatEntity.mapping

@@ -1,6 +1,6 @@
 CLASS axr net/minecraft/entity/vehicle/BoatEntity
-	CLASS axr$a Location
+	CLASS a Location
-	CLASS axr$b Type
+	CLASS b Type
 		FIELD g name Ljava/lang/String;
 		FIELD h baseBlock Lbmq;
 		METHOD a getName ()Ljava/lang/String;

mappings/net/minecraft/entity/vehicle/CommandBlockMinecartEntity.mapping

@@ -1,5 +1,5 @@
 CLASS axu net/minecraft/entity/vehicle/CommandBlockMinecartEntity
-	CLASS axu$a CommandExecutor
+	CLASS a CommandExecutor
 		METHOD g getMinecart ()Laxu;
 	FIELD b COMMAND Lqi;
 	FIELD c LAST_OUTPUT Lqi;

mappings/net/minecraft/fluid/LavaFluid.mapping

@@ -1,3 +1,3 @@
 CLASS cli net/minecraft/fluid/LavaFluid
-	CLASS cli$a Flowing
+	CLASS a Flowing
-	CLASS cli$b Still
+	CLASS b Still

mappings/net/minecraft/fluid/WaterFluid.mapping

@@ -1,3 +1,3 @@
 CLASS clm net/minecraft/fluid/WaterFluid
-	CLASS clm$a Flowing
+	CLASS a Flowing
-	CLASS clm$b Still
+	CLASS b Still

mappings/net/minecraft/item/ClockItem.mapping

@@ -1,5 +1,5 @@
 CLASS bas net/minecraft/item/ClockItem
-	CLASS bas$1
+	CLASS 1
 		FIELD b time D
 		FIELD c step D
 		FIELD d lastTick J

mappings/net/minecraft/item/CompassItem.mapping

@@ -1,5 +1,5 @@
 CLASS bat net/minecraft/item/CompassItem
-	CLASS bat$1
+	CLASS 1
 		FIELD b angle D
 		FIELD c step D
 		FIELD d lastTick J

mappings/net/minecraft/item/FireworkItem.mapping

@@ -1,5 +1,5 @@
 CLASS bbq net/minecraft/item/FireworkItem
-	CLASS bbq$a Type
+	CLASS a Type
 		FIELD f TYPES [Lbbq$a;
 		FIELD g id I
 		FIELD h name Ljava/lang/String;

mappings/net/minecraft/item/FoodComponent.mapping

@@ -1,5 +1,5 @@
 CLASS ayc net/minecraft/item/FoodComponent
-	CLASS ayc$a Builder
+	CLASS a Builder
 		FIELD a hunger I
 		FIELD b saturationModifier F
 		FIELD c meat Z

mappings/net/minecraft/item/Item.mapping

@@ -1,5 +1,5 @@
 CLASS bbz net/minecraft/item/Item
-	CLASS bbz$a Settings
+	CLASS a Settings
 		FIELD a maxCount I
 		FIELD b maxDamage I
 		FIELD c recipeRemainder Lbbz;

mappings/net/minecraft/item/ItemGroup.mapping

@@ -1,38 +1,38 @@
 CLASS bav net/minecraft/item/ItemGroup
-	CLASS bav$1
+	CLASS 1
 		METHOD <init> (ILjava/lang/String;)V
 			ARG 1 unlocalizedName
-	CLASS bav$2
+	CLASS 2
 		METHOD <init> (ILjava/lang/String;)V
 			ARG 1 unlocalizedName
-	CLASS bav$3
+	CLASS 3
 		METHOD <init> (ILjava/lang/String;)V
 			ARG 1 unlocalizedName
-	CLASS bav$4
+	CLASS 4
 		METHOD <init> (ILjava/lang/String;)V
 			ARG 1 unlocalizedName
-	CLASS bav$5
+	CLASS 5
 		METHOD <init> (ILjava/lang/String;)V
 			ARG 1 unlocalizedName
-	CLASS bav$6
+	CLASS 6
 		METHOD <init> (ILjava/lang/String;)V
 			ARG 1 unlocalizedName
-	CLASS bav$7
+	CLASS 7
 		METHOD <init> (ILjava/lang/String;)V
 			ARG 1 unlocalizedName
-	CLASS bav$8
+	CLASS 8
 		METHOD <init> (ILjava/lang/String;)V
 			ARG 1 unlocalizedName
-	CLASS bav$9
+	CLASS 9
 		METHOD <init> (ILjava/lang/String;)V
 			ARG 1 unlocalizedName
-	CLASS bav$10
+	CLASS 10
 		METHOD <init> (ILjava/lang/String;)V
 			ARG 1 unlocalizedName
-	CLASS bav$11
+	CLASS 11
 		METHOD <init> (ILjava/lang/String;)V
 			ARG 1 unlocalizedName
-	CLASS bav$12
+	CLASS 12
 		METHOD <init> (ILjava/lang/String;)V
 			ARG 1 unlocalizedName
 	FIELD a GROUPS [Lbav;

mappings/net/minecraft/item/map/MapIcon.mapping

@@ -1,5 +1,5 @@
 CLASS cny net/minecraft/item/map/MapIcon
-	CLASS cny$a Type
+	CLASS a Type
 		FIELD B id B
 		FIELD C alwaysRender Z
 		FIELD D tintColor I

mappings/net/minecraft/item/map/MapState.mapping

@@ -1,5 +1,5 @@
 CLASS cob net/minecraft/item/map/MapState
-	CLASS cob$a PlayerUpdateTracker
+	CLASS a PlayerUpdateTracker
 		FIELD a player Lawb;
 		FIELD d dirty Z
 		FIELD e startX I

mappings/net/minecraft/network/ClientConnection.mapping

@@ -1,5 +1,5 @@
 CLASS jb net/minecraft/network/ClientConnection
-	CLASS jb$a PacketWrapper
+	CLASS a PacketWrapper
 		FIELD a packet Lkb;
 		FIELD b listener Lio/netty/util/concurrent/GenericFutureListener;
 	FIELD a MARKER_NETWORK Lorg/apache/logging/log4j/Marker;

mappings/net/minecraft/particle/ParticleEffect.mapping

@@ -1,5 +1,5 @@
 CLASS ge net/minecraft/particle/ParticleEffect
-	CLASS ge$a Factory
+	CLASS a Factory
 		METHOD b read (Lgf;Lcom/mojang/brigadier/StringReader;)Lge;
 			ARG 1 type
 			ARG 2 reader

mappings/net/minecraft/predicate/DamagePredicate.mapping

@@ -1,5 +1,5 @@
 CLASS al net/minecraft/predicate/DamagePredicate
-	CLASS al$a Builder
+	CLASS a Builder
 		FIELD a dealt Lbi$c;
 		FIELD b taken Lbi$c;
 		FIELD c sourceEntity Lav;

mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping

@@ -1,5 +1,5 @@
 CLASS am net/minecraft/predicate/entity/DamageSourcePredicate
-	CLASS am$a Builder
+	CLASS a Builder
 		FIELD a isProjectile Ljava/lang/Boolean;
 		FIELD b isExplosion Ljava/lang/Boolean;
 		FIELD c bypassesArmor Ljava/lang/Boolean;

mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping

@@ -1,5 +1,5 @@
 CLASS bj net/minecraft/predicate/entity/EntityEffectPredicate
-	CLASS bj$a EffectData
+	CLASS a EffectData
 		FIELD a amplifier Lbi$d;
 		FIELD b duration Lbi$d;
 		FIELD c ambient Ljava/lang/Boolean;

mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping

@@ -1,5 +1,5 @@
 CLASS at net/minecraft/predicate/entity/EntityFlagsPredicate
-	CLASS at$a Builder
+	CLASS a Builder
 		FIELD a isOnFire Ljava/lang/Boolean;
 		FIELD b isSneaking Ljava/lang/Boolean;
 		FIELD c isSprinting Ljava/lang/Boolean;

mappings/net/minecraft/predicate/entity/EntityPredicate.mapping

@@ -1,5 +1,5 @@
 CLASS av net/minecraft/predicate/entity/EntityPredicate
-	CLASS av$a Builder
+	CLASS a Builder
 		FIELD a type Law;
 		FIELD b distance Lan;
 		FIELD c location Lbg;

mappings/net/minecraft/predicate/entity/EntityPredicates.mapping

@@ -1,5 +1,5 @@
 CLASS aio net/minecraft/predicate/entity/EntityPredicates
-	CLASS aio$a CanPickup
+	CLASS a CanPickup
 		FIELD a itemstack Lbce;
 		METHOD test (Ljava/lang/Object;)Z
 			ARG 1 context

mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping

@@ -1,7 +1,7 @@
 CLASS aw net/minecraft/predicate/entity/EntityTypePredicate
-	CLASS aw$a Tagged
+	CLASS a Tagged
 		FIELD b tag Lze;
-	CLASS aw$b Single
+	CLASS b Single
 		FIELD b type Laip;
 	FIELD a ANY Law;
 	FIELD b COMMA_JOINER Lcom/google/common/base/Joiner;

mappings/net/minecraft/predicate/entity/LocationPredicate.mapping

@@ -1,5 +1,5 @@
 CLASS bg net/minecraft/predicate/entity/LocationPredicate
-	CLASS bg$a Builder
+	CLASS a Builder
 		FIELD a x Lbi$c;
 		FIELD b y Lbi$c;
 		FIELD c z Lbi$c;

mappings/net/minecraft/predicate/item/ItemPredicate.mapping

@@ -1,5 +1,5 @@
 CLASS bc net/minecraft/predicate/item/ItemPredicate
-	CLASS bc$a Builder
+	CLASS a Builder
 		FIELD a enchantments Ljava/util/List;
 		FIELD b item Lbbz;
 		FIELD c tag Lze;

mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping

@@ -1,5 +1,5 @@
 CLASS bdu net/minecraft/recipe/BrewingRecipeRegistry
-	CLASS bdu$a Recipe
+	CLASS a Recipe
 		FIELD a input Ljava/lang/Object;
 		FIELD b ingredient Lbej;
 		FIELD c output Ljava/lang/Object;

mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping

@@ -1,5 +1,5 @@
 CLASS bev net/minecraft/recipe/CookingRecipeSerializer
-	CLASS bev$a RecipeFactory
+	CLASS a RecipeFactory
 	FIELD u cookingTime I
 	FIELD v recipeFactory Lbev$a;
 	METHOD <init> (Lbev$a;I)V

mappings/net/minecraft/recipe/CuttingRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS bex net/minecraft/recipe/CuttingRecipe
-	CLASS bex$a Serializer
+	CLASS a Serializer
 	FIELD a ingredient Lbej;
 	FIELD b result Lbce;
 	FIELD c id Lqt;

mappings/net/minecraft/recipe/Ingredient.mapping

@@ -1,9 +1,9 @@
 CLASS bej net/minecraft/recipe/Ingredient
-	CLASS bej$a StackEntry
+	CLASS a StackEntry
 		FIELD a stack Lbce;
-	CLASS bej$b TagEntry
+	CLASS b TagEntry
 		FIELD a tag Lze;
-	CLASS bej$c Entry
+	CLASS c Entry
 		METHOD a getStacks ()Ljava/util/Collection;
 		METHOD b toJson ()Lcom/google/gson/JsonObject;
 	FIELD a EMPTY Lbej;

mappings/net/minecraft/recipe/RecipeFinder.mapping

@@ -1,5 +1,5 @@
 CLASS awd net/minecraft/recipe/RecipeFinder
-	CLASS awd$a Filter
+	CLASS a Filter
 		FIELD b recipe Lbem;
 		FIELD c ingredients Ljava/util/List;
 		FIELD d ingredientCount I

mappings/net/minecraft/recipe/ShapedRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS ber net/minecraft/recipe/ShapedRecipe
-	CLASS ber$a Serializer
+	CLASS a Serializer
 	FIELD a width I
 	FIELD b height I
 	FIELD c inputs Lfj;

mappings/net/minecraft/recipe/ShapelessRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS bes net/minecraft/recipe/ShapelessRecipe
-	CLASS bes$a Serializer
+	CLASS a Serializer
 		METHOD a getIngredients (Lcom/google/gson/JsonArray;)Lfj;
 			ARG 0 json
 	FIELD a id Lqt;

mappings/net/minecraft/resource/NamespaceResourceManager.mapping

@@ -1,5 +1,5 @@
 CLASS xa net/minecraft/resource/NamespaceResourceManager
-	CLASS xa$a DebugInputStream
+	CLASS a DebugInputStream
 		FIELD a parent Ljava/io/InputStream;
 		FIELD b leakMessage Ljava/lang/String;
 		FIELD c closed Z

mappings/net/minecraft/resource/ProfilingResourceReloader.mapping

@@ -1,5 +1,5 @@
 CLASS xc net/minecraft/resource/ProfilingResourceReloader
-	CLASS xc$a Summary
+	CLASS a Summary
 		FIELD a name Ljava/lang/String;
 		FIELD b prepareProfile Lagj;
 		FIELD c applyProfile Lagj;

mappings/net/minecraft/resource/ResourcePackContainer.mapping

@@ -1,12 +1,12 @@
 CLASS wy net/minecraft/resource/ResourcePackContainer
-	CLASS wy$a InsertionPosition
+	CLASS a InsertionPosition
 		METHOD a inverse ()Lwy$a;
 		METHOD a insert (Ljava/util/List;Ljava/lang/Object;Ljava/util/function/Function;Z)I
 			ARG 1 items
 			ARG 2 item
 			ARG 3 converter
 			ARG 4 inverse
-	CLASS wy$b Factory
+	CLASS b Factory
 		METHOD create (Ljava/lang/String;ZLjava/util/function/Supplier;Lwj;Lwo;Lwy$a;)Lwy;
 			ARG 1 name
 			ARG 2 alwaysCreatePack

mappings/net/minecraft/resource/ResourceReloadListener.mapping

@@ -1,5 +1,5 @@
 CLASS xb net/minecraft/resource/ResourceReloadListener
-	CLASS xb$a Synchronizer
+	CLASS a Synchronizer
 		METHOD a whenPrepared (Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture;
 			ARG 1 preparedObject
 	METHOD a reload (Lxb$a;Lxg;Lagk;Lagk;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;

mappings/net/minecraft/resource/ResourceReloader.mapping

@@ -1,5 +1,5 @@
 CLASS xk net/minecraft/resource/ResourceReloader
-	CLASS xk$a Factory
+	CLASS a Factory
 		METHOD create (Lxb$a;Lxg;Lxb;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
 			ARG 1 helper
 			ARG 2 manager

mappings/net/minecraft/scoreboard/AbstractTeam.mapping

@@ -1,5 +1,5 @@
 CLASS ctd net/minecraft/scoreboard/AbstractTeam
-	CLASS ctd$a CollisionRule
+	CLASS a CollisionRule
 		FIELD e name Ljava/lang/String;
 		FIELD f value I
 		FIELD g COLLISION_RULES Ljava/util/Map;
@@ -9,7 +9,7 @@ CLASS ctd net/minecraft/scoreboard/AbstractTeam
 		METHOD a getRule (Ljava/lang/String;)Lctd$a;
 			ARG 0 name
 		METHOD b getTranslationKey ()Ljn;
-	CLASS ctd$b VisibilityRule
+	CLASS b VisibilityRule
 		FIELD e name Ljava/lang/String;
 		FIELD f value I
 		FIELD g VISIBILITY_RULES Ljava/util/Map;

mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping

@@ -1,5 +1,5 @@
 CLASS cte net/minecraft/scoreboard/ScoreboardCriterion
-	CLASS cte$a RenderType
+	CLASS a RenderType
 		FIELD c name Ljava/lang/String;
 		FIELD d CRITERION_TYPES Ljava/util/Map;
 		METHOD a getName ()Ljava/lang/String;

mappings/net/minecraft/scoreboard/ServerScoreboard.mapping

@@ -1,5 +1,5 @@
 CLASS rh net/minecraft/scoreboard/ServerScoreboard
-	CLASS rh$a UpdateMode
+	CLASS a UpdateMode
 	FIELD a server Lnet/minecraft/server/MinecraftServer;
 	FIELD b objectives Ljava/util/Set;
 	FIELD c updateListeners [Ljava/lang/Runnable;

mappings/net/minecraft/server/MinecraftServer.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/server/MinecraftServer
-	CLASS net/minecraft/server/MinecraftServer$1
+	CLASS 1
 		FIELD b lastProgressUpdate J
 	FIELD A spawnAnimals Z
 	FIELD B spawnNpcs Z

mappings/net/minecraft/server/ServerConfigHandler.mapping

@@ -1,29 +1,29 @@
 CLASS xs net/minecraft/server/ServerConfigHandler
-	CLASS xs$1
+	CLASS 1
 		METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V
 			ARG 1 profile
 			ARG 2 exception
 		METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V
 			ARG 1 profile
-	CLASS xs$2
+	CLASS 2
 		METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V
 			ARG 1 profile
 			ARG 2 exception
 		METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V
 			ARG 1 profile
-	CLASS xs$3
+	CLASS 3
 		METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V
 			ARG 1 profile
 			ARG 2 exception
 		METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V
 			ARG 1 profile
-	CLASS xs$4
+	CLASS 4
 		METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V
 			ARG 1 profile
 			ARG 2 exception
 		METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V
 			ARG 1 profile
-	CLASS xs$5
+	CLASS 5
 		METHOD a getPlayerFileName (Lcom/mojang/authlib/GameProfile;)Ljava/lang/String;
 			ARG 1 profile
 		METHOD a convertPlayerFile (Ljava/io/File;Ljava/lang/String;Ljava/lang/String;)V
@@ -35,7 +35,7 @@ CLASS xs net/minecraft/server/ServerConfigHandler
 			ARG 2 exception
 		METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V
 			ARG 1 profile
-	CLASS xs$a ServerConfigException
+	CLASS a ServerConfigException
 		METHOD <init> (Ljava/lang/String;)V
 			ARG 1 title
 		METHOD <init> (Ljava/lang/String;Ljava/lang/Throwable;)V

mappings/net/minecraft/server/ServerConfigList.mapping

@@ -1,5 +1,5 @@
 CLASS xx net/minecraft/server/ServerConfigList
-	CLASS xx$a DeSerializer
+	CLASS a DeSerializer
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 functionJson
 			ARG 2 unused

mappings/net/minecraft/server/ServerMetadata.mapping

@@ -1,6 +1,6 @@
 CLASS qd net/minecraft/server/ServerMetadata
-	CLASS qd$a Players
+	CLASS a Players
-		CLASS qd$a$a Deserializer
+		CLASS a Deserializer
 			METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
 				ARG 1 entry
 				ARG 2 unused
@@ -14,13 +14,13 @@ CLASS qd net/minecraft/server/ServerMetadata
 		METHOD a setSample ([Lcom/mojang/authlib/GameProfile;)V
 		METHOD b getOnlinePlayerCount ()I
 		METHOD c getSample ()[Lcom/mojang/authlib/GameProfile;
-	CLASS qd$b Deserializer
+	CLASS b Deserializer
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 functionJson
 			ARG 2 unused
 			ARG 3 context
-	CLASS qd$c Version
+	CLASS c Version
-		CLASS qd$c$a Serializer
+		CLASS a Serializer
 			METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;
 				ARG 1 entry
 				ARG 2 unused

mappings/net/minecraft/server/command/AdvancementCommand.mapping

@@ -1,5 +1,5 @@
 CLASS rm net/minecraft/server/command/AdvancementCommand
-	CLASS rm$a Operation
+	CLASS a Operation
 		FIELD a GRANT Lrm$a;
 		FIELD b REVOKE Lrm$a;
 		FIELD c commandPrefix Ljava/lang/String;
@@ -8,7 +8,7 @@ CLASS rm net/minecraft/server/command/AdvancementCommand
 		METHOD a processEach (Lvj;Lq;)Z
 		METHOD a processEachCriterion (Lvj;Lq;Ljava/lang/String;)Z
 			ARG 3 criterion
-	CLASS rm$b Selection
+	CLASS b Selection
 		FIELD f before Z
 		FIELD g after Z
 	FIELD a SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider;

mappings/net/minecraft/server/command/CloneCommand.mapping

@@ -1,5 +1,5 @@
 CLASS rs net/minecraft/server/command/CloneCommand
-	CLASS rs$a BlockInfo
+	CLASS a BlockInfo
 		FIELD a pos Lev;
 		FIELD b state Lbvo;
 		FIELD c blockEntityTag Lic;
@@ -7,7 +7,7 @@ CLASS rs net/minecraft/server/command/CloneCommand
 			ARG 1 pos
 			ARG 2 state
 			ARG 3 blockEntityTag
-	CLASS rs$b Mode
+	CLASS b Mode
 		FIELD d allowsOverlap Z
 		METHOD <init> (Ljava/lang/String;IZ)V
 			ARG 3 allowsOverlap

mappings/net/minecraft/server/command/CommandManager.mapping

@@ -1,5 +1,5 @@
 CLASS ce net/minecraft/server/command/CommandManager
-	CLASS ce$a CommandParser
+	CLASS a CommandParser
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b dispatcher Lcom/mojang/brigadier/CommandDispatcher;
 	METHOD <init> (Z)V

mappings/net/minecraft/server/command/CommandSource.mapping

@@ -1,5 +1,5 @@
 CLASS cf net/minecraft/server/command/CommandSource
-	CLASS cf$a RelativePosition
+	CLASS a RelativePosition
 		FIELD a ZERO_LOCAL Lcf$a;
 		FIELD b ZERO_WORLD Lcf$a;
 		FIELD c x Ljava/lang/String;

mappings/net/minecraft/server/command/DataCommand.mapping

@@ -1,14 +1,14 @@
 CLASS ud net/minecraft/server/command/DataCommand
-	CLASS ud$a ModifyOperation
+	CLASS a ModifyOperation
 		METHOD modify (Lcom/mojang/brigadier/context/CommandContext;Lic;Lcr$h;Ljava/util/List;)I
 			ARG 1 context
 			ARG 2 sourceTag
 			ARG 3 path
 			ARG 4 tags
-	CLASS ud$b ModifyArgumentCreator
+	CLASS b ModifyArgumentCreator
 		METHOD create (Lud$a;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
 			ARG 1 modifier
-	CLASS ud$c ObjectType
+	CLASS c ObjectType
 		METHOD a addArgumentsToBuilder (Lcom/mojang/brigadier/builder/ArgumentBuilder;Ljava/util/function/Function;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
 			ARG 1 argument
 			ARG 2 argumentAdder

mappings/net/minecraft/server/command/DatapackCommand.mapping

@@ -1,5 +1,5 @@
 CLASS rt net/minecraft/server/command/DatapackCommand
-	CLASS rt$a PackAdder
+	CLASS a PackAdder
 	FIELD a UNKNOWN_DATAPACK_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD b ALREADY_ENABLED_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
 	FIELD c ALREADY_DISABLED_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;

mappings/net/minecraft/server/command/ExecuteCommand.mapping

@@ -1,8 +1,8 @@
 CLASS sc net/minecraft/server/command/ExecuteCommand
-	CLASS sc$a ExistsCondition
+	CLASS a ExistsCondition
 		METHOD test (Lcom/mojang/brigadier/context/CommandContext;)I
 			ARG 1 context
-	CLASS sc$b Condition
+	CLASS b Condition
 		METHOD test (Lcom/mojang/brigadier/context/CommandContext;)Z
 			ARG 1 context
 	FIELD a BLOCKS_TOOBIG_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;

mappings/net/minecraft/server/command/ExperienceCommand.mapping

@@ -1,5 +1,5 @@
 CLASS sd net/minecraft/server/command/ExperienceCommand
-	CLASS sd$a Component
+	CLASS a Component
 		FIELD c adder Ljava/util/function/BiConsumer;
 		FIELD d setter Ljava/util/function/BiPredicate;
 		FIELD e name Ljava/lang/String;

mappings/net/minecraft/server/command/FillCommand.mapping

@@ -1,5 +1,5 @@
 CLASS se net/minecraft/server/command/FillCommand
-	CLASS se$a Mode
+	CLASS a Mode
 		FIELD e filter Lti$a;
 	FIELD a TOOBIG_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;
 	FIELD b AIR_BLOCK_ARGUMENT Lde;

mappings/net/minecraft/server/command/GameRuleCommand.mapping

@@ -1,5 +1,5 @@
 CLASS si net/minecraft/server/command/GameRuleCommand
-	CLASS si$1
+	CLASS 1
 		METHOD a (Lbhi$d;Lcom/mojang/brigadier/context/CommandContext;)I
 			ARG 1 context
 		METHOD b (Lbhi$d;Lcom/mojang/brigadier/context/CommandContext;)I

mappings/net/minecraft/server/command/LootCommand.mapping

@@ -1,13 +1,13 @@
 CLASS sp net/minecraft/server/command/LootCommand
-	CLASS sp$a FeedbackMessage
+	CLASS a FeedbackMessage
 		METHOD accept (Ljava/util/List;)V
 			ARG 1 items
-	CLASS sp$b Target
+	CLASS b Target
 		METHOD accept (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/List;Lsp$a;)I
 			ARG 1 context
 			ARG 2 items
 			ARG 3 messageSender
-	CLASS sp$c SourceConstructor
+	CLASS c SourceConstructor
 		METHOD construct (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lsp$b;)Lcom/mojang/brigadier/builder/ArgumentBuilder;
 			ARG 1 builder
 			ARG 2 target

mappings/net/minecraft/server/command/SetBlockCommand.mapping

@@ -1,11 +1,11 @@
 CLASS ti net/minecraft/server/command/SetBlockCommand
-	CLASS ti$a Filter
+	CLASS a Filter
 		METHOD filter (Lchx;Lev;Lde;Lvi;)Lde;
 			ARG 1 box
 			ARG 2 pos
 			ARG 3 block
 			ARG 4 world
-	CLASS ti$b Mode
+	CLASS b Mode
 	FIELD a FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
 	METHOD a execute (Lcd;Lev;Lde;Lti$b;Ljava/util/function/Predicate;)I
 		ARG 0 source

mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping

@@ -1,5 +1,5 @@
 CLASS tm net/minecraft/server/command/SpreadPlayersCommand
-	CLASS tm$a Pile
+	CLASS a Pile
 		FIELD a x D
 		FIELD b z D
 		METHOD a normalize ()V

mappings/net/minecraft/server/command/TeleportCommand.mapping

@@ -1,5 +1,5 @@
 CLASS tt net/minecraft/server/command/TeleportCommand
-	CLASS tt$a LookTarget
+	CLASS a LookTarget
 		FIELD a targetPos Lcsb;
 		FIELD b targetEntity Lail;
 		FIELD c targetEntityAnchor Lck$a;

mappings/net/minecraft/server/dedicated/AbstractPropertiesHandler.mapping

@@ -1,5 +1,5 @@
 CLASS um net/minecraft/server/dedicated/AbstractPropertiesHandler
-	CLASS um$a PropertyAccessor
+	CLASS a PropertyAccessor
 		FIELD b key Ljava/lang/String;
 		FIELD c value Ljava/lang/Object;
 		FIELD d stringify Ljava/util/function/Function;

mappings/net/minecraft/server/function/CommandFunction.mapping

@@ -1,16 +1,16 @@
 CLASS ca net/minecraft/server/function/CommandFunction
-	CLASS ca$a LazyContainer
+	CLASS a LazyContainer
 		FIELD a EMPTY Lca$a;
 		FIELD b id Lqt;
 		FIELD c initialized Z
 		FIELD d function Ljava/util/Optional;
 		METHOD a getId ()Lqt;
 		METHOD a get (Lrf;)Ljava/util/Optional;
-	CLASS ca$b CommandElement
+	CLASS b CommandElement
 		FIELD a parsed Lcom/mojang/brigadier/ParseResults;
-	CLASS ca$c Element
+	CLASS c Element
 		METHOD a execute (Lrf;Lcd;Ljava/util/ArrayDeque;I)V
-	CLASS ca$d FunctionElement
+	CLASS d FunctionElement
 		FIELD a function Lca$a;
 	FIELD a elements [Lca$c;
 	FIELD b id Lqt;

mappings/net/minecraft/server/function/CommandFunctionManager.mapping

@@ -1,5 +1,5 @@
 CLASS rf net/minecraft/server/function/CommandFunctionManager
-	CLASS rf$a Entry
+	CLASS a Entry
 		FIELD a manager Lrf;
 		FIELD b source Lcd;
 		FIELD c element Lca$c;

mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping

@@ -1,5 +1,5 @@
 CLASS wc net/minecraft/server/network/ServerLoginNetworkHandler
-	CLASS wc$a State
+	CLASS a State
 	FIELD a client Ljb;
 	FIELD b authenticatorThreadId Ljava/util/concurrent/atomic/AtomicInteger;
 	FIELD c LOGGER Lorg/apache/logging/log4j/Logger;

mappings/net/minecraft/server/network/packet/AdvancementTabC2SPacket.mapping

@@ -1,5 +1,5 @@
 CLASS ow net/minecraft/server/network/packet/AdvancementTabC2SPacket
-	CLASS ow$a Action
+	CLASS a Action
 	FIELD a action Low$a;
 	FIELD b tabToOpen Lqt;
 	METHOD <init> (Low$a;Lqt;)V

mappings/net/minecraft/server/network/packet/ClientCommandC2SPacket.mapping

@@ -1,5 +1,5 @@
 CLASS or net/minecraft/server/network/packet/ClientCommandC2SPacket
-	CLASS or$a Mode
+	CLASS a Mode
 	FIELD a entityId I
 	FIELD b mode Lor$a;
 	FIELD c mountJumpHeight I

mappings/net/minecraft/server/network/packet/ClientStatusC2SPacket.mapping

@@ -1,5 +1,5 @@
 CLASS nx net/minecraft/server/network/packet/ClientStatusC2SPacket
-	CLASS nx$a Mode
+	CLASS a Mode
 	FIELD a mode Lnx$a;
 	METHOD <init> (Lnx$a;)V
 		ARG 1 mode

mappings/net/minecraft/server/network/packet/PlayerActionC2SPacket.mapping

@@ -1,5 +1,5 @@
 CLASS oq net/minecraft/server/network/packet/PlayerActionC2SPacket
-	CLASS oq$a Action
+	CLASS a Action
 	FIELD a pos Lev;
 	FIELD b direction Lfa;
 	FIELD c action Loq$a;

mappings/net/minecraft/server/network/packet/PlayerInteractEntityC2SPacket.mapping

@@ -1,5 +1,5 @@
 CLASS oh net/minecraft/server/network/packet/PlayerInteractEntityC2SPacket
-	CLASS oh$a InteractionType
+	CLASS a InteractionType
 	FIELD a entityId I
 	FIELD b type Loh$a;
 	FIELD c hitPos Lcsb;

mappings/net/minecraft/server/network/packet/PlayerMoveC2SPacket.mapping

@@ -1,12 +1,12 @@
 CLASS ok net/minecraft/server/network/packet/PlayerMoveC2SPacket
-	CLASS ok$a PositionOnly
+	CLASS a PositionOnly
 		METHOD <init> (DDDZ)V
 			ARG 1 x
 			ARG 3 y
 			ARG 5 z
 			ARG 7 onGround
-	CLASS ok$b Both
+	CLASS b Both
-	CLASS ok$c LookOnly
+	CLASS c LookOnly
 	FIELD a x D
 	FIELD b y D
 	FIELD c z D

mappings/net/minecraft/server/network/packet/RecipeBookDataC2SPacket.mapping

@@ -1,5 +1,5 @@
 CLASS ot net/minecraft/server/network/packet/RecipeBookDataC2SPacket
-	CLASS ot$a Mode
+	CLASS a Mode
 	FIELD a mode Lot$a;
 	FIELD b recipeId Lqt;
 	FIELD c guiOpen Z

mappings/net/minecraft/server/network/packet/ResourcePackStatusC2SPacket.mapping

@@ -1,3 +1,3 @@
 CLASS ov net/minecraft/server/network/packet/ResourcePackStatusC2SPacket
-	CLASS ov$a Status
+	CLASS a Status
 	FIELD a status Lov$a;

mappings/net/minecraft/server/world/ChunkHolder.mapping

@@ -1,16 +1,16 @@
 CLASS ut net/minecraft/server/world/ChunkHolder
-	CLASS ut$a Unloaded
+	CLASS a Unloaded
 		FIELD b INSTANCE Lut$a;
-	CLASS ut$b LevelType
+	CLASS b LevelType
 		METHOD a isAfter (Lut$b;)Z
 			ARG 1 levelType
-	CLASS ut$c LevelUpdateListener
+	CLASS c LevelUpdateListener
 		METHOD a updateLevel (Lbgy;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V
 			ARG 1 pos
 			ARG 2 levelGetter
 			ARG 3 targetLevel
 			ARG 4 levelSetter
-	CLASS ut$d PlayersWatchingChunkProvider
+	CLASS d PlayersWatchingChunkProvider
 		METHOD a getPlayersWatchingChunk (Lbgy;Z)Ljava/util/stream/Stream;
 			ARG 1 chunkPos
 			ARG 2 onlyOnWatchDistanceEdge

mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping

@@ -1,5 +1,5 @@
 CLASS uw net/minecraft/server/world/ChunkTaskPrioritySystem
-	CLASS uw$a RunnableMessage
+	CLASS a RunnableMessage
 		FIELD a function Ljava/util/function/Function;
 		FIELD b pos J
 		FIELD c lastLevelUpdatedToProvider Ljava/util/function/IntSupplier;
@@ -7,7 +7,7 @@ CLASS uw net/minecraft/server/world/ChunkTaskPrioritySystem
 			ARG 1 function
 			ARG 2 pos
 			ARG 4 lastLevelUpdatedToProvider
-	CLASS uw$b SorterMessage
+	CLASS b SorterMessage
 		FIELD a runnable Ljava/lang/Runnable;
 		FIELD b pos J
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;

mappings/net/minecraft/server/world/ChunkTicketManager.mapping

@@ -1,5 +1,5 @@
 CLASS vb net/minecraft/server/world/ChunkTicketManager
-	CLASS vb$b DistanceFromNearestPlayerTracker
+	CLASS b DistanceFromNearestPlayerTracker
 		FIELD a distanceFromNearestPlayer Lit/unimi/dsi/fastutil/longs/Long2ByteMap;
 		FIELD b maxDistance I
 		METHOD <init> (Lvb;I)V
@@ -11,7 +11,7 @@ CLASS vb net/minecraft/server/world/ChunkTicketManager
 			ARG 4 distance
 		METHOD d isPlayerInChunk (J)Z
 			ARG 1 chunkPos
-	CLASS vb$c NearbyChunkTicketUpdater
+	CLASS c NearbyChunkTicketUpdater
 		FIELD e watchDistance I
 		FIELD f distances Lit/unimi/dsi/fastutil/longs/Long2IntMap;
 		FIELD g positionsAffected Lit/unimi/dsi/fastutil/longs/LongSet;

mappings/net/minecraft/server/world/ServerChunkManager.mapping

@@ -1,5 +1,5 @@
 CLASS vg net/minecraft/server/world/ServerChunkManager
-	CLASS vg$a MainThreadExecutor
+	CLASS a MainThreadExecutor
 	FIELD a threadedAnvilChunkStorage Luu;
 	FIELD b CHUNKS_ELIGIBLE_FOR_SPAWNING I
 	FIELD c CHUNK_STATUSES Ljava/util/List;

mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping

@@ -1,9 +1,9 @@
 CLASS uu net/minecraft/server/world/ThreadedAnvilChunkStorage
-	CLASS uu$a TicketManager
+	CLASS a TicketManager
 		METHOD <init> (Luu;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V
 			ARG 1 workerExecutor
 			ARG 2 mainThreadExecutor
-	CLASS uu$b EntityTracker
+	CLASS b EntityTracker
 		FIELD b entry Lvh;
 		FIELD c entity Lail;
 		FIELD d maxDistance I

mappings/net/minecraft/state/AbstractPropertyContainer.mapping

@@ -1,5 +1,5 @@
 CLASS bvn net/minecraft/state/AbstractPropertyContainer
-	CLASS bvn$1
+	CLASS 1
 		METHOD a valueToString (Lbwr;Ljava/lang/Comparable;)Ljava/lang/String;
 			ARG 1 property
 			ARG 2 value

mappings/net/minecraft/state/StateFactory.mapping

@@ -1,11 +1,11 @@
 CLASS bvp net/minecraft/state/StateFactory
-	CLASS bvp$a Builder
+	CLASS a Builder
 		FIELD a baseObject Ljava/lang/Object;
 		FIELD b propertyMap Ljava/util/Map;
 		METHOD a build (Lbvp$b;)Lbvp;
 		METHOD a validate (Lbwr;)V
 		METHOD a add ([Lbwr;)Lbvp$a;
-	CLASS bvp$b Factory
+	CLASS b Factory
 		METHOD create (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;)Lbvn;
 			ARG 1 propertyMap
 	FIELD a NAME_MATCHER Ljava/util/regex/Pattern;

mappings/net/minecraft/structure/BuriedTreasureGenerator.mapping

@@ -1,5 +1,5 @@
 CLASS chy net/minecraft/structure/BuriedTreasureGenerator
-	CLASS chy$a Piece
+	CLASS a Piece
 		METHOD <init> (Lcjk;Lic;)V
 			ARG 1 manager
 			ARG 2 tag

mappings/net/minecraft/structure/EndCityGenerator.mapping

@@ -1,7 +1,7 @@
 CLASS cia net/minecraft/structure/EndCityGenerator
-	CLASS cia$3
+	CLASS 3
 		FIELD a shipGenerated Z
-	CLASS cia$a Piece
+	CLASS a Piece
 		FIELD d template Ljava/lang/String;
 		FIELD e rotation Lbrb;
 		FIELD f ignoreAir Z
@@ -16,7 +16,7 @@ CLASS cia net/minecraft/structure/EndCityGenerator
 			ARG 5 ignoreAir
 		METHOD a initializeStructureData (Lcjk;)V
 			ARG 1 manager
-	CLASS cia$b Part
+	CLASS b Part
 		METHOD a init ()V
 		METHOD a create (Lcjk;ILcia$a;Lev;Ljava/util/List;Ljava/util/Random;)Z
 			ARG 1 manager

mappings/net/minecraft/structure/IglooGenerator.mapping

@@ -1,5 +1,5 @@
 CLASS cib net/minecraft/structure/IglooGenerator
-	CLASS cib$a Piece
+	CLASS a Piece
 		FIELD d template Lqt;
 		FIELD e rotation Lbrb;
 		METHOD <init> (Lcjk;Lic;)V

mappings/net/minecraft/structure/JungleTempleGenerator.mapping

@@ -1,5 +1,5 @@
 CLASS cic net/minecraft/structure/JungleTempleGenerator
-	CLASS cic$a CobblestoneRandomizer
+	CLASS a CobblestoneRandomizer
 	FIELD e placedMainChest Z
 	FIELD f placedHiddenChest Z
 	FIELD g placedTrap1 Z

mappings/net/minecraft/structure/MineshaftGenerator.mapping

@@ -1,21 +1,21 @@
 CLASS cie net/minecraft/structure/MineshaftGenerator
-	CLASS cie$a MineshaftCorridor
+	CLASS a MineshaftCorridor
 		FIELD b hasRails Z
 		FIELD c hasCobwebs Z
 		FIELD d hasSpawner Z
 		FIELD e length I
-	CLASS cie$b MineshaftCrossing
+	CLASS b MineshaftCrossing
 		FIELD b direction Lfa;
 		FIELD c twoFloors Z
 		METHOD a (Ljava/util/List;Ljava/util/Random;IIILfa;)Lchx;
 			ARG 5 facing
-	CLASS cie$c MineshaftPart
+	CLASS c MineshaftPart
 		FIELD a mineshaftType Lcct$b;
-	CLASS cie$d MineshaftRoom
+	CLASS d MineshaftRoom
 		FIELD b entrances Ljava/util/List;
 		METHOD <init> (ILjava/util/Random;IILcct$b;)V
 			ARG 2 random
-	CLASS cie$e MineshaftStairs
+	CLASS e MineshaftStairs
 		METHOD a (Ljava/util/List;Ljava/util/Random;IIILfa;)Lchx;
 			ARG 1 random
 	METHOD a (Ljava/util/List;Ljava/util/Random;IIILfa;ILcct$b;)Lcie$c;

mappings/net/minecraft/structure/NetherFortressGenerator.mapping

@@ -1,28 +1,28 @@
 CLASS cif net/minecraft/structure/NetherFortressGenerator
-	CLASS cif$a BridgeCrossing
+	CLASS a BridgeCrossing
 		METHOD <init> (Ljava/util/Random;II)V
 			ARG 1 random
 			ARG 2 x
 			ARG 3 z
-	CLASS cif$b BridgeEnd
+	CLASS b BridgeEnd
 		FIELD a seed I
-	CLASS cif$c Bridge
+	CLASS c Bridge
-	CLASS cif$d CorridorStairs
+	CLASS d CorridorStairs
-	CLASS cif$e CorridorBalcony
+	CLASS e CorridorBalcony
-	CLASS cif$f CorridorExit
+	CLASS f CorridorExit
-	CLASS cif$g CorridorCrossing
+	CLASS g CorridorCrossing
-	CLASS cif$h CorridorLeftTurn
+	CLASS h CorridorLeftTurn
 		FIELD a containsChest Z
-	CLASS cif$i SmallCorridor
+	CLASS i SmallCorridor
-	CLASS cif$j CorridorRightTurn
+	CLASS j CorridorRightTurn
 		FIELD a containsChest Z
-	CLASS cif$k CorridorNetherWartsRoom
+	CLASS k CorridorNetherWartsRoom
-	CLASS cif$l BridgePlatform
+	CLASS l BridgePlatform
 		FIELD a hasBlazeSpawner Z
-	CLASS cif$m Piece
+	CLASS m Piece
-	CLASS cif$o BridgeSmallCrossing
+	CLASS o BridgeSmallCrossing
-	CLASS cif$p BridgeStairs
+	CLASS p BridgeStairs
-	CLASS cif$q Start
+	CLASS q Start
 		FIELD b bridgePieces Ljava/util/List;
 		FIELD c corridorPieces Ljava/util/List;
 	METHOD b generatePiece (Lcif$n;Ljava/util/List;Ljava/util/Random;IIILfa;I)Lcif$m;

mappings/net/minecraft/structure/OceanMonumentGenerator.mapping

@@ -1,20 +1,20 @@
 CLASS cig net/minecraft/structure/OceanMonumentGenerator
-	CLASS cig$h Base
+	CLASS h Base
-	CLASS cig$j CoreRoom
+	CLASS j CoreRoom
-	CLASS cig$k DoubleXRoom
+	CLASS k DoubleXRoom
-	CLASS cig$l DoubleXYRoom
+	CLASS l DoubleXYRoom
-	CLASS cig$m DoubleYRoom
+	CLASS m DoubleYRoom
-	CLASS cig$n DoubleYZRoom
+	CLASS n DoubleYZRoom
-	CLASS cig$o DoubleZRoom
+	CLASS o DoubleZRoom
-	CLASS cig$p Entry
+	CLASS p Entry
-	CLASS cig$q Penthouse
+	CLASS q Penthouse
-	CLASS cig$r
+	CLASS r
 		FIELD a PRISMARINE Lbvo;
 		FIELD b PRISMARINE_BRICKS Lbvo;
 		FIELD c DARK_PRISMARINE Lbvo;
 		FIELD e SEA_LANTERN Lbvo;
 		FIELD f WATER Lbvo;
 		FIELD g ICE_BLOCKS Ljava/util/Set;
-	CLASS cig$s SimpleRoom
+	CLASS s SimpleRoom
-	CLASS cig$t SimpleRoomTop
+	CLASS t SimpleRoomTop
-	CLASS cig$u WingRoom
+	CLASS u WingRoom

mappings/net/minecraft/structure/OceanRuinGenerator.mapping

@@ -1,5 +1,5 @@
 CLASS cii net/minecraft/structure/OceanRuinGenerator
-	CLASS cii$a Piece
+	CLASS a Piece
 		FIELD d biomeType Lcih$b;
 		FIELD e integrity F
 		FIELD f template Lqt;

mappings/net/minecraft/structure/PillagerOutpostGenerator.mapping

@@ -1,5 +1,5 @@
 CLASS cij net/minecraft/structure/PillagerOutpostGenerator
-	CLASS cij$a Piece
+	CLASS a Piece
 		METHOD <init> (Lcjk;Lcfm;Lev;ILbrb;Lchx;)V
 			ARG 1 manager
 			ARG 2 element

mappings/net/minecraft/structure/ShipwreckGenerator.mapping

@@ -1,5 +1,5 @@
 CLASS cim net/minecraft/structure/ShipwreckGenerator
-	CLASS cim$a Piece
+	CLASS a Piece
 		FIELD d rotation Lbrb;
 		FIELD e template Lqt;
 		FIELD f grounded Z

mappings/net/minecraft/structure/StrongholdGenerator.mapping

@@ -1,32 +1,32 @@
 CLASS cin net/minecraft/structure/StrongholdGenerator
-	CLASS cin$a ChestCorridor
+	CLASS a ChestCorridor
 		FIELD a chestGenerated Z
-	CLASS cin$b SmallCorridor
+	CLASS b SmallCorridor
 		FIELD a length I
-	CLASS cin$c FiveWayCrossing
+	CLASS c FiveWayCrossing
 		FIELD a lowerLeftExists Z
 		FIELD b upperLeftExists Z
 		FIELD c lowerRightExists Z
 		FIELD e upperRightExists Z
-	CLASS cin$d LeftTurn
+	CLASS d LeftTurn
-	CLASS cin$e Library
+	CLASS e Library
 		FIELD a tall Z
-	CLASS cin$g PortalRoom
+	CLASS g PortalRoom
 		FIELD a spawnerPlaced Z
-	CLASS cin$h PrisonHall
+	CLASS h PrisonHall
-	CLASS cin$i RightTurn
+	CLASS i RightTurn
-	CLASS cin$j SquareRoom
+	CLASS j SquareRoom
 		FIELD a roomType I
-	CLASS cin$k StoneBrickRandomizer
+	CLASS k StoneBrickRandomizer
-	CLASS cin$l SpiralStaircase
+	CLASS l SpiralStaircase
 		FIELD a isStructureStart Z
-	CLASS cin$m Start
+	CLASS m Start
-	CLASS cin$n Corridor
+	CLASS n Corridor
 		FIELD a leftExitExists Z
 		FIELD b rightExitExixts Z
-	CLASS cin$o Stairs
+	CLASS o Stairs
-	CLASS cin$p Piece
+	CLASS p Piece
-		CLASS cin$p$a EntranceType
+		CLASS a EntranceType
 		FIELD d entryDoor Lcin$p$a;
 		METHOD a generateEntrance (Lbhn;Ljava/util/Random;Lchx;Lcin$p$a;III)V
 			ARG 1 world

mappings/net/minecraft/structure/Structure.mapping

@@ -1,5 +1,5 @@
 CLASS cjo net/minecraft/structure/Structure
-	CLASS cjo$b StructureBlockInfo
+	CLASS b StructureBlockInfo
 		FIELD a pos Lev;
 		FIELD b state Lbvo;
 		FIELD c tag Lic;
@@ -7,7 +7,7 @@ CLASS cjo net/minecraft/structure/Structure
 			ARG 1 pos
 			ARG 2 state
 			ARG 3 tag
-	CLASS cjo$c StructureEntityInfo
+	CLASS c StructureEntityInfo
 		FIELD a pos Lcsb;
 		FIELD b blockPos Lev;
 		FIELD c tag Lic;

mappings/net/minecraft/structure/StructurePiece.mapping

@@ -1,5 +1,5 @@
 CLASS ciq net/minecraft/structure/StructurePiece
-	CLASS ciq$a BlockRandomizer
+	CLASS a BlockRandomizer
 		FIELD a block Lbvo;
 		METHOD a getBlock ()Lbvo;
 		METHOD a setBlock (Ljava/util/Random;IIIZ)V

mappings/net/minecraft/structure/StructureStart.mapping

@@ -1,5 +1,5 @@
 CLASS cir net/minecraft/structure/StructureStart
-	CLASS cir$1
+	CLASS 1
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/structure/VillageGenerator.mapping

@@ -1,5 +1,5 @@
 CLASS cez net/minecraft/structure/VillageGenerator
-	CLASS cez$a Piece
+	CLASS a Piece
 	METHOD a addPieces (Lbxd;Lcjk;Lev;Ljava/util/List;Lbzf;Lcex;)V
 		ARG 0 chunkGenerator
 		ARG 1 structureManager

mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping

@@ -1,6 +1,6 @@
 CLASS ciu net/minecraft/structure/WoodlandMansionGenerator
-	CLASS ciu$a FirstFloorRoomPool
+	CLASS a FirstFloorRoomPool
-	CLASS ciu$b RoomPool
+	CLASS b RoomPool
 		METHOD a getSmallRoom (Ljava/util/Random;)Ljava/lang/String;
 			ARG 1 random
 		METHOD a getMediumFunctionalRoom (Ljava/util/Random;Z)Ljava/lang/String;
@@ -17,7 +17,7 @@ CLASS ciu net/minecraft/structure/WoodlandMansionGenerator
 			ARG 1 random
 		METHOD e getBigSecretRoom (Ljava/util/Random;)Ljava/lang/String;
 			ARG 1 random
-	CLASS ciu$d LayoutGenerator
+	CLASS d LayoutGenerator
 		FIELD a manager Lcjk;
 		FIELD b random Ljava/util/Random;
 		METHOD <init> (Lcjk;Ljava/util/Random;)V
@@ -34,13 +34,13 @@ CLASS ciu net/minecraft/structure/WoodlandMansionGenerator
 		METHOD a addBigRoom (Ljava/util/List;Lev;Lbrb;Lfa;Lfa;Lciu$b;)V
 		METHOD a addMediumRoom (Ljava/util/List;Lev;Lbrb;Lfa;Lfa;Lciu$b;Z)V
 			ARG 7 staircase
-	CLASS ciu$e GenerationPiece
+	CLASS e GenerationPiece
 		FIELD a rotation Lbrb;
 		FIELD b position Lev;
 		FIELD c template Ljava/lang/String;
-	CLASS ciu$f SecondFloorRoomPool
+	CLASS f SecondFloorRoomPool
-	CLASS ciu$h ThirdFloorRoomPool
+	CLASS h ThirdFloorRoomPool
-	CLASS ciu$i Piece
+	CLASS i Piece
 		FIELD d template Ljava/lang/String;
 		FIELD e rotation Lbrb;
 		FIELD f mirror Lbqb;

mappings/net/minecraft/structure/pool/StructurePool.mapping

@@ -1,5 +1,5 @@
 CLASS cfo net/minecraft/structure/pool/StructurePool
-	CLASS cfo$a Projection
+	CLASS a Projection
 		FIELD c PROJECTIONS_BY_ID Ljava/util/Map;
 		FIELD d id Ljava/lang/String;
 		FIELD e processors Lcom/google/common/collect/ImmutableList;

mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping

@@ -1,5 +1,5 @@
 CLASS cfj net/minecraft/structure/pool/StructurePoolBasedGenerator
-	CLASS cfj$a PieceFactory
+	CLASS a PieceFactory
 	FIELD a REGISTRY Lcfp;
 	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
 	METHOD a addPieces (Lqt;ILcfj$a;Lbxd;Lcjk;Lev;Ljava/util/List;Ljava/util/Random;)V

mappings/net/minecraft/tag/BlockTags.mapping

@@ -1,5 +1,5 @@
 CLASS yz net/minecraft/tag/BlockTags
-	CLASS yz$a CachingTag
+	CLASS a CachingTag
 		FIELD a version I
 		FIELD b delegate Lze;
 	FIELD Y container Lzf;

mappings/net/minecraft/tag/EntityTypeTags.mapping

@@ -1,5 +1,5 @@
 CLASS za net/minecraft/tag/EntityTypeTags
-	CLASS za$a CachingTag
+	CLASS a CachingTag
 		FIELD a version I
 		FIELD b delegate Lze;
 	FIELD c container Lzf;

mappings/net/minecraft/tag/FluidTags.mapping

@@ -1,5 +1,5 @@
 CLASS zb net/minecraft/tag/FluidTags
-	CLASS zb$a CachingTag
+	CLASS a CachingTag
 		FIELD a version I
 		FIELD b delegate Lze;
 	FIELD c container Lzf;

mappings/net/minecraft/tag/ItemTags.mapping

@@ -1,5 +1,5 @@
 CLASS zc net/minecraft/tag/ItemTags
-	CLASS zc$a CachingTag
+	CLASS a CachingTag
 		FIELD a version I
 		FIELD b delegate Lze;
 	FIELD N container Lzf;

mappings/net/minecraft/tag/RegistryTagManager.mapping

@@ -1,5 +1,5 @@
 CLASS zg net/minecraft/tag/RegistryTagManager
-	CLASS zg$a BuilderHolder
+	CLASS a BuilderHolder
 		FIELD a blocks Ljava/util/Map;
 		FIELD b items Ljava/util/Map;
 		FIELD c fluids Ljava/util/Map;

mappings/net/minecraft/tag/Tag.mapping

@@ -1,5 +1,5 @@
 CLASS ze net/minecraft/tag/Tag
-	CLASS ze$a Builder
+	CLASS a Builder
 		FIELD a entries Ljava/util/Set;
 		FIELD b ordered Z
 		METHOD a create ()Lze$a;
@@ -11,15 +11,15 @@ CLASS ze net/minecraft/tag/Tag
 		METHOD a ordered (Z)Lze$a;
 		METHOD a add ([Ljava/lang/Object;)Lze$a;
 		METHOD b build (Lqt;)Lze;
-	CLASS ze$b Entry
+	CLASS b Entry
 		METHOD a toJson (Lcom/google/gson/JsonArray;Ljava/util/function/Function;)V
 		METHOD a build (Ljava/util/Collection;)V
 		METHOD a applyTagGetter (Ljava/util/function/Function;)Z
-	CLASS ze$c TagEntry
+	CLASS c TagEntry
 		FIELD a id Lqt;
 		FIELD b tag Lze;
 		METHOD a getId ()Lqt;
-	CLASS ze$d CollectionEntry
+	CLASS d CollectionEntry
 		FIELD a values Ljava/util/Collection;
 		METHOD a getValues ()Ljava/util/Collection;
 	FIELD a id Lqt;

mappings/net/minecraft/text/ClickEvent.mapping

@@ -1,5 +1,5 @@
 CLASS jm net/minecraft/text/ClickEvent
-	CLASS jm$a Action
+	CLASS a Action
 		FIELD f BY_NAME Ljava/util/Map;
 		FIELD g userDefinable Z
 		FIELD h name Ljava/lang/String;

mappings/net/minecraft/text/HoverEvent.mapping

@@ -1,5 +1,5 @@
 CLASS jq net/minecraft/text/HoverEvent
-	CLASS jq$a Action
+	CLASS a Action
 		FIELD d BY_NAME Ljava/util/Map;
 		FIELD e userDefinable Z
 		FIELD f name Ljava/lang/String;

mappings/net/minecraft/text/NbtText.mapping

@@ -1,5 +1,5 @@
 CLASS js net/minecraft/text/NbtText
-	CLASS js$a BlockNbtText
+	CLASS a BlockNbtText
 		FIELD e rawPos Ljava/lang/String;
 		FIELD f pos Ldl;
 		METHOD <init> (Ljava/lang/String;Lcr$h;ZLjava/lang/String;Ldl;)V
@@ -17,7 +17,7 @@ CLASS js net/minecraft/text/NbtText
 		METHOD equals (Ljava/lang/Object;)Z
 			ARG 1 o
 		METHOD k getPos ()Ljava/lang/String;
-	CLASS js$b EntityNbtText
+	CLASS b EntityNbtText
 		FIELD e rawSelector Ljava/lang/String;
 		FIELD f selector Lec;
 		METHOD <init> (Ljava/lang/String;Lcr$h;ZLjava/lang/String;Lec;)V

mappings/net/minecraft/text/Style.mapping

@@ -1,5 +1,5 @@
 CLASS jv net/minecraft/text/Style
-	CLASS jv$a Serializer
+	CLASS a Serializer
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 json
 			ARG 2 type

mappings/net/minecraft/text/Text.mapping

@@ -1,5 +1,5 @@
 CLASS jn net/minecraft/text/Text
-	CLASS jn$a Serializer
+	CLASS a Serializer
 		FIELD a GSON Lcom/google/gson/Gson;
 		FIELD b JSON_READER_POS Ljava/lang/reflect/Field;
 		FIELD c JSON_READER_LINE_START Ljava/lang/reflect/Field;

mappings/net/minecraft/util/BoundedIntUnaryOperator.mapping

@@ -1,5 +1,5 @@
 CLASS cor net/minecraft/util/BoundedIntUnaryOperator
-	CLASS cor$a Serializer
+	CLASS a Serializer
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 functionJson
 			ARG 2 unused

mappings/net/minecraft/util/Identifier.mapping

@@ -1,5 +1,5 @@
 CLASS qt net/minecraft/util/Identifier
-	CLASS qt$a Serializer
+	CLASS a Serializer
 	FIELD a namespace Ljava/lang/String;
 	FIELD b path Ljava/lang/String;
 	FIELD c COMMAND_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;

mappings/net/minecraft/util/LevelPropagator.mapping

@@ -1,8 +1,8 @@
 CLASS ckr net/minecraft/util/LevelPropagator
-	CLASS ckr$1
+	CLASS 1
 		METHOD rehash (I)V
 			ARG 1 newN
-	CLASS ckr$2
+	CLASS 2
 		METHOD rehash (I)V
 			ARG 1 newN
 	FIELD a levelCount I

mappings/net/minecraft/util/Mailbox.mapping

@@ -1,16 +1,16 @@
 CLASS ags net/minecraft/util/Mailbox
-	CLASS ags$a PrioritizedQueueMailbox
+	CLASS a PrioritizedQueueMailbox
 		FIELD a queues Ljava/util/List;
 		METHOD <init> (I)V
 			ARG 1 priorityCount
-	CLASS ags$b PrioritizedMessage
+	CLASS b PrioritizedMessage
 		FIELD a priority I
 		FIELD b runnable Ljava/lang/Runnable;
 		METHOD <init> (ILjava/lang/Runnable;)V
 			ARG 1 priority
 			ARG 2 runnable
 		METHOD a getPriority ()I
-	CLASS ags$c QueueMailbox
+	CLASS c QueueMailbox
 		FIELD a queue Ljava/util/Queue;
 	METHOD a poll ()Ljava/lang/Object;
 	METHOD a add (Ljava/lang/Object;)Z

mappings/net/minecraft/util/MaterialPredicate.mapping

@@ -1,5 +1,5 @@
 CLASS bvw net/minecraft/util/MaterialPredicate
-	CLASS bvw$1
+	CLASS 1
 		METHOD test (Ljava/lang/Object;)Z
 			ARG 1 context
 	FIELD a IS_AIR Lbvw;

mappings/net/minecraft/util/NumberRange.mapping

@@ -1,6 +1,6 @@
 CLASS bi net/minecraft/util/NumberRange
-	CLASS bi$a Factory
+	CLASS a Factory
-	CLASS bi$c FloatRange
+	CLASS c FloatRange
 		FIELD e ANY Lbi$c;
 		FIELD f minSquared Ljava/lang/Double;
 		FIELD g maxSquared Ljava/lang/Double;
@@ -22,7 +22,7 @@ CLASS bi net/minecraft/util/NumberRange
 		METHOD b atLeast (F)Lbi$c;
 			ARG 0 value
 		METHOD d matches (F)Z
-	CLASS bi$d IntRange
+	CLASS d IntRange
 		FIELD e ANY Lbi$d;
 		FIELD f minSquared Ljava/lang/Long;
 		FIELD g maxSquared Ljava/lang/Long;

mappings/net/minecraft/util/ReusableStream.mapping

@@ -1,5 +1,5 @@
 CLASS zx net/minecraft/util/ReusableStream
-	CLASS zx$1
+	CLASS 1
 		FIELD b pos I
 		METHOD tryAdvance (Ljava/util/function/Consumer;)Z
 			ARG 1 consumer

mappings/net/minecraft/util/SystemUtil.mapping

@@ -1,6 +1,6 @@
 CLASS p net/minecraft/util/SystemUtil
-	CLASS p$a IdentityHashStrategy
+	CLASS a IdentityHashStrategy
-	CLASS p$b OperatingSystem
+	CLASS b OperatingSystem
 		FIELD c WINDOWS Lp$b;
 		FIELD d MAC Lp$b;
 		METHOD a open (Ljava/io/File;)V

mappings/net/minecraft/util/UserCache.mapping

@@ -1,16 +1,16 @@
 CLASS xp net/minecraft/util/UserCache
-	CLASS xp$1
+	CLASS 1
 		METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V
 			ARG 1 profile
 			ARG 2 exception
 		METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V
 			ARG 1 profile
-	CLASS xp$a Entry
+	CLASS a Entry
 		FIELD b profile Lcom/mojang/authlib/GameProfile;
 		FIELD c expirationDate Ljava/util/Date;
 		METHOD a getProfile ()Lcom/mojang/authlib/GameProfile;
 		METHOD b getExpirationDate ()Ljava/util/Date;
-	CLASS xp$b JsonConverter
+	CLASS b JsonConverter
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 functionJson
 			ARG 2 unused

mappings/net/minecraft/util/WeightedList.mapping

@@ -1,5 +1,5 @@
 CLASS alv net/minecraft/util/WeightedList
-	CLASS alv$a Entry
+	CLASS a Entry
 		FIELD c weight I
 		FIELD d shuffledOrder D
 		METHOD a getShuffledOrder ()D

mappings/net/minecraft/util/WeightedPicker.mapping

@@ -1,5 +1,5 @@
 CLASS aaf net/minecraft/util/WeightedPicker
-	CLASS aaf$a Entry
+	CLASS a Entry
 		FIELD a weight I
 	METHOD a getWeightSum (Ljava/util/List;)I
 		ARG 0 list

mappings/net/minecraft/util/crash/CrashReportSection.mapping

@@ -1,5 +1,5 @@
 CLASS e net/minecraft/util/crash/CrashReportSection
-	CLASS e$a Element
+	CLASS a Element
 		FIELD a name Ljava/lang/String;
 		FIELD b detail Ljava/lang/String;
 		METHOD a getName ()Ljava/lang/String;

mappings/net/minecraft/util/hit/HitResult.mapping

@@ -1,5 +1,5 @@
 CLASS crz net/minecraft/util/hit/HitResult
-	CLASS crz$a Type
+	CLASS a Type
 	FIELD a pos Lcsb;
 	METHOD <init> (Lcsb;)V
 		ARG 1 pos

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

@@ -1,9 +1,9 @@
 CLASS ev net/minecraft/util/math/BlockPos
-	CLASS ev$1
+	CLASS 1
 		FIELD a connector Ley;
 		METHOD tryAdvance (Ljava/util/function/Consumer;)Z
 			ARG 1 consumer
-	CLASS ev$2
+	CLASS 2
 		FIELD a iterator Ley;
 		FIELD b pos Lev$a;
 		FIELD c minX I
@@ -12,7 +12,7 @@ CLASS ev net/minecraft/util/math/BlockPos
 		FIELD f maxX I
 		FIELD g maxY I
 		FIELD h maxZ I
-	CLASS ev$a Mutable
+	CLASS a Mutable
 		FIELD b x I
 		FIELD c y I
 		FIELD d z I
@@ -31,7 +31,7 @@ CLASS ev net/minecraft/util/math/BlockPos
 		METHOD g setFromLong (J)Lev$a;
 		METHOD g set (Lfr;)Lev$a;
 		METHOD p setY (I)V
-	CLASS ev$b PooledMutable
+	CLASS b PooledMutable
 		FIELD f free Z
 		FIELD g POOL Ljava/util/List;
 		METHOD <init> (III)V

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

@@ -1,5 +1,5 @@
 CLASS bgy net/minecraft/util/math/ChunkPos
-	CLASS bgy$1
+	CLASS 1
 		METHOD tryAdvance (Ljava/util/function/Consumer;)Z
 			ARG 1 consumer
 	FIELD a INVALID J

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

@@ -1,5 +1,5 @@
 CLASS fo net/minecraft/util/math/ChunkSectionPos
-	CLASS fo$1
+	CLASS 1
 		FIELD a iterator Ley;
 		METHOD tryAdvance (Ljava/util/function/Consumer;)Z
 			ARG 1 consumer

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

@@ -1,12 +1,12 @@
 CLASS fa net/minecraft/util/math/Direction
-	CLASS fa$a Axis
+	CLASS a Axis
-		CLASS fa$a$1
+		CLASS 1
 			METHOD test (Ljava/lang/Object;)Z
 				ARG 1 context
-		CLASS fa$a$2
+		CLASS 2
 			METHOD test (Ljava/lang/Object;)Z
 				ARG 1 context
-		CLASS fa$a$3
+		CLASS 3
 			METHOD test (Ljava/lang/Object;)Z
 				ARG 1 context
 		FIELD a X Lfa$a;
@@ -27,13 +27,13 @@ CLASS fa net/minecraft/util/math/Direction
 		METHOD b isVertical ()Z
 		METHOD c isHorizontal ()Z
 		METHOD d getType ()Lfa$c;
-	CLASS fa$b AxisDirection
+	CLASS b AxisDirection
 		FIELD a POSITIVE Lfa$b;
 		FIELD b NEGATIVE Lfa$b;
 		FIELD c offset I
 		FIELD d desc Ljava/lang/String;
 		METHOD a offset ()I
-	CLASS fa$c Type
+	CLASS c Type
 		FIELD c facingArray [Lfa;
 		FIELD d axisArray [Lfa$a;
 		METHOD a random (Ljava/util/Random;)Lfa;

mappings/net/minecraft/util/profiler/DisableableProfiler.mapping

@@ -1,10 +1,10 @@
 CLASS agg net/minecraft/util/profiler/DisableableProfiler
-	CLASS agg$a ProfilerController
+	CLASS a ProfilerController
 		METHOD a isEnabled ()Z
 		METHOD b disable ()Lagj;
 		METHOD c getResults ()Lagj;
 		METHOD d enable ()V
-	CLASS agg$b ProfilerControllerImpl
+	CLASS b ProfilerControllerImpl
 		FIELD a profiler Lagi;
 	FIELD c tickSupplier Ljava/util/function/IntSupplier;
 	FIELD d controller Lagg$b;

mappings/net/minecraft/util/shape/DoubleListPair.mapping

@@ -1,5 +1,5 @@
 CLASS csn net/minecraft/util/shape/DoubleListPair
-	CLASS csn$a SectionPairPredicate
+	CLASS a SectionPairPredicate
 	METHOD a getMergedList ()Lit/unimi/dsi/fastutil/doubles/DoubleList;
 	METHOD a forAllOverlappingSections (Lcsn$a;)Z
 		ARG 1 predicate

mappings/net/minecraft/util/shape/VoxelShapes.mapping

@@ -1,5 +1,5 @@
 CLASS css net/minecraft/util/shape/VoxelShapes
-	CLASS css$a BoxConsumer
+	CLASS a BoxConsumer
 		METHOD consume (DDDDDD)V
 			ARG 1 minX
 	FIELD a UNBOUNDED Lcsv;

mappings/net/minecraft/village/PointOfInterestStorage.mapping

@@ -1,8 +1,8 @@
 CLASS aqk net/minecraft/village/PointOfInterestStorage
-	CLASS aqk$a PointOfInterestDistanceTracker
+	CLASS a PointOfInterestDistanceTracker
 		FIELD b distances Lit/unimi/dsi/fastutil/longs/Long2ByteMap;
 		METHOD a update ()V
-	CLASS aqk$b OccupationStatus
+	CLASS b OccupationStatus
 		FIELD d predicate Ljava/util/function/Predicate;
 		METHOD a getPredicate ()Ljava/util/function/Predicate;
 	FIELD a pointOfInterestDistanceTracker Laqk$a;

mappings/net/minecraft/village/TradeOffers.mapping

@@ -1,5 +1,5 @@
 CLASS avs net/minecraft/village/TradeOffers
-	CLASS avs$a SellDyedArmorFactory
+	CLASS a SellDyedArmorFactory
 		FIELD a sell Lbbz;
 		FIELD b price I
 		FIELD c maxUses I
@@ -11,7 +11,7 @@ CLASS avs net/minecraft/village/TradeOffers
 			ARG 3 maxUses
 			ARG 4 experience
 		METHOD a getDye (Ljava/util/Random;)Lbbc;
-	CLASS avs$b BuyForOneEmeraldFactory
+	CLASS b BuyForOneEmeraldFactory
 		FIELD a buy Lbbz;
 		FIELD b price I
 		FIELD c maxUses I
@@ -21,18 +21,18 @@ CLASS avs net/minecraft/village/TradeOffers
 			ARG 2 price
 			ARG 3 maxUses
 			ARG 4 experience
-	CLASS avs$c TypeAwareBuyForOneEmeraldFactory
+	CLASS c TypeAwareBuyForOneEmeraldFactory
 		FIELD a map Ljava/util/Map;
 		FIELD b count I
 		FIELD c maxUses I
 		FIELD d experience I
 		METHOD <init> (IIILjava/util/Map;)V
 			ARG 3 experience
-	CLASS avs$d EnchantBookFactory
+	CLASS d EnchantBookFactory
 		FIELD a experience I
 		METHOD <init> (I)V
 			ARG 1 experience
-	CLASS avs$e SellEnchantedToolFactory
+	CLASS e SellEnchantedToolFactory
 		FIELD a tool Lbce;
 		FIELD b basePrice I
 		FIELD c maxUses I
@@ -47,9 +47,9 @@ CLASS avs net/minecraft/village/TradeOffers
 			ARG 3 maxUses
 			ARG 4 experience
 			ARG 5 multiplier
-	CLASS avs$f Factory
+	CLASS f Factory
 		METHOD a create (Lail;Ljava/util/Random;)Lbgp;
-	CLASS avs$g ProcessItemFactory
+	CLASS g ProcessItemFactory
 		FIELD a secondBuy Lbce;
 		FIELD b secondCount I
 		FIELD c price I
@@ -71,7 +71,7 @@ CLASS avs net/minecraft/village/TradeOffers
 			ARG 4 sellCount
 			ARG 5 maxUses
 			ARG 6 experience
-	CLASS avs$h SellItemFactory
+	CLASS h SellItemFactory
 		FIELD a sell Lbce;
 		FIELD b price I
 		FIELD c count I
@@ -84,7 +84,7 @@ CLASS avs net/minecraft/village/TradeOffers
 			ARG 4 maxUses
 			ARG 5 experience
 			ARG 6 multiplier
-	CLASS avs$i SellSuspiciousStewFactory
+	CLASS i SellSuspiciousStewFactory
 		FIELD a effect Laid;
 		FIELD b duration I
 		FIELD c experience I
@@ -92,7 +92,7 @@ CLASS avs net/minecraft/village/TradeOffers
 		METHOD <init> (Laid;II)V
 			ARG 2 duration
 			ARG 3 experience
-	CLASS avs$j SellPotionHoldingItemFactory
+	CLASS j SellPotionHoldingItemFactory
 		FIELD a sell Lbce;
 		FIELD b sellCount I
 		FIELD c price I
@@ -109,7 +109,7 @@ CLASS avs net/minecraft/village/TradeOffers
 			ARG 5 price
 			ARG 6 maxUses
 			ARG 7 experience
-	CLASS avs$k SellMapFactory
+	CLASS k SellMapFactory
 		FIELD a price I
 		FIELD b structure Ljava/lang/String;
 		FIELD c iconType Lcny$a;

mappings/net/minecraft/village/VillagerGossips.mapping

@@ -1,10 +1,10 @@
 CLASS apb net/minecraft/village/VillagerGossips
-	CLASS apb$a Reputation
+	CLASS a Reputation
 		FIELD a associatedGossip Lit/unimi/dsi/fastutil/objects/Object2IntMap;
 		METHOD a entriesFor (Ljava/util/UUID;)Ljava/util/stream/Stream;
 			ARG 1 target
 		METHOD a getValue (Ljava/util/function/Predicate;)I
-	CLASS apb$b GossipEntry
+	CLASS b GossipEntry
 		FIELD a target Ljava/util/UUID;
 		FIELD b type Lapc;
 		FIELD c value I

mappings/net/minecraft/village/ZombieSiegeManager.mapping

@@ -1,5 +1,5 @@
 CLASS aqi net/minecraft/village/ZombieSiegeManager
-	CLASS aqi$a State
+	CLASS a State
 	FIELD a world Lvi;
 	FIELD b spawned Z
 	FIELD c state Laqi$a;

mappings/net/minecraft/world/GameRules.mapping

@@ -1,5 +1,5 @@
 CLASS bhi net/minecraft/world/GameRules
-	CLASS bhi$a BooleanRule
+	CLASS a BooleanRule
 		FIELD a value Z
 		METHOD <init> (Lbhi$e;Z)V
 			ARG 1 type
@@ -18,11 +18,11 @@ CLASS bhi net/minecraft/world/GameRules
 		METHOD b of (ZLjava/util/function/BiConsumer;)Lbhi$e;
 			ARG 0 value
 			ARG 1 notifier
-	CLASS bhi$b RuleConsumer
+	CLASS b RuleConsumer
 		METHOD a accept (Lbhi$d;Lbhi$e;)V
 			ARG 1 key
 			ARG 2 type
-	CLASS bhi$c IntRule
+	CLASS c IntRule
 		FIELD a value I
 		METHOD <init> (Lbhi$e;I)V
 			ARG 1 rule
@@ -40,14 +40,14 @@ CLASS bhi net/minecraft/world/GameRules
 			ARG 0 value
 		METHOD b parseInt (Ljava/lang/String;)I
 			ARG 0 string
-	CLASS bhi$d RuleKey
+	CLASS d RuleKey
 		FIELD a name Ljava/lang/String;
 		METHOD <init> (Ljava/lang/String;)V
 			ARG 1 name
 		METHOD a getName ()Ljava/lang/String;
 		METHOD equals (Ljava/lang/Object;)Z
 			ARG 1 obj
-	CLASS bhi$e RuleType
+	CLASS e RuleType
 		FIELD a argumentType Ljava/util/function/Supplier;
 		FIELD b factory Ljava/util/function/Function;
 		FIELD c notifier Ljava/util/function/BiConsumer;
@@ -58,7 +58,7 @@ CLASS bhi net/minecraft/world/GameRules
 		METHOD a newRule ()Lbhi$f;
 		METHOD a argument (Ljava/lang/String;)Lcom/mojang/brigadier/builder/RequiredArgumentBuilder;
 			ARG 1 name
-	CLASS bhi$f Rule
+	CLASS f Rule
 		FIELD a type Lbhi$e;
 		METHOD <init> (Lbhi$e;)V
 			ARG 1 type

mappings/net/minecraft/world/Heightmap.mapping

@@ -1,5 +1,5 @@
 CLASS byv net/minecraft/world/Heightmap
-	CLASS byv$a Type
+	CLASS a Type
 		FIELD g name Ljava/lang/String;
 		FIELD h purpose Lbyv$b;
 		FIELD i blockPredicate Ljava/util/function/Predicate;
@@ -14,7 +14,7 @@ CLASS byv net/minecraft/world/Heightmap
 		METHOD b shouldSendToClient ()Z
 		METHOD c isStoredServerSide ()Z
 		METHOD d getBlockPredicate ()Ljava/util/function/Predicate;
-	CLASS byv$b Purpose
+	CLASS b Purpose
 	FIELD a ALWAYS_TRUE Ljava/util/function/Predicate;
 	FIELD b SUFFOCATES Ljava/util/function/Predicate;
 	FIELD c storage Lzi;

mappings/net/minecraft/world/PortalForcer.mapping

@@ -1,5 +1,5 @@
 CLASS bhy net/minecraft/world/PortalForcer
-	CLASS bhy$a TicketInfo
+	CLASS a TicketInfo
 		FIELD a pos Lev;
 		FIELD b lastUsedTime J
 		METHOD <init> (Lev;J)V

mappings/net/minecraft/world/RayTraceContext.mapping

@@ -1,10 +1,10 @@
 CLASS bha net/minecraft/world/RayTraceContext
-	CLASS bha$a ShapeType
+	CLASS a ShapeType
 		FIELD c provider Lbha$c;
-	CLASS bha$b FluidHandling
+	CLASS b FluidHandling
 		FIELD d predicate Ljava/util/function/Predicate;
 		METHOD a handled (Lclf;)Z
-	CLASS bha$c ShapeProvider
+	CLASS c ShapeProvider
 	FIELD a start Lcsb;
 	FIELD b end Lcsb;
 	FIELD c shapeType Lbha$a;

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

@@ -1,5 +1,5 @@
 CLASS bij net/minecraft/world/biome/Biome
-	CLASS bij$a Settings
+	CLASS a Settings
 		FIELD a surfaceBuilder Lcjs;
 		FIELD b precipitation Lbij$d;
 		FIELD c category Lbij$b;
@@ -22,20 +22,20 @@ CLASS bij net/minecraft/world/biome/Biome
 		METHOD b waterFogColor (I)Lbij$a;
 		METHOD c temperature (F)Lbij$a;
 		METHOD d downfall (F)Lbij$a;
-	CLASS bij$b Category
+	CLASS b Category
 		FIELD i THEEND Lbij$b;
 		FIELD r NAME_MAP Ljava/util/Map;
 		FIELD s name Ljava/lang/String;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 			ARG 3 name
 		METHOD a getName ()Ljava/lang/String;
-	CLASS bij$c TemperatureGroup
+	CLASS c TemperatureGroup
 		FIELD e NAME_MAP Ljava/util/Map;
 		FIELD f name Ljava/lang/String;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 			ARG 3 name
 		METHOD a getName ()Ljava/lang/String;
-	CLASS bij$d Precipitation
+	CLASS d Precipitation
 		FIELD a NONE Lbij$d;
 		FIELD b RAIN Lbij$d;
 		FIELD c SNOW Lbij$d;
@@ -44,7 +44,7 @@ CLASS bij net/minecraft/world/biome/Biome
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 			ARG 3 name
 		METHOD a getName ()Ljava/lang/String;
-	CLASS bij$e SpawnEntry
+	CLASS e SpawnEntry
 		FIELD b type Laip;
 		FIELD c minGroupSize I
 		FIELD d maxGroupSize I

mappings/net/minecraft/world/biome/layer/AddClimateLayers.mapping

@@ -1,4 +1,4 @@
 CLASS clx net/minecraft/world/biome/layer/AddClimateLayers
-	CLASS clx$a AddTemperateBiomesLayer
+	CLASS a AddTemperateBiomesLayer
-	CLASS clx$b AddCoolBiomesLayer
+	CLASS b AddCoolBiomesLayer
-	CLASS clx$c AddSpecialBiomesLayer
+	CLASS c AddSpecialBiomesLayer

mappings/net/minecraft/world/border/WorldBorder.mapping

@@ -1,5 +1,5 @@
 CLASS bxa net/minecraft/world/border/WorldBorder
-	CLASS bxa$a Area
+	CLASS a Area
 		METHOD a getBoundWest ()D
 		METHOD b getBoundEast ()D
 		METHOD c getBoundNorth ()D
@@ -12,13 +12,13 @@ CLASS bxa net/minecraft/world/border/WorldBorder
 		METHOD j onMaxWorldBorderRadiusChanged ()V
 		METHOD k onCenterChanged ()V
 		METHOD l getAreaInstance ()Lbxa$a;
-	CLASS bxa$b MovingArea
+	CLASS b MovingArea
 		FIELD b oldSize D
 		FIELD c newSize D
 		FIELD d timeEnd J
 		FIELD e timeStart J
 		FIELD f timeDuration D
-	CLASS bxa$c StaticArea
+	CLASS c StaticArea
 		FIELD b size D
 		FIELD c boundWest D
 		FIELD d boundNorth D

mappings/net/minecraft/world/border/WorldBorderListener.mapping

@@ -1,5 +1,5 @@
 CLASS bwy net/minecraft/world/border/WorldBorderListener
-	CLASS bwy$a WorldBorderSyncer
+	CLASS a WorldBorderSyncer
 		FIELD a border Lbxa;
 		METHOD <init> (Lbxa;)V
 			ARG 1 border

mappings/net/minecraft/world/chunk/ChunkStatus.mapping

@@ -1,10 +1,10 @@
 CLASS bxh net/minecraft/world/chunk/ChunkStatus
-	CLASS bxh$a ChunkType
+	CLASS a ChunkType
-	CLASS bxh$b Task
+	CLASS b Task
 		METHOD doWork (Lbxh;Lvi;Lbxd;Lcjk;Lvl;Ljava/util/function/Function;Ljava/util/List;Lbxc;)Ljava/util/concurrent/CompletableFuture;
 			ARG 1 targetStatus
 			ARG 3 generator
-	CLASS bxh$d SimpleTask
+	CLASS d SimpleTask
 		METHOD doWork (Lbxh;Lvi;Lbxd;Lcjk;Lvl;Ljava/util/function/Function;Ljava/util/List;Lbxc;)Ljava/util/concurrent/CompletableFuture;
 			ARG 1 targetStatus
 			ARG 3 generator

mappings/net/minecraft/world/chunk/UpgradeData.mapping

@@ -1,5 +1,5 @@
 CLASS bxy net/minecraft/world/chunk/UpgradeData
-	CLASS bxy$b
+	CLASS b
 		FIELD a BLACKLIST Lbxy$b;
 		FIELD b DEFAULT Lbxy$b;
 		FIELD c CHEST Lbxy$b;

mappings/net/minecraft/world/chunk/WorldChunk.mapping

@@ -1,5 +1,5 @@
 CLASS bxo net/minecraft/world/chunk/WorldChunk
-	CLASS bxo$a CreationType
+	CLASS a CreationType
 	FIELD a EMPTY_SECTION Lbxp;
 	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD c sections [Lbxp;

mappings/net/minecraft/world/chunk/light/BlockLightStorage.mapping

@@ -1,5 +1,5 @@
 CLASS ckp net/minecraft/world/chunk/light/BlockLightStorage
-	CLASS ckp$a Data
+	CLASS a Data
 		METHOD <init> (Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;)V
 			ARG 1 map
 	METHOD <init> (Lbxq;)V

mappings/net/minecraft/world/chunk/light/ChunkLightingView.mapping

@@ -1,4 +1,4 @@
 CLASS cku net/minecraft/world/chunk/light/ChunkLightingView
-	CLASS cku$a Empty
+	CLASS a Empty
 	METHOD a getChunkLightArray (Lfo;)Lbxi;
 	METHOD b getLightLevel (Lev;)I

mappings/net/minecraft/world/chunk/light/SkyLightStorage.mapping

@@ -1,5 +1,5 @@
 CLASS ckz net/minecraft/world/chunk/light/SkyLightStorage
-	CLASS ckz$a Data
+	CLASS a Data
 		FIELD b defaultHeight I
 		FIELD c heightMap Lit/unimi/dsi/fastutil/longs/Long2IntOpenHashMap;
 	FIELD k DIRECTIONS_SKYLIGHT [Lfa;

mappings/net/minecraft/world/explosion/Explosion.mapping

@@ -1,5 +1,5 @@
 CLASS bhf net/minecraft/world/explosion/Explosion
-	CLASS bhf$a DestructionType
+	CLASS a DestructionType
 	FIELD a createFire Z
 	FIELD b blockDestructionType Lbhf$a;
 	FIELD c random Ljava/util/Random;

mappings/net/minecraft/world/gen/GenerationStep.mapping

@@ -1,11 +1,11 @@
 CLASS byu net/minecraft/world/gen/GenerationStep
-	CLASS byu$a Carver
+	CLASS a Carver
 		FIELD c BY_NAME Ljava/util/Map;
 		FIELD d name Ljava/lang/String;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 			ARG 3 name
 		METHOD a getName ()Ljava/lang/String;
-	CLASS byu$b Feature
+	CLASS b Feature
 		FIELD i BY_NAME Ljava/util/Map;
 		FIELD j name Ljava/lang/String;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V

mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping

@@ -1,5 +1,5 @@
 CLASS byt net/minecraft/world/gen/chunk/FlatChunkGenerator
-	CLASS byt$a FlatChunkGeneratorBiome
+	CLASS a FlatChunkGeneratorBiome
 	FIELD e biome Lbij;
 	FIELD f phantomSpawner Lbzc;
 	FIELD g catSpawner Lavl;

mappings/net/minecraft/world/gen/feature/BuriedTreasureFeature.mapping

@@ -1,5 +1,5 @@
 CLASS caa net/minecraft/world/gen/feature/BuriedTreasureFeature
-	CLASS caa$a Start
+	CLASS a Start
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/DesertPyramidFeature.mapping

@@ -1,5 +1,5 @@
 CLASS caw net/minecraft/world/gen/feature/DesertPyramidFeature
-	CLASS caw$a Start
+	CLASS a Start
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/EndCityFeature.mapping

@@ -1,5 +1,5 @@
 CLASS cbd net/minecraft/world/gen/feature/EndCityFeature
-	CLASS cbd$a Start
+	CLASS a Start
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping

@@ -1,5 +1,5 @@
 CLASS cek net/minecraft/world/gen/feature/EndSpikeFeature
-	CLASS cek$a Spike
+	CLASS a Spike
 		FIELD a centerX I
 		FIELD b centerZ I
 		FIELD c radius I
@@ -22,7 +22,7 @@ CLASS cek net/minecraft/world/gen/feature/EndSpikeFeature
 		METHOD d getHeight ()I
 		METHOD e isGuarded ()Z
 		METHOD f getBoundingBox ()Lcrw;
-	CLASS cek$b SpikeCache
+	CLASS b SpikeCache
 	FIELD a CACHE Lcom/google/common/cache/LoadingCache;
 	METHOD <init> (Ljava/util/function/Function;)V
 		ARG 1 configFactory

mappings/net/minecraft/world/gen/feature/IglooFeature.mapping

@@ -1,5 +1,5 @@
 CLASS ccf net/minecraft/world/gen/feature/IglooFeature
-	CLASS ccf$a Start
+	CLASS a Start
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/JungleTempleFeature.mapping

@@ -1,5 +1,5 @@
 CLASS cch net/minecraft/world/gen/feature/JungleTempleFeature
-	CLASS cch$a Start
+	CLASS a Start
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/LargeOakTreeFeature.mapping

@@ -1,5 +1,5 @@
 CLASS bzs net/minecraft/world/gen/feature/LargeOakTreeFeature
-	CLASS bzs$a BranchPosition
+	CLASS a BranchPosition
 		FIELD b endY I
 		METHOD <init> (Lev;I)V
 			ARG 1 pos

mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping

@@ -1,9 +1,9 @@
 CLASS cct net/minecraft/world/gen/feature/MineshaftFeature
-	CLASS cct$a Start
+	CLASS a Start
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ
-	CLASS cct$b Type
+	CLASS b Type
 		FIELD c nameMap Ljava/util/Map;
 		FIELD d name Ljava/lang/String;
 		METHOD a getName ()Ljava/lang/String;

mappings/net/minecraft/world/gen/feature/NetherFortressFeature.mapping

@@ -1,5 +1,5 @@
 CLASS ccv net/minecraft/world/gen/feature/NetherFortressFeature
-	CLASS ccv$a Start
+	CLASS a Start
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/OceanMonumentFeature.mapping

@@ -1,5 +1,5 @@
 CLASS ccz net/minecraft/world/gen/feature/OceanMonumentFeature
-	CLASS ccz$a Start
+	CLASS a Start
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping

@@ -1,9 +1,9 @@
 CLASS cih net/minecraft/world/gen/feature/OceanRuinFeature
-	CLASS cih$a Start
+	CLASS a Start
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ
-	CLASS cih$b BiomeType
+	CLASS b BiomeType
 		FIELD c nameMap Ljava/util/Map;
 		FIELD d name Ljava/lang/String;
 		METHOD a getName ()Ljava/lang/String;

mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping

@@ -1,5 +1,5 @@
 CLASS cdb net/minecraft/world/gen/feature/OreFeatureConfig
-	CLASS cdb$a Target
+	CLASS a Target
 		FIELD c nameMap Ljava/util/Map;
 		FIELD d name Ljava/lang/String;
 		FIELD e predicate Ljava/util/function/Predicate;

mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping

@@ -1,5 +1,5 @@
 CLASS cde net/minecraft/world/gen/feature/PillagerOutpostFeature
-	CLASS cde$a Start
+	CLASS a Start
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/ShipwreckFeature.mapping

@@ -1,5 +1,5 @@
 CLASS cea net/minecraft/world/gen/feature/ShipwreckFeature
-	CLASS cea$a Start
+	CLASS a Start
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping

@@ -1,5 +1,5 @@
 CLASS ceo net/minecraft/world/gen/feature/StrongholdFeature
-	CLASS ceo$a Start
+	CLASS a Start
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/StructureFeature.mapping

@@ -1,5 +1,5 @@
 CLASS cep net/minecraft/world/gen/feature/StructureFeature
-	CLASS cep$a StructureStartFactory
+	CLASS a StructureStartFactory
 		METHOD create (Lcep;IILbij;Lchx;IJ)Lcir;
 			ARG 1 feature
 			ARG 2 x

mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping

@@ -1,5 +1,5 @@
 CLASS cet net/minecraft/world/gen/feature/SwampHutFeature
-	CLASS cet$a Start
+	CLASS a Start
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/VillageFeature.mapping

@@ -1,5 +1,5 @@
 CLASS cey net/minecraft/world/gen/feature/VillageFeature
-	CLASS cey$a Start
+	CLASS a Start
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/gen/feature/WoodlandMansionFeature.mapping

@@ -1,5 +1,5 @@
 CLASS cfe net/minecraft/world/gen/feature/WoodlandMansionFeature
-	CLASS cfe$a Start
+	CLASS a Start
 		METHOD <init> (Lcep;IILbij;Lchx;IJ)V
 			ARG 2 chunkX
 			ARG 3 chunkZ

mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping

@@ -1,5 +1,5 @@
 CLASS byc net/minecraft/world/level/storage/AlphaChunkIo
-	CLASS byc$a AlphaChunk
+	CLASS a AlphaChunk
 		FIELD a lastUpdate J
 		FIELD b terrainPopulated Z
 		FIELD c heightMap [B

mappings/net/minecraft/world/loot/BinomialLootTableRange.mapping

@@ -1,5 +1,5 @@
 CLASS coo net/minecraft/world/loot/BinomialLootTableRange
-	CLASS coo$a Serializer
+	CLASS a Serializer
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 json
 			ARG 2 unused

mappings/net/minecraft/world/loot/ConstantLootTableRange.mapping

@@ -1,5 +1,5 @@
 CLASS coq net/minecraft/world/loot/ConstantLootTableRange
-	CLASS coq$a Serializer
+	CLASS a Serializer
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 json
 			ARG 2 unused

mappings/net/minecraft/world/loot/LootPool.mapping

@@ -1,5 +1,5 @@
 CLASS cou net/minecraft/world/loot/LootPool
-	CLASS cou$a Builder
+	CLASS a Builder
 		FIELD a entries Ljava/util/List;
 		FIELD b conditions Ljava/util/List;
 		FIELD c functions Ljava/util/List;
@@ -10,7 +10,7 @@ CLASS cou net/minecraft/world/loot/LootPool
 		METHOD a withEntry (Lcpk$a;)Lcou$a;
 			ARG 1 entryBuilder
 		METHOD b build ()Lcou;
-	CLASS cou$b Serializer
+	CLASS b Serializer
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 json
 			ARG 2 unused

mappings/net/minecraft/world/loot/LootSupplier.mapping

@@ -1,5 +1,5 @@
 CLASS cov net/minecraft/world/loot/LootSupplier
-	CLASS cov$a Builder
+	CLASS a Builder
 		FIELD a pools Ljava/util/List;
 		FIELD b functions Ljava/util/List;
 		FIELD c type Lcqr;
@@ -8,7 +8,7 @@ CLASS cov net/minecraft/world/loot/LootSupplier
 		METHOD a withType (Lcqr;)Lcov$a;
 			ARG 1 context
 		METHOD b create ()Lcov;
-	CLASS cov$b Serializer
+	CLASS b Serializer
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 json
 			ARG 2 unused

mappings/net/minecraft/world/loot/UniformLootTableRange.mapping

@@ -1,5 +1,5 @@
 CLASS cpa net/minecraft/world/loot/UniformLootTableRange
-	CLASS cpa$a Serializer
+	CLASS a Serializer
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 json
 			ARG 2 unused

mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping

@@ -1,9 +1,9 @@
 CLASS cqv net/minecraft/world/loot/condition/AlternativeLootCondition
-	CLASS cqv$a Builder
+	CLASS a Builder
 		FIELD a terms Ljava/util/List;
 		METHOD <init> ([Lcre$a;)V
 			ARG 1 terms
-	CLASS cqv$b Factory
+	CLASS b Factory
 	FIELD a terms [Lcre;
 	FIELD b predicate Ljava/util/function/Predicate;
 	METHOD <init> ([Lcre;)V

mappings/net/minecraft/world/loot/condition/BlockStatePropertyLootCondition.mapping

@@ -1,5 +1,5 @@
 CLASS crd net/minecraft/world/loot/condition/BlockStatePropertyLootCondition
-	CLASS crd$a Builder
+	CLASS a Builder
 		FIELD a block Lbmq;
 		FIELD b availableProperties Ljava/util/Set;
 		FIELD c propertyValues Ljava/util/Map;
@@ -8,7 +8,7 @@ CLASS crd net/minecraft/world/loot/condition/BlockStatePropertyLootCondition
 		METHOD a withBlockStateProperty (Lbwr;Ljava/lang/Comparable;)Lcrd$a;
 			ARG 1 property
 			ARG 2 value
-	CLASS crd$b Factory
+	CLASS b Factory
 		METHOD a getPropertyValueString (Lbwr;Ljava/lang/Object;)Ljava/lang/String;
 			ARG 0 property
 			ARG 1 value

mappings/net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition.mapping

@@ -1,5 +1,5 @@
 CLASS cqy net/minecraft/world/loot/condition/DamageSourcePropertiesLootCondition
-	CLASS cqy$a Factory
+	CLASS a Factory
 	FIELD a predicate Lam;
 	METHOD <init> (Lam;)V
 		ARG 1 predicate

mappings/net/minecraft/world/loot/condition/EntityPropertiesLootCondition.mapping

@@ -1,5 +1,5 @@
 CLASS crg net/minecraft/world/loot/condition/EntityPropertiesLootCondition
-	CLASS crg$a Factory
+	CLASS a Factory
 	FIELD a predicate Lav;
 	FIELD b entity Lcos$c;
 	METHOD <init> (Lav;Lcos$c;)V

mappings/net/minecraft/world/loot/condition/EntityScoresLootCondition.mapping

@@ -1,5 +1,5 @@
 CLASS cqz net/minecraft/world/loot/condition/EntityScoresLootCondition
-	CLASS cqz$b Factory
+	CLASS b Factory
 	FIELD a scores Ljava/util/Map;
 	FIELD b target Lcos$c;
 	METHOD <init> (Ljava/util/Map;Lcos$c;)V

mappings/net/minecraft/world/loot/condition/InvertedLootCondition.mapping

@@ -1,5 +1,5 @@
 CLASS crb net/minecraft/world/loot/condition/InvertedLootCondition
-	CLASS crb$a Factory
+	CLASS a Factory
 	FIELD a term Lcre;
 	METHOD <init> (Lcre;)V
 		ARG 1 term

mappings/net/minecraft/world/loot/condition/KilledByPlayerLootCondition.mapping

@@ -1,5 +1,5 @@
 CLASS crh net/minecraft/world/loot/condition/KilledByPlayerLootCondition
-	CLASS crh$a Factory
+	CLASS a Factory
 	FIELD a INSTANCE Lcrh;
 	METHOD b builder ()Lcre$a;
 	METHOD test (Ljava/lang/Object;)Z

mappings/net/minecraft/world/loot/condition/LocationCheckLootCondition.mapping

@@ -1,5 +1,5 @@
 CLASS crc net/minecraft/world/loot/condition/LocationCheckLootCondition
-	CLASS crc$a Factory
+	CLASS a Factory
 	FIELD a predicate Lbg;
 	METHOD <init> (Lbg;)V
 		ARG 1 predicate

mappings/net/minecraft/world/loot/condition/LootCondition.mapping

@@ -1,9 +1,9 @@
 CLASS cre net/minecraft/world/loot/condition/LootCondition
-	CLASS cre$a Builder
+	CLASS a Builder
 		METHOD a invert ()Lcre$a;
 		METHOD a withCondition (Lcre$a;)Lcqv$a;
 			ARG 1 condition
-	CLASS cre$b Factory
+	CLASS b Factory
 		FIELD a id Lqt;
 		FIELD b conditionClass Ljava/lang/Class;
 		METHOD <init> (Lqt;Ljava/lang/Class;)V

mappings/net/minecraft/world/loot/condition/LootConditions.mapping

@@ -1,5 +1,5 @@
 CLASS crf net/minecraft/world/loot/condition/LootConditions
-	CLASS crf$a Factory
+	CLASS a Factory
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 json
 			ARG 2 unused

mappings/net/minecraft/world/loot/condition/MatchToolLootCondition.mapping

@@ -1,5 +1,5 @@
 CLASS crk net/minecraft/world/loot/condition/MatchToolLootCondition
-	CLASS crk$a Factory
+	CLASS a Factory
 	FIELD a predicate Lbc;
 	METHOD <init> (Lbc;)V
 		ARG 1 predicate

mappings/net/minecraft/world/loot/condition/RandomChanceLootCondition.mapping

@@ -1,5 +1,5 @@
 CLASS cri net/minecraft/world/loot/condition/RandomChanceLootCondition
-	CLASS cri$a Factory
+	CLASS a Factory
 	FIELD a chance F
 	METHOD <init> (F)V
 		ARG 1 chance

mappings/net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition.mapping

@@ -1,5 +1,5 @@
 CLASS crj net/minecraft/world/loot/condition/RandomChanceWithLootingLootCondition
-	CLASS crj$a Factory
+	CLASS a Factory
 	FIELD a chance F
 	FIELD b lootingMultiplier F
 	METHOD <init> (FF)V

mappings/net/minecraft/world/loot/condition/SurvivesExplosionLootCondition.mapping

@@ -1,5 +1,5 @@
 CLASS cra net/minecraft/world/loot/condition/SurvivesExplosionLootCondition
-	CLASS cra$a Factory
+	CLASS a Factory
 	FIELD a INSTANCE Lcra;
 	METHOD b builder ()Lcre$a;
 	METHOD test (Ljava/lang/Object;)Z

mappings/net/minecraft/world/loot/condition/TableBonusLootCondition.mapping

@@ -1,5 +1,5 @@
 CLASS cqw net/minecraft/world/loot/condition/TableBonusLootCondition
-	CLASS cqw$a Factory
+	CLASS a Factory
 	FIELD a enchantment Lbfn;
 	FIELD b chances [F
 	METHOD <init> (Lbfn;[F)V

mappings/net/minecraft/world/loot/condition/WeatherCheckLootCondition.mapping

@@ -1,5 +1,5 @@
 CLASS crl net/minecraft/world/loot/condition/WeatherCheckLootCondition
-	CLASS crl$b Factory
+	CLASS b Factory
 	FIELD a raining Ljava/lang/Boolean;
 	FIELD b thundering Ljava/lang/Boolean;
 	METHOD <init> (Ljava/lang/Boolean;Ljava/lang/Boolean;)V

mappings/net/minecraft/world/loot/context/LootContext.mapping

@@ -1,5 +1,5 @@
 CLASS cos net/minecraft/world/loot/context/LootContext
-	CLASS cos$a Builder
+	CLASS a Builder
 		FIELD a world Lvi;
 		FIELD b parameters Ljava/util/Map;
 		FIELD c drops Ljava/util/Map;
@@ -32,11 +32,11 @@ CLASS cos net/minecraft/world/loot/context/LootContext
 		METHOD b putNullable (Lcqq;Ljava/lang/Object;)Lcos$a;
 			ARG 1 key
 			ARG 2 value
-	CLASS cos$b Dropper
+	CLASS b Dropper
 		METHOD add (Lcos;Ljava/util/function/Consumer;)V
 			ARG 1 context
-	CLASS cos$c EntityTarget
+	CLASS c EntityTarget
-		CLASS cos$c$a Serializer
+		CLASS a Serializer
 			METHOD read (Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object;
 				ARG 1 reader
 			METHOD write (Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V

mappings/net/minecraft/world/loot/context/LootContextType.mapping

@@ -1,5 +1,5 @@
 CLASS cqr net/minecraft/world/loot/context/LootContextType
-	CLASS cqr$a Builder
+	CLASS a Builder
 		FIELD a required Ljava/util/Set;
 		FIELD b allowed Ljava/util/Set;
 		METHOD a build ()Lcqr;

mappings/net/minecraft/world/loot/entry/AlternativeEntry.mapping

@@ -1,5 +1,5 @@
 CLASS cpb net/minecraft/world/loot/entry/AlternativeEntry
-	CLASS cpb$a Builder
+	CLASS a Builder
 		FIELD a children Ljava/util/List;
 		METHOD <init> ([Lcpk$a;)V
 			ARG 1 children

mappings/net/minecraft/world/loot/entry/CombinedEntry.mapping

@@ -1,9 +1,9 @@
 CLASS cpd net/minecraft/world/loot/entry/CombinedEntry
-	CLASS cpd$a Factory
+	CLASS a Factory
 		METHOD create ([Lcpk;[Lcre;)Lcpd;
 			ARG 1 children
 			ARG 2 conditions
-	CLASS cpd$b Serializer
+	CLASS b Serializer
 		METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcpk;[Lcre;)Lcpd;
 			ARG 1 json
 			ARG 2 context

mappings/net/minecraft/world/loot/entry/DynamicEntry.mapping

@@ -1,5 +1,5 @@
 CLASS cpe net/minecraft/world/loot/entry/DynamicEntry
-	CLASS cpe$a Serializer
+	CLASS a Serializer
 	FIELD c instance Lqt;
 	FIELD h name Lqt;
 	METHOD <init> (Lqt;II[Lcre;[Lcqb;)V

mappings/net/minecraft/world/loot/entry/EmptyEntry.mapping

@@ -1,5 +1,5 @@
 CLASS cpf net/minecraft/world/loot/entry/EmptyEntry
-	CLASS cpf$a Serializer
+	CLASS a Serializer
 	METHOD <init> (II[Lcre;[Lcqb;)V
 		ARG 1 weight
 		ARG 2 quality

mappings/net/minecraft/world/loot/entry/ItemEntry.mapping

@@ -1,5 +1,5 @@
 CLASS cph net/minecraft/world/loot/entry/ItemEntry
-	CLASS cph$a Serializer
+	CLASS a Serializer
 	FIELD c item Lbbz;
 	METHOD <init> (Lbbz;II[Lcre;[Lcqb;)V
 		ARG 1 item

mappings/net/minecraft/world/loot/entry/LeafEntry.mapping

@@ -1,5 +1,5 @@
 CLASS cpl net/minecraft/world/loot/entry/LeafEntry
-	CLASS cpl$a Builder
+	CLASS a Builder
 		FIELD a weight I
 		FIELD b quality I
 		FIELD c functions Ljava/util/List;
@@ -8,18 +8,18 @@ CLASS cpl net/minecraft/world/loot/entry/LeafEntry
 			ARG 1 weight
 		METHOD b setQuality (I)Lcpl$a;
 			ARG 1 quality
-	CLASS cpl$b BasicBuilder
+	CLASS b BasicBuilder
 		FIELD c factory Lcpl$d;
 		METHOD <init> (Lcpl$d;)V
 			ARG 1 factory
-	CLASS cpl$c Choice
+	CLASS c Choice
-	CLASS cpl$d Factory
+	CLASS d Factory
 		METHOD build (II[Lcre;[Lcqb;)Lcpl;
 			ARG 1 weight
 			ARG 2 quality
 			ARG 3 conditions
 			ARG 4 functions
-	CLASS cpl$e Serializer
+	CLASS e Serializer
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;II[Lcre;[Lcqb;)Lcpl;
 			ARG 1 entryJson
 			ARG 2 context

mappings/net/minecraft/world/loot/entry/LootEntries.mapping

@@ -1,5 +1,5 @@
 CLASS cpi net/minecraft/world/loot/entry/LootEntries
-	CLASS cpi$a Serializer
+	CLASS a Serializer
 		METHOD a getSerializer (Ljava/lang/Class;)Lcpk$b;
 			ARG 0 clazz
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;

mappings/net/minecraft/world/loot/entry/LootEntry.mapping

@@ -1,12 +1,12 @@
 CLASS cpk net/minecraft/world/loot/entry/LootEntry
-	CLASS cpk$a Builder
+	CLASS a Builder
 		FIELD a children Ljava/util/List;
 		METHOD a withChild (Lcpk$a;)Lcpb$a;
 			ARG 1 builder
 		METHOD b build ()Lcpk;
 		METHOD d getThisBuilder ()Lcpk$a;
 		METHOD f getConditions ()[Lcre;
-	CLASS cpk$b Serializer
+	CLASS b Serializer
 		FIELD a id Lqt;
 		FIELD b type Ljava/lang/Class;
 		METHOD <init> (Lqt;Ljava/lang/Class;)V

mappings/net/minecraft/world/loot/entry/LootTableEntry.mapping

@@ -1,5 +1,5 @@
 CLASS cpm net/minecraft/world/loot/entry/LootTableEntry
-	CLASS cpm$a Serializer
+	CLASS a Serializer
 	FIELD c id Lqt;
 	METHOD <init> (Lqt;II[Lcre;[Lcqb;)V
 		ARG 1 id

mappings/net/minecraft/world/loot/entry/TagEntry.mapping

@@ -1,5 +1,5 @@
 CLASS cpo net/minecraft/world/loot/entry/TagEntry
-	CLASS cpo$a Serializer
+	CLASS a Serializer
 	FIELD c name Lze;
 	FIELD h expand Z
 	METHOD <init> (Lze;ZII[Lcre;[Lcqb;)V

mappings/net/minecraft/world/loot/function/ApplyBonusLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cpq net/minecraft/world/loot/function/ApplyBonusLootFunction
-	CLASS cpq$a BinomialWithBonusCount
+	CLASS a BinomialWithBonusCount
 		FIELD a ID Lqt;
 		FIELD b extra I
 		FIELD c probability F
@@ -9,7 +9,7 @@ CLASS cpq net/minecraft/world/loot/function/ApplyBonusLootFunction
 		METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcpq$b;
 			ARG 0 json
 			ARG 1 context
-	CLASS cpq$b Formula
+	CLASS b Formula
 		METHOD a getId ()Lqt;
 		METHOD a toJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonSerializationContext;)V
 			ARG 1 json
@@ -18,17 +18,17 @@ CLASS cpq net/minecraft/world/loot/function/ApplyBonusLootFunction
 			ARG 1 random
 			ARG 2 initialCount
 			ARG 3 enchantmentLevel
-	CLASS cpq$c FormulaFactory
+	CLASS c FormulaFactory
 		METHOD deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcpq$b;
 			ARG 1 functionJson
 			ARG 2 context
-	CLASS cpq$d OreDrops
+	CLASS d OreDrops
 		FIELD a ID Lqt;
 		METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lcpq$b;
 			ARG 0 json
 			ARG 1 context
-	CLASS cpq$e Factory
+	CLASS e Factory
-	CLASS cpq$f UniformBonusCount
+	CLASS f UniformBonusCount
 		FIELD a ID Lqt;
 		FIELD b bonusMultiplier I
 		METHOD <init> (I)V

mappings/net/minecraft/world/loot/function/ConditionalLootFunction.mapping

@@ -1,13 +1,13 @@
 CLASS cqa net/minecraft/world/loot/function/ConditionalLootFunction
-	CLASS cqa$a Builder
+	CLASS a Builder
 		FIELD a conditionList Ljava/util/List;
 		METHOD d getThisBuilder ()Lcqa$a;
 		METHOD g getConditions ()[Lcre;
-	CLASS cqa$b Joiner
+	CLASS b Joiner
 		FIELD a joiner Ljava/util/function/Function;
 		METHOD <init> (Ljava/util/function/Function;)V
 			ARG 1 joiner
-	CLASS cqa$c Factory
+	CLASS c Factory
 		METHOD b fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lcre;)Lcqa;
 			ARG 1 json
 			ARG 2 context

mappings/net/minecraft/world/loot/function/CopyNameLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cps net/minecraft/world/loot/function/CopyNameLootFunction
-	CLASS cps$a Source
+	CLASS a Source
 		FIELD e name Ljava/lang/String;
 		FIELD f parameter Lcqq;
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;Lcqq;)V
@@ -7,7 +7,7 @@ CLASS cps net/minecraft/world/loot/function/CopyNameLootFunction
 			ARG 4 parameter
 		METHOD a get (Ljava/lang/String;)Lcps$a;
 			ARG 0 name
-	CLASS cps$b Factory
+	CLASS b Factory
 	FIELD a source Lcps$a;
 	METHOD <init> ([Lcre;Lcps$a;)V
 		ARG 1 conditions

mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cpt net/minecraft/world/loot/function/CopyNbtLootFunction
-	CLASS cpt$a Builder
+	CLASS a Builder
 		FIELD a source Lcpt$c;
 		FIELD b operations Ljava/util/List;
 		METHOD <init> (Lcpt$c;)V
@@ -11,7 +11,7 @@ CLASS cpt net/minecraft/world/loot/function/CopyNbtLootFunction
 			ARG 1 source
 			ARG 2 target
 			ARG 3 operator
-	CLASS cpt$b Operation
+	CLASS b Operation
 		FIELD a sourcePath Ljava/lang/String;
 		FIELD b parsedSourcePath Lcr$h;
 		FIELD c targetPath Ljava/lang/String;
@@ -27,7 +27,7 @@ CLASS cpt net/minecraft/world/loot/function/CopyNbtLootFunction
 		METHOD a execute (Ljava/util/function/Supplier;Lit;)V
 			ARG 1 itemTagTagGetter
 			ARG 2 sourceEntityTag
-	CLASS cpt$c Source
+	CLASS c Source
 		FIELD e name Ljava/lang/String;
 		FIELD f parameter Lcqq;
 		FIELD g getter Ljava/util/function/Function;
@@ -39,13 +39,13 @@ CLASS cpt net/minecraft/world/loot/function/CopyNbtLootFunction
 			ARG 2 context
 		METHOD a get (Ljava/lang/String;)Lcpt$c;
 			ARG 0 name
-	CLASS cpt$d Operator
+	CLASS d Operator
-		CLASS cpt$d$2
+		CLASS 2
 			METHOD a (Lit;Lit;)V
 				ARG 1 listTag
 			METHOD a (Ljava/util/List;Lit;)V
 				ARG 1 foundTag
-		CLASS cpt$d$3
+		CLASS 3
 			METHOD a (Lit;Lit;)V
 				ARG 1 compoundTag
 			METHOD a (Ljava/util/List;Lit;)V
@@ -62,7 +62,7 @@ CLASS cpt net/minecraft/world/loot/function/CopyNbtLootFunction
 			ARG 3 sourceTags
 		METHOD a get (Ljava/lang/String;)Lcpt$d;
 			ARG 0 name
-	CLASS cpt$e Factory
+	CLASS e Factory
 	FIELD a source Lcpt$c;
 	FIELD c operations Ljava/util/List;
 	FIELD d ENTITY_TAG_GETTER Ljava/util/function/Function;

mappings/net/minecraft/world/loot/function/EnchantRandomlyLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cpu net/minecraft/world/loot/function/EnchantRandomlyLootFunction
-	CLASS cpu$b Factory
+	CLASS b Factory
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD c enchantments Ljava/util/List;
 	METHOD <init> ([Lcre;Ljava/util/Collection;)V

mappings/net/minecraft/world/loot/function/EnchantWithLevelsLootFunction.mapping

@@ -1,11 +1,11 @@
 CLASS cpv net/minecraft/world/loot/function/EnchantWithLevelsLootFunction
-	CLASS cpv$a Builder
+	CLASS a Builder
 		FIELD a range Lcoy;
 		FIELD b treasureEnchantmentsAllowed Z
 		METHOD <init> (Lcoy;)V
 			ARG 1 range
 		METHOD e allowTreasureEnchantments ()Lcpv$a;
-	CLASS cpv$b Factory
+	CLASS b Factory
 	FIELD a range Lcoy;
 	FIELD c treasureEnchantmentsAllowed Z
 	METHOD <init> ([Lcre;Lcoy;Z)V

mappings/net/minecraft/world/loot/function/ExplorationMapLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cpw net/minecraft/world/loot/function/ExplorationMapLootFunction
-	CLASS cpw$a Builder
+	CLASS a Builder
 		FIELD a destination Ljava/lang/String;
 		FIELD b decoration Lcny$a;
 		FIELD c zoom B
@@ -13,7 +13,7 @@ CLASS cpw net/minecraft/world/loot/function/ExplorationMapLootFunction
 			ARG 1 destination
 		METHOD a withSkipExistingChunks (Z)Lcpw$a;
 			ARG 1 skipExistingChunks
-	CLASS cpw$b Factory
+	CLASS b Factory
 	FIELD a DEFAULT_DECORATION Lcny$a;
 	FIELD c LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD d destination Ljava/lang/String;

mappings/net/minecraft/world/loot/function/ExplosionDecayLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cpr net/minecraft/world/loot/function/ExplosionDecayLootFunction
-	CLASS cpr$a Factory
+	CLASS a Factory
 	METHOD <init> ([Lcre;)V
 		ARG 1 conditions
 	METHOD b builder ()Lcqa$a;

mappings/net/minecraft/world/loot/function/FillPlayerHeadLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cpx net/minecraft/world/loot/function/FillPlayerHeadLootFunction
-	CLASS cpx$a Factory
+	CLASS a Factory
 	FIELD a entity Lcos$c;
 	METHOD <init> ([Lcre;Lcos$c;)V
 		ARG 1 conditions

mappings/net/minecraft/world/loot/function/FurnaceSmeltLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cqn net/minecraft/world/loot/function/FurnaceSmeltLootFunction
-	CLASS cqn$a Factory
+	CLASS a Factory
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	METHOD <init> ([Lcre;)V
 		ARG 1 conditions

mappings/net/minecraft/world/loot/function/LimitCountLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cpz net/minecraft/world/loot/function/LimitCountLootFunction
-	CLASS cpz$a Factory
+	CLASS a Factory
 	FIELD a limit Lcor;
 	METHOD <init> ([Lcre;Lcor;)V
 		ARG 1 conditions

mappings/net/minecraft/world/loot/function/LootFunction.mapping

@@ -1,7 +1,7 @@
 CLASS cqb net/minecraft/world/loot/function/LootFunction
-	CLASS cqb$a Builder
+	CLASS a Builder
 		METHOD b build ()Lcqb;
-	CLASS cqb$b Factory
+	CLASS b Factory
 		FIELD a id Lqt;
 		FIELD b functionClass Ljava/lang/Class;
 		METHOD <init> (Lqt;Ljava/lang/Class;)V

mappings/net/minecraft/world/loot/function/LootFunctions.mapping

@@ -1,5 +1,5 @@
 CLASS cqc net/minecraft/world/loot/function/LootFunctions
-	CLASS cqc$a Factory
+	CLASS a Factory
 		METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object;
 			ARG 1 json
 			ARG 2 unused

mappings/net/minecraft/world/loot/function/LootingEnchantLootFunction.mapping

@@ -1,12 +1,12 @@
 CLASS cqd net/minecraft/world/loot/function/LootingEnchantLootFunction
-	CLASS cqd$a Builder
+	CLASS a Builder
 		FIELD a countRange Lcpa;
 		FIELD b limit I
 		METHOD <init> (Lcpa;)V
 			ARG 1 countRange
 		METHOD a withLimit (I)Lcqd$a;
 			ARG 1 limit
-	CLASS cqd$b Factory
+	CLASS b Factory
 	FIELD a countRange Lcpa;
 	FIELD c limit I
 	METHOD <init> ([Lcre;Lcpa;I)V

mappings/net/minecraft/world/loot/function/SetAttributesLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cqe net/minecraft/world/loot/function/SetAttributesLootFunction
-	CLASS cqe$b Attribute
+	CLASS b Attribute
 		FIELD a name Ljava/lang/String;
 		FIELD b attribute Ljava/lang/String;
 		FIELD c operation Lajm$a;
@@ -22,7 +22,7 @@ CLASS cqe net/minecraft/world/loot/function/SetAttributesLootFunction
 			ARG 1 context
 		METHOD a fromName (Ljava/lang/String;)Lajm$a;
 			ARG 0 name
-	CLASS cqe$d Factory
+	CLASS d Factory
 	FIELD a attributes Ljava/util/List;
 	METHOD <init> ([Lcre;Ljava/util/List;)V
 		ARG 1 conditions

mappings/net/minecraft/world/loot/function/SetContentsLootFunction.mapping

@@ -1,9 +1,9 @@
 CLASS cqf net/minecraft/world/loot/function/SetContentsLootFunction
-	CLASS cqf$a Builer
+	CLASS a Builer
 		FIELD a entries Ljava/util/List;
 		METHOD a withEntry (Lcpk$a;)Lcqf$a;
 			ARG 1 entryBuilder
-	CLASS cqf$b Factory
+	CLASS b Factory
 	FIELD a entries Ljava/util/List;
 	METHOD <init> ([Lcre;Ljava/util/List;)V
 		ARG 1 conditions

mappings/net/minecraft/world/loot/function/SetCountLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cqh net/minecraft/world/loot/function/SetCountLootFunction
-	CLASS cqh$a Factory
+	CLASS a Factory
 	FIELD a countRange Lcoy;
 	METHOD <init> ([Lcre;Lcoy;)V
 		ARG 1 conditions

mappings/net/minecraft/world/loot/function/SetDamageLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cqi net/minecraft/world/loot/function/SetDamageLootFunction
-	CLASS cqi$a Factory
+	CLASS a Factory
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD c durabilityRange Lcpa;
 	METHOD <init> ([Lcre;Lcpa;)V

mappings/net/minecraft/world/loot/function/SetLootTableLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cqg net/minecraft/world/loot/function/SetLootTableLootFunction
-	CLASS cqg$a Factory
+	CLASS a Factory
 	FIELD a id Lqt;
 	FIELD c seed J
 	METHOD <init> ([Lcre;Lqt;J)V

mappings/net/minecraft/world/loot/function/SetLoreLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cqj net/minecraft/world/loot/function/SetLoreLootFunction
-	CLASS cqj$b Factory
+	CLASS b Factory
 	FIELD a replace Z
 	FIELD c lore Ljava/util/List;
 	FIELD d entity Lcos$c;

mappings/net/minecraft/world/loot/function/SetNameLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cqk net/minecraft/world/loot/function/SetNameLootFunction
-	CLASS cqk$a Factory
+	CLASS a Factory
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD c name Ljn;
 	FIELD d entity Lcos$c;

mappings/net/minecraft/world/loot/function/SetNbtLootFunction.mapping

@@ -1,5 +1,5 @@
 CLASS cql net/minecraft/world/loot/function/SetNbtLootFunction
-	CLASS cql$a Builder
+	CLASS a Builder
 	FIELD a tag Lic;
 	METHOD <init> ([Lcre;Lic;)V
 		ARG 1 conditions

mappings/net/minecraft/world/loot/function/SetStewEffectLootFunction.mapping

@@ -1,10 +1,10 @@
 CLASS cqm net/minecraft/world/loot/function/SetStewEffectLootFunction
-	CLASS cqm$a Builder
+	CLASS a Builder
 		FIELD a map Ljava/util/Map;
 		METHOD a withEffect (Laid;Lcpa;)Lcqm$a;
 			ARG 1 effect
 			ARG 2 durationRange
-	CLASS cqm$b Factory
+	CLASS b Factory
 	FIELD a effects Ljava/util/Map;
 	METHOD <init> ([Lcre;Ljava/util/Map;)V
 		ARG 1 conditions

mappings/net/minecraft/world/storage/RegionFile.mapping

@@ -1,5 +1,5 @@
 CLASS byd net/minecraft/world/storage/RegionFile
-	CLASS byd$a ChunkBuffer
+	CLASS a ChunkBuffer
 		FIELD b pos Lbgy;
 	FIELD a EMPTY_SECTOR [B
 	FIELD b file Ljava/io/RandomAccessFile;

mappings/net/minecraft/world/timer/FunctionTagTimerCallback.mapping

@@ -1,3 +1,3 @@
 CLASS crq net/minecraft/world/timer/FunctionTagTimerCallback
-	CLASS crq$a Serializer
+	CLASS a Serializer
 	FIELD a name Lqt;

mappings/net/minecraft/world/timer/FunctionTimerCallback.mapping

@@ -1,3 +1,3 @@
 CLASS crp net/minecraft/world/timer/FunctionTimerCallback
-	CLASS crp$a Serializer
+	CLASS a Serializer
 	FIELD a name Lqt;

mappings/net/minecraft/world/timer/Timer.mapping

@@ -1,5 +1,5 @@
 CLASS crt net/minecraft/world/timer/Timer
-	CLASS crt$a Event
+	CLASS a Event
 		FIELD a triggerTime J
 		FIELD b id Lcom/google/common/primitives/UnsignedLong;
 		FIELD c name Ljava/lang/String;

mappings/net/minecraft/world/timer/TimerCallback.mapping

@@ -1,5 +1,5 @@
 CLASS crr net/minecraft/world/timer/TimerCallback
-	CLASS crr$a Serializer
+	CLASS a Serializer
 		FIELD a id Lqt;
 		FIELD b callbackClass Ljava/lang/Class;
 		METHOD a getId ()Lqt;