Skip to content

Commit

Permalink
apply suggestions from @supersaiyansubtlety
Browse files Browse the repository at this point in the history 
Co-authored-by: Will <[email protected]>
  • Loading branch information
@ix0rai @supersaiyansubtlety
ix0rai and supersaiyansubtlety authored Aug 2, 2023
1 parent 2490624 commit cf3c06e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mappings/net/minecraft/client/font/CodepointMap.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ CLASS net/minecraft/unmapped/C_srmdcrvq net/minecraft/client/font/CodepointMap
METHOD m_prbxgcyk keySet ()Lit/unimi/dsi/fastutil/ints/IntSet;
METHOD m_qaadkitj get (I)Ljava/lang/Object;
ARG 1 codePoint
METHOD m_qntqpivy computerIfAbsent (ILjava/util/function/IntFunction;)Ljava/lang/Object;
METHOD m_qntqpivy computeIfAbsent (ILjava/util/function/IntFunction;)Ljava/lang/Object;
ARG 1 codePoint
ARG 2 ifAbsent
ARG 2 mappingFunction
METHOD m_zrfypsvp (Lit/unimi/dsi/fastutil/ints/IntOpenHashSet;ILjava/lang/Object;)V
ARG 1 codePoint
ARG 2 glyph
Expand Down

2 comments on commit cf3c06e

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit cf3c06e, 34 file(s) were updated with 431 line(s) added and 383 removed compared to the latest Quilt Mappings version.

View the diff here (1/2): 
diff -bur namedTargetSrc/com/mojang/blaze3d/font/SpaceFont.java namedSrc/com/mojang/blaze3d/font/SpaceFont.java
--- namedTargetSrc/com/mojang/blaze3d/font/SpaceFont.java	2023-08-02 15:52:16.049789450 +0000
+++ namedSrc/com/mojang/blaze3d/font/SpaceFont.java	2023-08-02 15:50:15.162437183 +0000
@@ -82,8 +82,8 @@
        * Mapping not found
        */
       @Override
-      public Either<FontTypeProvider.C_dbnueaxr, FontTypeProvider.C_wxrtqmdn> m_bcikbtqr() {
-         FontTypeProvider.C_dbnueaxr lv = resourceManager -> new SpaceFont(this.advances);
+      public Either<FontTypeProvider.Loader, FontTypeProvider.Reference> unpack() {
+         FontTypeProvider.Loader lv = resourceManager -> new SpaceFont(this.advances);
          return Either.left(lv);
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/font/BitmapFont.java namedSrc/net/minecraft/client/font/BitmapFont.java
--- namedTargetSrc/net/minecraft/client/font/BitmapFont.java	2023-08-02 15:52:16.025788787 +0000
+++ namedSrc/net/minecraft/client/font/BitmapFont.java	2023-08-02 15:50:15.134436395 +0000
@@ -20,7 +20,6 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.resource.ResourceManager;
-import net.minecraft.unmapped.C_srmdcrvq;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.dynamic.Codecs;
 import org.jetbrains.annotations.Nullable;
@@ -44,15 +43,15 @@
    private final NativeImage image;
    /**
     * @mapping {@literal hashed f_syldtzsw Lnet/minecraft/unmapped/C_tfzxpuio;f_syldtzsw:Lnet/minecraft/unmapped/C_srmdcrvq;}
-    * @mapping {@literal named glyphs Lnet/minecraft/client/font/BitmapFont;glyphs:Lnet/minecraft/unmapped/C_srmdcrvq;}
+    * @mapping {@literal named glyphs Lnet/minecraft/client/font/BitmapFont;glyphs:Lnet/minecraft/client/font/CodepointMap;}
     */
-   private final C_srmdcrvq<BitmapFont.BitmapFontGlyph> glyphs;
+   private final CodepointMap<BitmapFont.BitmapFontGlyph> glyphs;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_tfzxpuio;<init>(Lnet/minecraft/unmapped/C_ayikuhxa;Lnet/minecraft/unmapped/C_srmdcrvq;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/client/font/BitmapFont;<init>(Lcom/mojang/blaze3d/texture/NativeImage;Lnet/minecraft/unmapped/C_srmdcrvq;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/font/BitmapFont;<init>(Lcom/mojang/blaze3d/texture/NativeImage;Lnet/minecraft/client/font/CodepointMap;)V}
     */
-   BitmapFont(NativeImage image, C_srmdcrvq<BitmapFont.BitmapFontGlyph> glyphs) {
+   BitmapFont(NativeImage image, CodepointMap<BitmapFont.BitmapFontGlyph> glyphs) {
       this.image = image;
       this.glyphs = glyphs;
    }
@@ -71,7 +70,7 @@
    @Nullable
    @Override
    public Glyph getGlyph(int codePoint) {
-      return this.glyphs.m_qaadkitj(codePoint);
+      return this.glyphs.get(codePoint);
    }
 
    /**
@@ -79,7 +78,7 @@
     */
    @Override
    public IntSet getProvidedGlyphs() {
-      return IntSets.unmodifiable(this.glyphs.m_prbxgcyk());
+      return IntSets.unmodifiable(this.glyphs.keySet());
    }
 
    /**
@@ -169,13 +168,13 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_tfzxpuio$C_qoeqnynz}
-    * @mapping {@literal named net/minecraft/client/font/BitmapFont$C_qoeqnynz}
+    * @mapping {@literal named net/minecraft/client/font/BitmapFont$Definition1}
     */
    @Environment(EnvType.CLIENT)
-   public static record C_qoeqnynz(Identifier file, int height, int ascent, int[][] codepointGrid) implements FontTypeProvider {
+   public static record Definition1(Identifier file, int height, int ascent, int[][] codepointGrid) implements FontTypeProvider {
       /**
        * @mapping {@literal hashed f_khrhgvcl Lnet/minecraft/unmapped/C_tfzxpuio$C_qoeqnynz;f_khrhgvcl:Lcom/mojang/serialization/Codec;}
-       * @mapping {@literal named CODEC Lnet/minecraft/client/font/BitmapFont$C_qoeqnynz;CODEC:Lcom/mojang/serialization/Codec;}
+       * @mapping {@literal named CODEC Lnet/minecraft/client/font/BitmapFont$Definition1;CODEC:Lcom/mojang/serialization/Codec;}
        */
       private static final Codec<int[][]> CODEC = Codecs.validate(Codec.STRING.listOf().xmap(list -> {
          int i = list.size();
@@ -186,46 +185,48 @@
          }
 
          return is;
-      }, is -> {
-         List<String> list = new ArrayList(is.length);
+      }, codePointGrid -> {
+         List<String> list = new ArrayList(codePointGrid.length);
 
-         for (int[] js : is) {
+         for (int[] js : codePointGrid) {
             list.add(new String(js, 0, js.length));
          }
 
          return list;
-      }), BitmapFont.C_qoeqnynz::m_cpshwqhq);
+      }), BitmapFont.Definition1::validateCodePointGrid);
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_cgyvixla Lnet/minecraft/unmapped/C_tfzxpuio$C_qoeqnynz;f_cgyvixla:Lcom/mojang/serialization/MapCodec;}
+       * @mapping {@literal named MAP_CODEC Lnet/minecraft/client/font/BitmapFont$Definition1;MAP_CODEC:Lcom/mojang/serialization/MapCodec;}
        */
-      public static final MapCodec<BitmapFont.C_qoeqnynz> f_cgyvixla = Codecs.validate(
+      public static final MapCodec<BitmapFont.Definition1> MAP_CODEC = Codecs.validate(
          RecordCodecBuilder.mapCodec(
             instance -> instance.group(
-                     Identifier.CODEC.fieldOf("file").forGetter(BitmapFont.C_qoeqnynz::file),
-                     Codec.INT.optionalFieldOf("height", Integer.valueOf(8)).forGetter(BitmapFont.C_qoeqnynz::height),
-                     Codec.INT.fieldOf("ascent").forGetter(BitmapFont.C_qoeqnynz::ascent),
-                     CODEC.fieldOf("chars").forGetter(BitmapFont.C_qoeqnynz::codepointGrid)
+                     Identifier.CODEC.fieldOf("file").forGetter(BitmapFont.Definition1::file),
+                     Codec.INT.optionalFieldOf("height", Integer.valueOf(8)).forGetter(BitmapFont.Definition1::height),
+                     Codec.INT.fieldOf("ascent").forGetter(BitmapFont.Definition1::ascent),
+                     CODEC.fieldOf("chars").forGetter(BitmapFont.Definition1::codepointGrid)
                   )
-                  .apply(instance, BitmapFont.C_qoeqnynz::new)
+                  .apply(instance, BitmapFont.Definition1::new)
          ),
-         BitmapFont.C_qoeqnynz::m_uzvsmvxq
+         BitmapFont.Definition1::validate
       );
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_cpshwqhq Lnet/minecraft/unmapped/C_tfzxpuio$C_qoeqnynz;m_cpshwqhq([[I)Lcom/mojang/serialization/DataResult;}
+       * @mapping {@literal named validateCodePointGrid Lnet/minecraft/client/font/BitmapFont$Definition1;validateCodePointGrid([[I)Lcom/mojang/serialization/DataResult;}
        */
-      private static DataResult<int[][]> m_cpshwqhq(int[][] is) {
-         int i = is.length;
+      private static DataResult<int[][]> validateCodePointGrid(int[][] grid) {
+         int i = grid.length;
          if (i == 0) {
             return DataResult.error(() -> "Expected to find data in codepoint grid");
          } else {
-            int[] js = is[0];
+            int[] js = grid[0];
             int j = js.length;
             if (j == 0) {
                return DataResult.error(() -> "Expected to find data in codepoint grid");
             } else {
                for (int k = 1; k < i; ++k) {
-                  int[] ks = is[k];
+                  int[] ks = grid[k];
                   if (ks.length != j) {
                      return DataResult.error(
                         () -> "Lines in codepoint grid have to be the same length (found: " + ks.length + " codepoints, expected: " + j + "), pad with \\u0000"
@@ -233,16 +234,19 @@
                   }
                }
 
-               return DataResult.success(is);
+               return DataResult.success(grid);
             }
          }
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_uzvsmvxq Lnet/minecraft/unmapped/C_tfzxpuio$C_qoeqnynz;m_uzvsmvxq(Lnet/minecraft/unmapped/C_tfzxpuio$C_qoeqnynz;)Lcom/mojang/serialization/DataResult;}
+       * @mapping {@literal named validate Lnet/minecraft/client/font/BitmapFont$Definition1;validate(Lnet/minecraft/client/font/BitmapFont$Definition1;)Lcom/mojang/serialization/DataResult;}
        */
-      private static DataResult<BitmapFont.C_qoeqnynz> m_uzvsmvxq(BitmapFont.C_qoeqnynz arg) {
-         return arg.ascent > arg.height ? DataResult.error(() -> "Ascent " + arg.ascent + " higher than height " + arg.height) : DataResult.success(arg);
+      private static DataResult<BitmapFont.Definition1> validate(BitmapFont.Definition1 definition) {
+         return definition.ascent > definition.height
+            ? DataResult.error(() -> "Ascent " + definition.ascent + " higher than height " + definition.height)
+            : DataResult.success(definition);
       }
 
       /**
@@ -257,15 +261,15 @@
        * Mapping not found
        */
       @Override
-      public Either<FontTypeProvider.C_dbnueaxr, FontTypeProvider.C_wxrtqmdn> m_bcikbtqr() {
-         return Either.left(this::m_pcwtnfss);
+      public Either<FontTypeProvider.Loader, FontTypeProvider.Reference> unpack() {
+         return Either.left(this::load);
       }
 
       /**
        * @mapping {@literal hashed m_pcwtnfss Lnet/minecraft/unmapped/C_tfzxpuio$C_qoeqnynz;m_pcwtnfss(Lnet/minecraft/unmapped/C_tmnrpasf;)Lnet/minecraft/unmapped/C_wywmjnuh;}
-       * @mapping {@literal named m_pcwtnfss Lnet/minecraft/client/font/BitmapFont$C_qoeqnynz;m_pcwtnfss(Lnet/minecraft/resource/ResourceManager;)Lcom/mojang/blaze3d/font/Font;}
+       * @mapping {@literal named load Lnet/minecraft/client/font/BitmapFont$Definition1;load(Lnet/minecraft/resource/ResourceManager;)Lcom/mojang/blaze3d/font/Font;}
        */
-      private Font m_pcwtnfss(ResourceManager resourceManager) throws IOException {
+      private Font load(ResourceManager resourceManager) throws IOException {
          Identifier lv = this.file.withPrefix("textures/");
          InputStream inputStream = resourceManager.open(lv);
 
@@ -277,7 +281,9 @@
             int k = i / this.codepointGrid[0].length;
             int l = j / this.codepointGrid.length;
             float f = (float)this.height / (float)l;
-            C_srmdcrvq<BitmapFont.BitmapFontGlyph> lv3 = new C_srmdcrvq<>(ix -> new BitmapFont.BitmapFontGlyph[ix], ix -> new BitmapFont.BitmapFontGlyph[ix][]);
+            CodepointMap<BitmapFont.BitmapFontGlyph> lv3 = new CodepointMap<>(
+               ix -> new BitmapFont.BitmapFontGlyph[ix], ix -> new BitmapFont.BitmapFontGlyph[ix][]
+            );
 
             for (int m = 0; m < this.codepointGrid.length; ++m) {
                int n = 0;
@@ -285,8 +291,8 @@
                for (int o : this.codepointGrid[m]) {
                   int p = n++;
                   if (o != 0) {
-                     int q = this.m_nmwzoeei(lv2, k, l, p, m);
-                     BitmapFont.BitmapFontGlyph lv4 = lv3.m_pepaswby(
+                     int q = this.getGlyphWidth(lv2, k, l, p, m);
+                     BitmapFont.BitmapFontGlyph lv4 = lv3.put(
                         o, new BitmapFont.BitmapFontGlyph(f, lv2, p * k, m * l, k, l, (int)(0.5 + (double)((float)q * f)) + 1, this.ascent)
                      );
                      if (lv4 != null) {
@@ -317,16 +323,17 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_nmwzoeei Lnet/minecraft/unmapped/C_tfzxpuio$C_qoeqnynz;m_nmwzoeei(Lnet/minecraft/unmapped/C_ayikuhxa;IIII)I}
+       * @mapping {@literal named getGlyphWidth Lnet/minecraft/client/font/BitmapFont$Definition1;getGlyphWidth(Lcom/mojang/blaze3d/texture/NativeImage;IIII)I}
        */
-      private int m_nmwzoeei(NativeImage arg, int i, int j, int k, int l) {
+      private int getGlyphWidth(NativeImage image, int charPosX, int charPosY, int gridPosX, int gridPosY) {
          int m;
-         for (m = i - 1; m >= 0; --m) {
-            int n = k * i + m;
+         for (m = charPosX - 1; m >= 0; --m) {
+            int n = gridPosX * charPosX + m;
 
-            for (int o = 0; o < j; ++o) {
-               int p = l * j + o;
-               if (arg.getPixelOpacity(n, p) != 0) {
+            for (int o = 0; o < charPosY; ++o) {
+               int p = gridPosY * charPosY + o;
+               if (image.getPixelOpacity(n, p) != 0) {
                   return m + 1;
                }
             }
Only in namedSrc/net/minecraft/client/font: CodepointMap.java
diff -bur namedTargetSrc/net/minecraft/client/font/EmptyGlyphRenderer.java namedSrc/net/minecraft/client/font/EmptyGlyphRenderer.java
--- namedTargetSrc/net/minecraft/client/font/EmptyGlyphRenderer.java	2023-08-02 15:52:15.901785361 +0000
+++ namedSrc/net/minecraft/client/font/EmptyGlyphRenderer.java	2023-08-02 15:50:14.970431782 +0000
@@ -22,7 +22,7 @@
     * Mapping not found
     */
    public EmptyGlyphRenderer() {
-      super(FontRenderType.m_zwetpjjz(new Identifier("")), 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F);
+      super(FontRenderType.get(new Identifier("")), 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/font/FontManager.java namedSrc/net/minecraft/client/font/FontManager.java
--- namedTargetSrc/net/minecraft/client/font/FontManager.java	2023-08-02 15:52:16.057789671 +0000
+++ namedSrc/net/minecraft/client/font/FontManager.java	2023-08-02 15:50:15.174437520 +0000
@@ -72,18 +72,20 @@
     */
    private static final ResourceFileNamespace NAMESPACE = ResourceFileNamespace.json("font");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_odfjvvnp Lnet/minecraft/unmapped/C_hoztwset;f_odfjvvnp:Lcom/google/gson/Gson;}
+    * @mapping {@literal named GSON Lnet/minecraft/client/font/FontManager;GSON:Lcom/google/gson/Gson;}
     */
-   private static final Gson f_odfjvvnp = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
+   private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
    /**
     * @mapping {@literal hashed f_akynnyla Lnet/minecraft/unmapped/C_hoztwset;f_akynnyla:Lnet/minecraft/unmapped/C_zhhoxunt;}
     * @mapping {@literal named missingStorage Lnet/minecraft/client/font/FontManager;missingStorage:Lnet/minecraft/client/font/FontStorage;}
     */
    private final FontStorage missingStorage;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_rrluaiwx Lnet/minecraft/unmapped/C_hoztwset;f_rrluaiwx:Ljava/util/List;}
+    * @mapping {@literal named fonts Lnet/minecraft/client/font/FontManager;fonts:Ljava/util/List;}
     */
-   private final List<Font> f_rrluaiwx = new ArrayList();
+   private final List<Font> fonts = new ArrayList();
    /**
     * @mapping {@literal hashed f_gzybknod Lnet/minecraft/unmapped/C_hoztwset;f_gzybknod:Ljava/util/Map;}
     * @mapping {@literal named fontStorages Lnet/minecraft/client/font/FontManager;fontStorages:Ljava/util/Map;}
@@ -125,30 +127,30 @@
    ) {
       prepareProfiler.startTick();
       prepareProfiler.endTick();
-      return this.m_irffyusm(manager, prepareExecutor)
+      return this.prepare(manager, prepareExecutor)
          .thenCompose(synchronizer::whenPrepared)
-         .thenAcceptAsync(arg2 -> this.m_ryfntqre(arg2, applyProfiler), applyExecutor);
+         .thenAcceptAsync(preparation -> this.reload(preparation, applyProfiler), applyExecutor);
    }
 
    /**
     * @mapping {@literal hashed m_irffyusm Lnet/minecraft/unmapped/C_hoztwset;m_irffyusm(Lnet/minecraft/unmapped/C_tmnrpasf;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;}
-    * @mapping {@literal named m_irffyusm Lnet/minecraft/client/font/FontManager;m_irffyusm(Lnet/minecraft/resource/ResourceManager;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;}
+    * @mapping {@literal named prepare Lnet/minecraft/client/font/FontManager;prepare(Lnet/minecraft/resource/ResourceManager;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;}
     */
-   private CompletableFuture<FontManager.C_mlohqlpb> m_irffyusm(ResourceManager resourceManager, Executor executor) {
-      List<CompletableFuture<FontManager.C_afyppwxt>> list = new ArrayList();
+   private CompletableFuture<FontManager.Preparation> prepare(ResourceManager resourceManager, Executor executor) {
+      List<CompletableFuture<FontManager.FontEntry>> list = new ArrayList();
 
       for (Entry<Identifier, List<Resource>> entry : NAMESPACE.findAllMatchingResources(resourceManager).entrySet()) {
          Identifier lv = NAMESPACE.unwrapFilePath((Identifier)entry.getKey());
          list.add(CompletableFuture.supplyAsync(() -> {
-            List<Pair<FontManager.C_ekydylip, FontTypeProvider>> listx = m_zexdlryp((List<Resource>)entry.getValue(), lv);
-            FontManager.C_afyppwxt lvx = new FontManager.C_afyppwxt(lv);
+            List<Pair<FontManager.FontKey, FontTypeProvider>> listx = loadFontProviders((List<Resource>)entry.getValue(), lv);
+            FontManager.FontEntry lvx = new FontManager.FontEntry(lv);
 
-            for (Pair<FontManager.C_ekydylip, FontTypeProvider> pair : listx) {
-               FontManager.C_ekydylip lv2 = pair.getFirst();
-               pair.getSecond().m_bcikbtqr().ifLeft(arg4 -> {
-                  CompletableFuture<Optional<Font>> completableFuture = this.m_ehgvydfj(lv2, arg4, resourceManager, executor);
-                  lvx.m_jxdpreyk(lv2, completableFuture);
-               }).ifRight(arg3 -> lvx.m_fpjthprs(lv2, arg3));
+            for (Pair<FontManager.FontKey, FontTypeProvider> pair : listx) {
+               FontManager.FontKey lv2 = pair.getFirst();
+               pair.getSecond().unpack().ifLeft(arg4 -> {
+                  CompletableFuture<Optional<Font>> completableFuture = this.load(lv2, arg4, resourceManager, executor);
+                  lvx.addBuilder(lv2, completableFuture);
+               }).ifRight(arg3 -> lvx.addReferenceBuilder(lv2, arg3));
             }
 
             return lvx;
@@ -159,21 +161,21 @@
          .thenCompose(
             listx -> {
                List<CompletableFuture<Optional<Font>>> list2 = (List)listx.stream()
-                  .flatMap(FontManager.C_afyppwxt::m_psbwrwxw)
+                  .flatMap(FontManager.FontEntry::listBuilders)
                   .collect(Collectors.toCollection(ArrayList::new));
                Font lvx = new BlankFont();
                list2.add(CompletableFuture.completedFuture(Optional.of(lvx)));
                return Util.combineSafe(list2)
                   .thenCompose(
                      list2x -> {
-                        Map<Identifier, List<Font>> map = this.m_wgtqzrby(listx);
+                        Map<Identifier, List<Font>> map = this.resolveProviders(listx);
                         CompletableFuture<?>[] completableFutures = (CompletableFuture[])map.values()
                            .stream()
-                           .map(listxxx -> CompletableFuture.runAsync(() -> this.m_vpphzugm(listxxx, lvx), executor))
+                           .map(listxxx -> CompletableFuture.runAsync(() -> this.finalizeProviderLoading(listxxx, lvx), executor))
                            .toArray(i -> new CompletableFuture[i]);
                         return CompletableFuture.allOf(completableFutures).thenApply(argx -> {
                            List<Font> list2xx = list2x.stream().flatMap(Optional::stream).toList();
-                           return new FontManager.C_mlohqlpb(map, list2xx);
+                           return new FontManager.Preparation(map, list2xx);
                         });
                      }
                   );
@@ -183,47 +185,47 @@
 
    /**
     * @mapping {@literal hashed m_ehgvydfj Lnet/minecraft/unmapped/C_hoztwset;m_ehgvydfj(Lnet/minecraft/unmapped/C_hoztwset$C_ekydylip;Lnet/minecraft/unmapped/C_gxohhscv$C_dbnueaxr;Lnet/minecraft/unmapped/C_tmnrpasf;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;}
-    * @mapping {@literal named m_ehgvydfj Lnet/minecraft/client/font/FontManager;m_ehgvydfj(Lnet/minecraft/client/font/FontManager$C_ekydylip;Lnet/minecraft/client/font/FontTypeProvider$C_dbnueaxr;Lnet/minecraft/resource/ResourceManager;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;}
+    * @mapping {@literal named load Lnet/minecraft/client/font/FontManager;load(Lnet/minecraft/client/font/FontManager$FontKey;Lnet/minecraft/client/font/FontTypeProvider$Loader;Lnet/minecraft/resource/ResourceManager;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;}
     */
-   private CompletableFuture<Optional<Font>> m_ehgvydfj(
-      FontManager.C_ekydylip arg, FontTypeProvider.C_dbnueaxr arg2, ResourceManager resourceManager, Executor executor
-   ) {
+   private CompletableFuture<Optional<Font>> load(FontManager.FontKey key, FontTypeProvider.Loader loader, ResourceManager resourceManager, Executor executor) {
       return CompletableFuture.supplyAsync(() -> {
          try {
-            return Optional.of(arg2.load(resourceManager));
+            return Optional.of(loader.load(resourceManager));
          } catch (Exception var4) {
-            LOGGER.warn("Failed to load builder {}, rejecting", arg, var4);
+            LOGGER.warn("Failed to load builder {}, rejecting", key, var4);
             return Optional.empty();
          }
       }, executor);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wgtqzrby Lnet/minecraft/unmapped/C_hoztwset;m_wgtqzrby(Ljava/util/List;)Ljava/util/Map;}
+    * @mapping {@literal named resolveProviders Lnet/minecraft/client/font/FontManager;resolveProviders(Ljava/util/List;)Ljava/util/Map;}
     */
-   private Map<Identifier, List<Font>> m_wgtqzrby(List<FontManager.C_afyppwxt> list) {
+   private Map<Identifier, List<Font>> resolveProviders(List<FontManager.FontEntry> entries) {
       Map<Identifier, List<Font>> map = new HashMap();
-      DependencySorter<Identifier, FontManager.C_afyppwxt> lv = new DependencySorter<>();
-      list.forEach(arg2 -> lv.addEntry(arg2.fontId, arg2));
-      lv.buildOrdered((arg, arg2) -> arg2.m_cbexdogi(map::get).ifPresent(listx -> map.put(arg, listx)));
+      DependencySorter<Identifier, FontManager.FontEntry> lv = new DependencySorter<>();
+      entries.forEach(entry -> lv.addEntry(entry.fontId, entry));
+      lv.buildOrdered((id, entry) -> entry.resolve(map::get).ifPresent(list -> map.put(id, list)));
       return map;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vpphzugm Lnet/minecraft/unmapped/C_hoztwset;m_vpphzugm(Ljava/util/List;Lnet/minecraft/unmapped/C_wywmjnuh;)V}
+    * @mapping {@literal named finalizeProviderLoading Lnet/minecraft/client/font/FontManager;finalizeProviderLoading(Ljava/util/List;Lcom/mojang/blaze3d/font/Font;)V}
     */
-   private void m_vpphzugm(List<Font> list, Font arg) {
-      list.add(0, arg);
+   private void finalizeProviderLoading(List<Font> fonts, Font font) {
+      fonts.add(0, font);
       IntSet intSet = new IntOpenHashSet();
 
-      for (Font lv : list) {
+      for (Font lv : fonts) {
          intSet.addAll(lv.getProvidedGlyphs());
       }
 
-      intSet.forEach(i -> {
-         if (i != 32) {
-            for (Font lvx : Lists.reverse(list)) {
-               if (lvx.getGlyph(i) != null) {
+      intSet.forEach(glyph -> {
+         if (glyph != 32) {
+            for (Font lvx : Lists.reverse(fonts)) {
+               if (lvx.getGlyph(glyph) != null) {
                   break;
                }
             }
@@ -233,46 +235,49 @@
 
    /**
     * @mapping {@literal hashed m_ryfntqre Lnet/minecraft/unmapped/C_hoztwset;m_ryfntqre(Lnet/minecraft/unmapped/C_hoztwset$C_mlohqlpb;Lnet/minecraft/unmapped/C_eslcbfsq;)V}
-    * @mapping {@literal named m_ryfntqre Lnet/minecraft/client/font/FontManager;m_ryfntqre(Lnet/minecraft/client/font/FontManager$C_mlohqlpb;Lnet/minecraft/util/profiler/Profiler;)V}
+    * @mapping {@literal named reload Lnet/minecraft/client/font/FontManager;reload(Lnet/minecraft/client/font/FontManager$Preparation;Lnet/minecraft/util/profiler/Profiler;)V}
     */
-   private void m_ryfntqre(FontManager.C_mlohqlpb arg, Profiler profiler) {
+   private void reload(FontManager.Preparation preparation, Profiler profiler) {
       profiler.startTick();
       profiler.push("closing");
       this.fontStorages.values().forEach(FontStorage::close);
       this.fontStorages.clear();
-      this.f_rrluaiwx.forEach(Font::close);
-      this.f_rrluaiwx.clear();
+      this.fonts.forEach(Font::close);
+      this.fonts.clear();
       profiler.swap("reloading");
-      arg.providers().forEach((argx, list) -> {
-         FontStorage lv = new FontStorage(this.textureManager, argx);
-         lv.setFonts(Lists.reverse(list));
-         this.fontStorages.put(argx, lv);
+      preparation.providers().forEach((id, fonts) -> {
+         FontStorage lv = new FontStorage(this.textureManager, id);
+         lv.setFonts(Lists.reverse(fonts));
+         this.fontStorages.put(id, lv);
       });
-      this.f_rrluaiwx.addAll(arg.allProviders);
+      this.fonts.addAll(preparation.allProviders);
       profiler.pop();
       profiler.endTick();
-      if (!this.fontStorages.containsKey(this.m_zxykceaj(MinecraftClient.DEFAULT_FONT_ID))) {
+      if (!this.fontStorages.containsKey(this.getIdOverride(MinecraftClient.DEFAULT_FONT_ID))) {
          throw new IllegalStateException("Default font failed to load");
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zexdlryp Lnet/minecraft/unmapped/C_hoztwset;m_zexdlryp(Ljava/util/List;Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/List;}
+    * @mapping {@literal named loadFontProviders Lnet/minecraft/client/font/FontManager;loadFontProviders(Ljava/util/List;Lnet/minecraft/util/Identifier;)Ljava/util/List;}
     */
-   private static List<Pair<FontManager.C_ekydylip, FontTypeProvider>> m_zexdlryp(List<Resource> list, Identifier arg) {
-      List<Pair<FontManager.C_ekydylip, FontTypeProvider>> list2 = new ArrayList();
+   private static List<Pair<FontManager.FontKey, FontTypeProvider>> loadFontProviders(List<Resource> fontResources, Identifier id) {
+      List<Pair<FontManager.FontKey, FontTypeProvider>> list2 = new ArrayList();
 
-      for (Resource lv : list) {
+      for (Resource lv : fontResources) {
          try {
             Reader reader = lv.openBufferedReader();
 
             try {
-               JsonElement jsonElement = f_odfjvvnp.fromJson(reader, JsonElement.class);
-               FontManager.C_zszljruf lv2 = Util.m_mbsowkqc(FontManager.C_zszljruf.CODEC.parse(JsonOps.INSTANCE, jsonElement), JsonParseException::new);
+               JsonElement jsonElement = GSON.fromJson(reader, JsonElement.class);
+               FontManager.FontDefinitionFile lv2 = Util.m_mbsowkqc(
+                  FontManager.FontDefinitionFile.CODEC.parse(JsonOps.INSTANCE, jsonElement), JsonParseException::new
+               );
                List<FontTypeProvider> list3 = lv2.providers;
 
                for (int i = list3.size() - 1; i >= 0; --i) {
-                  FontManager.C_ekydylip lv3 = new FontManager.C_ekydylip(arg, lv.getSourceName(), i);
+                  FontManager.FontKey lv3 = new FontManager.FontKey(id, lv.getSourceName(), i);
                   list2.add(Pair.of(lv3, (FontTypeProvider)list3.get(i)));
                }
             } catch (Throwable var12) {
@@ -291,7 +296,7 @@
                reader.close();
             }
          } catch (Exception var13) {
-            LOGGER.warn("Unable to load font '{}' in {} in resourcepack: '{}'", arg, "fonts.json", lv.getSourceName(), var13);
+            LOGGER.warn("Unable to load font '{}' in {} in resourcepack: '{}'", id, "fonts.json", lv.getSourceName(), var13);
          }
       }
 
@@ -307,10 +312,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zxykceaj Lnet/minecraft/unmapped/C_hoztwset;m_zxykceaj(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named getIdOverride Lnet/minecraft/client/font/FontManager;getIdOverride(Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier;}
     */
-   private Identifier m_zxykceaj(Identifier arg) {
-      return (Identifier)this.idOverrides.getOrDefault(arg, arg);
+   private Identifier getIdOverride(Identifier id) {
+      return (Identifier)this.idOverrides.getOrDefault(id, id);
    }
 
    /**
@@ -322,7 +328,7 @@
     * @mapping {@literal named createTextRenderer Lnet/minecraft/client/font/FontManager;createTextRenderer()Lnet/minecraft/client/font/TextRenderer;}
     */
    public TextRenderer createTextRenderer() {
-      return new TextRenderer(arg -> (FontStorage)this.fontStorages.getOrDefault(this.m_zxykceaj(arg), this.missingStorage), false);
+      return new TextRenderer(id -> (FontStorage)this.fontStorages.getOrDefault(this.getIdOverride(id), this.missingStorage), false);
    }
 
    /**
@@ -340,7 +346,7 @@
     * @mapping {@literal named createAntiFishyTextRenderer Lnet/minecraft/client/font/FontManager;createAntiFishyTextRenderer()Lnet/minecraft/client/font/TextRenderer;}
     */
    public TextRenderer createAntiFishyTextRenderer() {
-      return new TextRenderer(arg -> (FontStorage)this.fontStorages.getOrDefault(this.m_zxykceaj(arg), this.missingStorage), true);
+      return new TextRenderer(id -> (FontStorage)this.fontStorages.getOrDefault(this.getIdOverride(id), this.missingStorage), true);
    }
 
    /**
@@ -349,55 +355,106 @@
     */
    public void close() {
       this.fontStorages.values().forEach(FontStorage::close);
-      this.f_rrluaiwx.forEach(Font::close);
+      this.fonts.forEach(Font::close);
       this.missingStorage.close();
    }
 
    /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_hoztwset$C_chqbefoa}
+    * @mapping {@literal named net/minecraft/client/font/FontManager$Builder}
+    */
+   @Environment(EnvType.CLIENT)
+   static record Builder(FontManager.FontKey id, Either<CompletableFuture<Optional<Font>>, Identifier> result) {
+
+      /**
+       * @mapping {@literal hashed m_wtgjetaw Lnet/minecraft/unmapped/C_hoztwset$C_chqbefoa;m_wtgjetaw(Ljava/util/function/Function;)Ljava/util/Optional;}
+       * @mapping {@literal named build Lnet/minecraft/client/font/FontManager$Builder;build(Ljava/util/function/Function;)Ljava/util/Optional;}
+       */
+      public Optional<List<Font>> build(Function<Identifier, List<Font>> fontLoader) {
+         return this.result
+            .map(
+               future -> ((Optional)future.join()).map(List::of),
+               id -> {
+                  List<Font> list = (List)fontLoader.apply(id);
+                  if (list == null) {
+                     FontManager.LOGGER
+                        .warn(
+                           "Can't find font {} referenced by builder {}, either because it's missing, failed to load or is part of loading cycle", id, this.id
+                        );
+                     return Optional.empty();
+                  } else {
+                     return Optional.of(list);
+                  }
+               }
+            );
+      }
+   }
+
+   /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_hoztwset$C_zszljruf}
+    * @mapping {@literal named net/minecraft/client/font/FontManager$FontDefinitionFile}
+    */
+   @Environment(EnvType.CLIENT)
+   static record FontDefinitionFile(List<FontTypeProvider> providers) {
+      /**
+       * @mapping {@literal hashed f_lhrnvnnp Lnet/minecraft/unmapped/C_hoztwset$C_zszljruf;f_lhrnvnnp:Lcom/mojang/serialization/Codec;}
+       * @mapping {@literal named CODEC Lnet/minecraft/client/font/FontManager$FontDefinitionFile;CODEC:Lcom/mojang/serialization/Codec;}
+       */
+      public static final Codec<FontManager.FontDefinitionFile> CODEC = RecordCodecBuilder.create(
+         instance -> instance.group(FontTypeProvider.CODEC.listOf().fieldOf("providers").forGetter(FontManager.FontDefinitionFile::providers))
+               .apply(instance, FontManager.FontDefinitionFile::new)
+      );
+   }
+
+   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_hoztwset$C_afyppwxt}
-    * @mapping {@literal named net/minecraft/client/font/FontManager$C_afyppwxt}
+    * @mapping {@literal named net/minecraft/client/font/FontManager$FontEntry}
     */
    @Environment(EnvType.CLIENT)
-   static record C_afyppwxt(Identifier fontId, List<FontManager.C_chqbefoa> builders, Set<Identifier> dependencies)
-      implements DependencySorter.Entry<Identifier> {
+   static record FontEntry(Identifier fontId, List<FontManager.Builder> builders, Set<Identifier> dependencies) implements DependencySorter.Entry<Identifier> {
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hoztwset$C_afyppwxt;<init>(Lnet/minecraft/unmapped/C_ncpywfca;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/client/font/FontManager$FontEntry;<init>(Lnet/minecraft/util/Identifier;)V}
        */
-      public C_afyppwxt(Identifier arg) {
-         this(arg, new ArrayList(), new HashSet());
+      public FontEntry(Identifier id) {
+         this(id, new ArrayList(), new HashSet());
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_fpjthprs Lnet/minecraft/unmapped/C_hoztwset$C_afyppwxt;m_fpjthprs(Lnet/minecraft/unmapped/C_hoztwset$C_ekydylip;Lnet/minecraft/unmapped/C_gxohhscv$C_wxrtqmdn;)V}
+       * @mapping {@literal named addReferenceBuilder Lnet/minecraft/client/font/FontManager$FontEntry;addReferenceBuilder(Lnet/minecraft/client/font/FontManager$FontKey;Lnet/minecraft/client/font/FontTypeProvider$Reference;)V}
        */
-      public void m_fpjthprs(FontManager.C_ekydylip arg, FontTypeProvider.C_wxrtqmdn arg2) {
-         this.builders.add(new FontManager.C_chqbefoa(arg, Either.right(arg2.id())));
-         this.dependencies.add(arg2.id());
+      public void addReferenceBuilder(FontManager.FontKey key, FontTypeProvider.Reference reference) {
+         this.builders.add(new FontManager.Builder(key, Either.right(reference.id())));
+         this.dependencies.add(reference.id());
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_jxdpreyk Lnet/minecraft/unmapped/C_hoztwset$C_afyppwxt;m_jxdpreyk(Lnet/minecraft/unmapped/C_hoztwset$C_ekydylip;Ljava/util/concurrent/CompletableFuture;)V}
+       * @mapping {@literal named addBuilder Lnet/minecraft/client/font/FontManager$FontEntry;addBuilder(Lnet/minecraft/client/font/FontManager$FontKey;Ljava/util/concurrent/CompletableFuture;)V}
        */
-      public void m_jxdpreyk(FontManager.C_ekydylip arg, CompletableFuture<Optional<Font>> completableFuture) {
-         this.builders.add(new FontManager.C_chqbefoa(arg, Either.left(completableFuture)));
+      public void addBuilder(FontManager.FontKey key, CompletableFuture<Optional<Font>> future) {
+         this.builders.add(new FontManager.Builder(key, Either.left(future)));
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_psbwrwxw Lnet/minecraft/unmapped/C_hoztwset$C_afyppwxt;m_psbwrwxw()Ljava/util/stream/Stream;}
+       * @mapping {@literal named listBuilders Lnet/minecraft/client/font/FontManager$FontEntry;listBuilders()Ljava/util/stream/Stream;}
        */
-      private Stream<CompletableFuture<Optional<Font>>> m_psbwrwxw() {
-         return this.builders.stream().flatMap(arg -> arg.result.left().stream());
+      private Stream<CompletableFuture<Optional<Font>>> listBuilders() {
+         return this.builders.stream().flatMap(builder -> builder.result.left().stream());
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_cbexdogi Lnet/minecraft/unmapped/C_hoztwset$C_afyppwxt;m_cbexdogi(Ljava/util/function/Function;)Ljava/util/Optional;}
+       * @mapping {@literal named resolve Lnet/minecraft/client/font/FontManager$FontEntry;resolve(Ljava/util/function/Function;)Ljava/util/Optional;}
        */
-      public Optional<List<Font>> m_cbexdogi(Function<Identifier, List<Font>> function) {
+      public Optional<List<Font>> resolve(Function<Identifier, List<Font>> fontLoader) {
          List<Font> list = new ArrayList();
 
-         for (FontManager.C_chqbefoa lv : this.builders) {
-            Optional<List<Font>> optional = lv.m_wtgjetaw(function);
+         for (FontManager.Builder lv : this.builders) {
+            Optional<List<Font>> optional = lv.build(fontLoader);
             if (!optional.isPresent()) {
                return Optional.empty();
             }
@@ -425,41 +482,11 @@
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_hoztwset$C_chqbefoa}
-    * @mapping {@literal named net/minecraft/client/font/FontManager$C_chqbefoa}
-    */
-   @Environment(EnvType.CLIENT)
-   static record C_chqbefoa(FontManager.C_ekydylip id, Either<CompletableFuture<Optional<Font>>, Identifier> result) {
-
-      /**
-       * Mapping not found
-       */
-      public Optional<List<Font>> m_wtgjetaw(Function<Identifier, List<Font>> function) {
-         return this.result
-            .map(
-               completableFuture -> ((Optional)completableFuture.join()).map(List::of),
-               arg -> {
-                  List<Font> list = (List)function.apply(arg);
-                  if (list == null) {
-                     FontManager.LOGGER
-                        .warn(
-                           "Can't find font {} referenced by builder {}, either because it's missing, failed to load or is part of loading cycle", arg, this.id
-                        );
-                     return Optional.empty();
-                  } else {
-                     return Optional.of(list);
-                  }
-               }
-            );
-      }
-   }
-
-   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_hoztwset$C_ekydylip}
-    * @mapping {@literal named net/minecraft/client/font/FontManager$C_ekydylip}
+    * @mapping {@literal named net/minecraft/client/font/FontManager$FontKey}
     */
    @Environment(EnvType.CLIENT)
-   static record C_ekydylip(Identifier fontId, String pack, int index) {
+   static record FontKey(Identifier fontId, String pack, int index) {
       /**
        * Mapping not found
        */
@@ -470,25 +497,9 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_hoztwset$C_mlohqlpb}
-    * @mapping {@literal named net/minecraft/client/font/FontManager$C_mlohqlpb}
+    * @mapping {@literal named net/minecraft/client/font/FontManager$Preparation}
     */
    @Environment(EnvType.CLIENT)
-   static record C_mlohqlpb(Map<Identifier, List<Font>> providers, List<Font> allProviders) {
-   }
-
-   /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_hoztwset$C_zszljruf}
-    * @mapping {@literal named net/minecraft/client/font/FontManager$C_zszljruf}
-    */
-   @Environment(EnvType.CLIENT)
-   static record C_zszljruf(List<FontTypeProvider> providers) {
-      /**
-       * @mapping {@literal hashed f_lhrnvnnp Lnet/minecraft/unmapped/C_hoztwset$C_zszljruf;f_lhrnvnnp:Lcom/mojang/serialization/Codec;}
-       * @mapping {@literal named CODEC Lnet/minecraft/client/font/FontManager$C_zszljruf;CODEC:Lcom/mojang/serialization/Codec;}
-       */
-      public static final Codec<FontManager.C_zszljruf> CODEC = RecordCodecBuilder.create(
-         instance -> instance.group(FontTypeProvider.CODEC.listOf().fieldOf("providers").forGetter(FontManager.C_zszljruf::providers))
-               .apply(instance, FontManager.C_zszljruf::new)
-      );
+   static record Preparation(Map<Identifier, List<Font>> providers, List<Font> allProviders) {
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/font/FontRenderType.java namedSrc/net/minecraft/client/font/FontRenderType.java
--- namedTargetSrc/net/minecraft/client/font/FontRenderType.java	2023-08-02 15:52:15.961787019 +0000
+++ namedSrc/net/minecraft/client/font/FontRenderType.java	2023-08-02 15:50:15.050434032 +0000
@@ -12,24 +12,27 @@
 @Environment(EnvType.CLIENT)
 public record FontRenderType(RenderLayer normal, RenderLayer seeThrough, RenderLayer polygonOffset) {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pgdjktiv Lnet/minecraft/unmapped/C_wrgwzztj;m_pgdjktiv(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wrgwzztj;}
+    * @mapping {@literal named getIntensity Lnet/minecraft/client/font/FontRenderType;getIntensity(Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/font/FontRenderType;}
     */
-   public static FontRenderType m_pgdjktiv(Identifier arg) {
-      return new FontRenderType(RenderLayer.getTextIntensity(arg), RenderLayer.getTextIntensitySeeThrough(arg), RenderLayer.getTextIntensityPolygonOffset(arg));
+   public static FontRenderType getIntensity(Identifier id) {
+      return new FontRenderType(RenderLayer.getTextIntensity(id), RenderLayer.getTextIntensitySeeThrough(id), RenderLayer.getTextIntensityPolygonOffset(id));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zwetpjjz Lnet/minecraft/unmapped/C_wrgwzztj;m_zwetpjjz(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wrgwzztj;}
+    * @mapping {@literal named get Lnet/minecraft/client/font/FontRenderType;get(Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/font/FontRenderType;}
     */
-   public static FontRenderType m_zwetpjjz(Identifier arg) {
-      return new FontRenderType(RenderLayer.getText(arg), RenderLayer.getTextSeeThrough(arg), RenderLayer.getTextPolygonOffset(arg));
+   public static FontRenderType get(Identifier id) {
+      return new FontRenderType(RenderLayer.getText(id), RenderLayer.getTextSeeThrough(id), RenderLayer.getTextPolygonOffset(id));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zagycsep Lnet/minecraft/unmapped/C_wrgwzztj;m_zagycsep(Lnet/minecraft/unmapped/C_mavozmpp$C_ocdaignk;)Lnet/minecraft/unmapped/C_tizlwnnv;}
+    * @mapping {@literal named getLayer Lnet/minecraft/client/font/FontRenderType;getLayer(Lnet/minecraft/client/font/TextRenderer$TextLayerType;)Lnet/minecraft/client/render/RenderLayer;}
     */
-   public RenderLayer m_zagycsep(TextRenderer.TextLayerType arg) {
-      return switch (arg) {
+   public RenderLayer getLayer(TextRenderer.TextLayerType layerType) {
+      return switch (layerType) {
          case NORMAL -> this.normal;
          case SEE_THROUGH -> this.seeThrough;
          case POLYGON_OFFSET -> this.polygonOffset;
diff -bur namedTargetSrc/net/minecraft/client/font/FontStorage.java namedSrc/net/minecraft/client/font/FontStorage.java
--- namedTargetSrc/net/minecraft/client/font/FontStorage.java	2023-08-02 15:52:15.953786798 +0000
+++ namedSrc/net/minecraft/client/font/FontStorage.java	2023-08-02 15:50:15.038433695 +0000
@@ -17,7 +17,6 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.texture.TextureManager;
-import net.minecraft.unmapped.C_srmdcrvq;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.random.RandomGenerator;
@@ -68,14 +67,14 @@
    private final List<Font> fonts = Lists.<Font>newArrayList();
    /**
     * @mapping {@literal hashed f_aiwolaxy Lnet/minecraft/unmapped/C_zhhoxunt;f_aiwolaxy:Lnet/minecraft/unmapped/C_srmdcrvq;}
-    * @mapping {@literal named glyphRendererCache Lnet/minecraft/client/font/FontStorage;glyphRendererCache:Lnet/minecraft/unmapped/C_srmdcrvq;}
+    * @mapping {@literal named glyphRendererCache Lnet/minecraft/client/font/FontStorage;glyphRendererCache:Lnet/minecraft/client/font/CodepointMap;}
     */
-   private final C_srmdcrvq<GlyphRenderer> glyphRendererCache = new C_srmdcrvq<>(i -> new GlyphRenderer[i], i -> new GlyphRenderer[i][]);
+   private final CodepointMap<GlyphRenderer> glyphRendererCache = new CodepointMap<>(i -> new GlyphRenderer[i], i -> new GlyphRenderer[i][]);
    /**
     * @mapping {@literal hashed f_deijrvpv Lnet/minecraft/unmapped/C_zhhoxunt;f_deijrvpv:Lnet/minecraft/unmapped/C_srmdcrvq;}
-    * @mapping {@literal named glyphCache Lnet/minecraft/client/font/FontStorage;glyphCache:Lnet/minecraft/unmapped/C_srmdcrvq;}
+    * @mapping {@literal named glyphCache Lnet/minecraft/client/font/FontStorage;glyphCache:Lnet/minecraft/client/font/CodepointMap;}
     */
-   private final C_srmdcrvq<FontStorage.GlyphInfoFilter> glyphCache = new C_srmdcrvq<>(
+   private final CodepointMap<FontStorage.GlyphInfoFilter> glyphCache = new CodepointMap<>(
       i -> new FontStorage.GlyphInfoFilter[i], i -> new FontStorage.GlyphInfoFilter[i][]
    );
    /**
@@ -105,8 +104,8 @@
    public void setFonts(List<Font> fonts) {
       this.closeFonts();
       this.closeGlyphAtlases();
-      this.glyphRendererCache.m_higtkvia();
-      this.glyphCache.m_higtkvia();
+      this.glyphRendererCache.clear();
+      this.glyphCache.clear();
       this.charactersByWidth.clear();
       this.blankGlyphRenderer = SpecialFontGlyph.MISSING.bake(this::getGlyphRenderer);
       this.whiteRectangleGlyphRenderer = SpecialFontGlyph.WHITE.bake(this::getGlyphRenderer);
@@ -118,15 +117,15 @@
 
       Set<Font> set = Sets.<Font>newHashSet();
       intSet.forEach(
-         i -> {
+         codePoint -> {
             for (Font lvx : fonts) {
-               Glyph lv2 = lvx.getGlyph(i);
+               Glyph lv2 = lvx.getGlyph(codePoint);
                if (lv2 != null) {
                   set.add(lvx);
                   if (lv2 != SpecialFontGlyph.MISSING) {
                      this.charactersByWidth
-                        .computeIfAbsent(MathHelper.ceil(lv2.getAdvance(false)), (Int2ObjectFunction<? extends IntList>)(ix -> new IntArrayList()))
-                        .add(i);
+                        .computeIfAbsent(MathHelper.ceil(lv2.getAdvance(false)), (Int2ObjectFunction<? extends IntList>)(i -> new IntArrayList()))
+                        .add(codePoint);
                   }
                   break;
                }
@@ -211,7 +210,7 @@
     * @mapping {@literal named getGlyph Lnet/minecraft/client/font/FontStorage;getGlyph(IZ)Lcom/mojang/blaze3d/font/Glyph;}
     */
    public Glyph getGlyph(int codePoint, boolean filterFishyGlyphs) {
-      return this.glyphCache.m_qntqpivy(codePoint, this::findGlyph).select(filterFishyGlyphs);
+      return this.glyphCache.computeIfAbsent(codePoint, this::findGlyph).select(filterFishyGlyphs);
    }
 
    /**
@@ -234,7 +233,7 @@
     * @mapping {@literal named getGlyphRenderer Lnet/minecraft/client/font/FontStorage;getGlyphRenderer(I)Lnet/minecraft/client/font/GlyphRenderer;}
     */
    public GlyphRenderer getGlyphRenderer(int codePoint) {
-      return this.glyphRendererCache.m_qntqpivy(codePoint, this::bakeGlyph);
+      return this.glyphRendererCache.computeIfAbsent(codePoint, this::bakeGlyph);
    }
 
    /**
@@ -251,7 +250,7 @@
 
       Identifier lv3 = this.id.extendPath("/" + this.glyphAtlases.size());
       boolean bl = glyphInfo.isColored();
-      FontRenderType lv4 = bl ? FontRenderType.m_zwetpjjz(lv3) : FontRenderType.m_pgdjktiv(lv3);
+      FontRenderType lv4 = bl ? FontRenderType.get(lv3) : FontRenderType.getIntensity(lv3);
       GlyphAtlasTexture lv5 = new GlyphAtlasTexture(lv4, bl);
       this.glyphAtlases.add(lv5);
       this.textureManager.registerTexture(lv3, lv5);
diff -bur namedTargetSrc/net/minecraft/client/font/FontType.java namedSrc/net/minecraft/client/font/FontType.java
--- namedTargetSrc/net/minecraft/client/font/FontType.java	2023-08-02 15:52:15.901785361 +0000
+++ namedSrc/net/minecraft/client/font/FontType.java	2023-08-02 15:50:14.978432007 +0000
@@ -5,7 +5,6 @@
 import com.mojang.serialization.MapCodec;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.unmapped.C_pxvlatlk;
 import net.minecraft.unmapped.C_thiwijsl;
 import net.minecraft.unmapped.C_tpdqtyid;
 import net.minecraft.util.StringIdentifiable;
@@ -20,7 +19,7 @@
     * @mapping {@literal hashed f_xxnvocoh Lnet/minecraft/unmapped/C_tokkcrgg;f_xxnvocoh:Lnet/minecraft/unmapped/C_tokkcrgg;}
     * @mapping {@literal named BITMAP Lnet/minecraft/client/font/FontType;BITMAP:Lnet/minecraft/client/font/FontType;}
     */
-   BITMAP("bitmap", BitmapFont.C_qoeqnynz.f_cgyvixla),
+   BITMAP("bitmap", BitmapFont.Definition1.MAP_CODEC),
    /**
     * @mapping {@literal hashed f_hjcmitir Lnet/minecraft/unmapped/C_tokkcrgg;f_hjcmitir:Lnet/minecraft/unmapped/C_tokkcrgg;}
     * @mapping {@literal named TTF Lnet/minecraft/client/font/FontType;TTF:Lnet/minecraft/client/font/FontType;}
@@ -35,7 +34,7 @@
     * @mapping {@literal hashed f_qlafvonv Lnet/minecraft/unmapped/C_tokkcrgg;f_qlafvonv:Lnet/minecraft/unmapped/C_tokkcrgg;}
     * @mapping {@literal named UNIHEX Lnet/minecraft/client/font/FontType;UNIHEX:Lnet/minecraft/client/font/FontType;}
     */
-   UNIHEX("unihex", C_pxvlatlk.C_mxikwcxh.f_muggwgfw),
+   UNIHEX("unihex", UnihexFont.Definition.MAP_CODEC),
    /**
     * @mapping {@literal hashed f_uktrpckd Lnet/minecraft/unmapped/C_tokkcrgg;f_uktrpckd:Lnet/minecraft/unmapped/C_tokkcrgg;}
     * @mapping {@literal named REFERENCE Lnet/minecraft/client/font/FontType;REFERENCE:Lnet/minecraft/client/font/FontType;}
diff -bur namedTargetSrc/net/minecraft/client/font/FontTypeProvider.java namedSrc/net/minecraft/client/font/FontTypeProvider.java
--- namedTargetSrc/net/minecraft/client/font/FontTypeProvider.java	2023-08-02 15:52:16.045789339 +0000
+++ namedSrc/net/minecraft/client/font/FontTypeProvider.java	2023-08-02 15:50:15.158437070 +0000
@@ -19,7 +19,7 @@
     * @mapping {@literal hashed f_xxgtorip Lnet/minecraft/unmapped/C_gxohhscv;f_xxgtorip:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/client/font/FontTypeProvider;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   Codec<FontTypeProvider> CODEC = FontType.CODEC.dispatch(FontTypeProvider::getFontType, arg -> arg.getMapCodec().codec());
+   Codec<FontTypeProvider> CODEC = FontType.CODEC.dispatch(FontTypeProvider::getFontType, type -> type.getMapCodec().codec());
 
    /**
     * @mapping {@literal hashed m_civohnpf Lnet/minecraft/unmapped/C_gxohhscv;m_civohnpf()Lnet/minecraft/unmapped/C_tokkcrgg;}
@@ -28,28 +28,29 @@
    FontType getFontType();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bcikbtqr Lnet/minecraft/unmapped/C_gxohhscv;m_bcikbtqr()Lcom/mojang/datafixers/util/Either;}
+    * @mapping {@literal named unpack Lnet/minecraft/client/font/FontTypeProvider;unpack()Lcom/mojang/datafixers/util/Either;}
     */
-   Either<FontTypeProvider.C_dbnueaxr, FontTypeProvider.C_wxrtqmdn> m_bcikbtqr();
+   Either<FontTypeProvider.Loader, FontTypeProvider.Reference> unpack();
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_gxohhscv$C_dbnueaxr}
-    * @mapping {@literal named net/minecraft/client/font/FontTypeProvider$C_dbnueaxr}
+    * @mapping {@literal named net/minecraft/client/font/FontTypeProvider$Loader}
     */
    @Environment(EnvType.CLIENT)
-   public interface C_dbnueaxr {
+   public interface Loader {
       /**
        * @mapping {@literal hashed load Lnet/minecraft/unmapped/C_gxohhscv$C_dbnueaxr;load(Lnet/minecraft/unmapped/C_tmnrpasf;)Lnet/minecraft/unmapped/C_wywmjnuh;}
-       * @mapping {@literal named load Lnet/minecraft/client/font/FontTypeProvider$C_dbnueaxr;load(Lnet/minecraft/resource/ResourceManager;)Lcom/mojang/blaze3d/font/Font;}
+       * @mapping {@literal named load Lnet/minecraft/client/font/FontTypeProvider$Loader;load(Lnet/minecraft/resource/ResourceManager;)Lcom/mojang/blaze3d/font/Font;}
        */
       Font load(ResourceManager resourceManager) throws IOException;
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_gxohhscv$C_wxrtqmdn}
-    * @mapping {@literal named net/minecraft/client/font/FontTypeProvider$C_wxrtqmdn}
+    * @mapping {@literal named net/minecraft/client/font/FontTypeProvider$Reference}
     */
    @Environment(EnvType.CLIENT)
-   public static record C_wxrtqmdn(Identifier id) {
+   public static record Reference(Identifier id) {
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/font/GlyphAtlasTexture.java namedSrc/net/minecraft/client/font/GlyphAtlasTexture.java
--- namedTargetSrc/net/minecraft/client/font/GlyphAtlasTexture.java	2023-08-02 15:52:15.953786798 +0000
+++ namedSrc/net/minecraft/client/font/GlyphAtlasTexture.java	2023-08-02 15:50:15.042433807 +0000
@@ -24,9 +24,10 @@
     */
    private static final int ATLAS_SIZE = 256;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_opyzrrup Lnet/minecraft/unmapped/C_lqjqkabz;f_opyzrrup:Lnet/minecraft/unmapped/C_wrgwzztj;}
+    * @mapping {@literal named renderType Lnet/minecraft/client/font/GlyphAtlasTexture;renderType:Lnet/minecraft/client/font/FontRenderType;}
     */
-   private final FontRenderType f_opyzrrup;
+   private final FontRenderType renderType;
    /**
     * @mapping {@literal hashed f_uqptensq Lnet/minecraft/unmapped/C_lqjqkabz;f_uqptensq:Z}
     * @mapping {@literal named hasColor Lnet/minecraft/client/font/GlyphAtlasTexture;hasColor:Z}
@@ -42,11 +43,11 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_lqjqkabz;<init>(Lnet/minecraft/unmapped/C_wrgwzztj;Z)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/font/GlyphAtlasTexture;<init>(Lnet/minecraft/client/font/FontRenderType;Z)V}
     */
-   public GlyphAtlasTexture(FontRenderType arg, boolean hasColor) {
+   public GlyphAtlasTexture(FontRenderType renderType, boolean hasColor) {
       this.hasColor = hasColor;
       this.rootSlot = new GlyphAtlasTexture.Slot(0, 0, 256, 256);
       TextureUtil.prepareImage(hasColor ? NativeImage.GLFormat.ABGR : NativeImage.GLFormat.RED, this.getGlId(), 256, 256);
-      this.f_opyzrrup = arg;
+      this.renderType = renderType;
    }
 
    /**
@@ -81,7 +82,7 @@
             float g = 256.0F;
             float h = 0.01F;
             return new GlyphRenderer(
-               this.f_opyzrrup,
+               this.renderType,
                ((float)lv.x + 0.01F) / 256.0F,
                ((float)lv.x - 0.01F + (float)glyphInfo.getWidth()) / 256.0F,
                ((float)lv.y + 0.01F) / 256.0F,
diff -bur namedTargetSrc/net/minecraft/client/font/GlyphRenderer.java namedSrc/net/minecraft/client/font/GlyphRenderer.java
--- namedTargetSrc/net/minecraft/client/font/GlyphRenderer.java	2023-08-02 15:52:15.965787129 +0000
+++ namedSrc/net/minecraft/client/font/GlyphRenderer.java	2023-08-02 15:50:15.058434257 +0000
@@ -13,9 +13,10 @@
 @Environment(EnvType.CLIENT)
 public class GlyphRenderer {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_kagavzdk Lnet/minecraft/unmapped/C_wrqtxozz;f_kagavzdk:Lnet/minecraft/unmapped/C_wrgwzztj;}
+    * @mapping {@literal named renderType Lnet/minecraft/client/font/GlyphRenderer;renderType:Lnet/minecraft/client/font/FontRenderType;}
     */
-   private final FontRenderType f_kagavzdk;
+   private final FontRenderType renderType;
    /**
     * @mapping {@literal hashed f_pfnsubdx Lnet/minecraft/unmapped/C_wrqtxozz;f_pfnsubdx:F}
     * @mapping {@literal named minU Lnet/minecraft/client/font/GlyphRenderer;minU:F}
@@ -61,8 +62,8 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wrqtxozz;<init>(Lnet/minecraft/unmapped/C_wrgwzztj;FFFFFFFF)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/font/GlyphRenderer;<init>(Lnet/minecraft/client/font/FontRenderType;FFFFFFFF)V}
     */
-   public GlyphRenderer(FontRenderType arg, float minU, float maxU, float minV, float maxV, float minX, float maxX, float minY, float maxY) {
-      this.f_kagavzdk = arg;
+   public GlyphRenderer(FontRenderType renderType, float minU, float maxU, float minV, float maxV, float minX, float maxX, float minY, float maxY) {
+      this.renderType = renderType;
       this.minU = minU;
       this.maxU = maxU;
       this.minV = minV;
@@ -127,7 +128,7 @@
     * @mapping {@literal named getLayer Lnet/minecraft/client/font/GlyphRenderer;getLayer(Lnet/minecraft/client/font/TextRenderer$TextLayerType;)Lnet/minecraft/client/render/RenderLayer;}
     */
    public RenderLayer getLayer(TextRenderer.TextLayerType layerType) {
-      return this.f_kagavzdk.m_zagycsep(layerType);
+      return this.renderType.getLayer(layerType);
    }
 
    /**
Only in namedSrc/net/minecraft/client/font: UnihexFont.java
diff -bur namedTargetSrc/net/minecraft/client/gui/ChatReportCategory.java namedSrc/net/minecraft/client/gui/ChatReportCategory.java
--- namedTargetSrc/net/minecraft/client/gui/ChatReportCategory.java	2023-08-02 15:52:16.069790002 +0000
+++ namedSrc/net/minecraft/client/gui/ChatReportCategory.java	2023-08-02 15:50:15.190437971 +0000
@@ -74,11 +74,12 @@
    private final Text description;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_bwnamvmh;<init>(Ljava/lang/String;ILjava/lang/String;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/gui/ChatReportCategory;<init>(Ljava/lang/String;ILjava/lang/String;)V}
     */
-   private ChatReportCategory(String string2) {
-      this.internalName = string2.toUpperCase(Locale.ROOT);
-      String string3 = "gui.abuseReport.reason." + string2;
+   private ChatReportCategory(String name) {
+      this.internalName = name.toUpperCase(Locale.ROOT);
+      String string3 = "gui.abuseReport.reason." + name;
       this.name = Text.translatable(string3);
       this.description = Text.translatable(string3 + ".description");
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/ChatSelectionLogFiller.java namedSrc/net/minecraft/client/gui/screen/multiplayer/ChatSelectionLogFiller.java
--- namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/ChatSelectionLogFiller.java	2023-08-02 15:52:16.081790334 +0000
+++ namedSrc/net/minecraft/client/gui/screen/multiplayer/ChatSelectionLogFiller.java	2023-08-02 15:50:15.202438308 +0000
@@ -109,7 +109,7 @@
       SignedChatMessage lv = chat.message();
       boolean bl = this.contextBuilder.m_sdlfjkyw(lv);
       if (this.canReportMessage.test(chat)) {
-         this.contextBuilder.m_iyzjgeih(lv);
+         this.contextBuilder.addMessage(lv);
          if (this.previousLink != null && !this.previousLink.linksTo(lv.link())) {
             consumer.acceptDivider(Text.translatable("gui.chatSelection.join", chat.profile().getName()).formatted(Formatting.YELLOW));
          }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java	2023-08-02 15:52:15.989787792 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java	2023-08-02 15:50:15.086435045 +0000
@@ -202,7 +202,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java	2023-08-02 15:52:16.093790665 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java	2023-08-02 15:50:15.214438646 +0000
@@ -616,7 +616,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/Screen.java namedSrc/net/minecraft/client/gui/screen/Screen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/Screen.java	2023-08-02 15:52:15.937786356 +0000
+++ namedSrc/net/minecraft/client/gui/screen/Screen.java	2023-08-02 15:50:15.022433245 +0000
@@ -727,7 +727,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return true;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-08-02 15:52:16.085790444 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-08-02 15:50:15.210438533 +0000
@@ -406,13 +406,13 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return this.active
          && this.visible
-         && d >= (double)this.getX()
-         && e >= (double)this.getY()
-         && d < (double)(this.getX() + this.width)
-         && e < (double)(this.getY() + this.height);
+         && mouseX >= (double)this.getX()
+         && mouseY >= (double)this.getY()
+         && mouseX < (double)(this.getX() + this.width)
+         && mouseY < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/EntryListWidget.java	2023-08-02 15:52:15.925786024 +0000
+++ namedSrc/net/minecraft/client/gui/widget/EntryListWidget.java	2023-08-02 15:50:15.006432795 +0000
@@ -683,8 +683,8 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
-      return e >= (double)this.top && e <= (double)this.bottom && d >= (double)this.left && d <= (double)this.right;
+   public boolean isMouseOver(double mouseX, double mouseY) {
+      return mouseY >= (double)this.top && mouseY <= (double)this.bottom && mouseX >= (double)this.left && mouseX <= (double)this.right;
    }
 
    /**
@@ -957,8 +957,8 @@
        * @mapping {@literal named isMouseOver Lnet/minecraft/client/gui/widget/EntryListWidget$Entry;isMouseOver(DD)Z}
        */
       @Override
-      public boolean isMouseOver(double d, double e) {
-         return Objects.equals(this.parentList.getEntryAtPosition(d, e), this);
+      public boolean isMouseOver(double mouseX, double mouseY) {
+         return Objects.equals(this.parentList.getEntryAtPosition(mouseX, mouseY), this);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TelemetryEventWidget.java namedSrc/net/minecraft/client/gui/widget/TelemetryEventWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TelemetryEventWidget.java	2023-08-02 15:52:15.897785250 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TelemetryEventWidget.java	2023-08-02 15:50:14.970431782 +0000
@@ -148,7 +148,7 @@
       int l = this.getX() + this.getInnerPadding();
       graphics.getMatrices().push();
       graphics.getMatrices().translate((double)l, (double)k, 0.0);
-      this.content.container().visitWidgets(arg2 -> arg2.render(graphics, mouseX, mouseY, delta));
+      this.content.container().visitWidgets(widget -> widget.render(graphics, mouseX, mouseY, delta));
       graphics.getMatrices().pop();
    }

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (2/2): 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2023-08-02 15:52:15.941786466 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2023-08-02 15:50:15.022433245 +0000
@@ -749,12 +749,12 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return this.visible
-         && d >= (double)this.getX()
-         && d < (double)(this.getX() + this.width)
-         && e >= (double)this.getY()
-         && e < (double)(this.getY() + this.height);
+         && mouseX >= (double)this.getX()
+         && mouseX < (double)(this.getX() + this.width)
+         && mouseY >= (double)this.getY()
+         && mouseY < (double)(this.getY() + this.height);
    }
 
    /**
Only in namedSrc/net/minecraft/client/multiplayer: prediction
diff -bur namedTargetSrc/net/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder.java namedSrc/net/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder.java
--- namedTargetSrc/net/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder.java	2023-08-02 15:52:16.125791549 +0000
+++ namedSrc/net/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder.java	2023-08-02 15:50:15.254439771 +0000
@@ -23,34 +23,38 @@
 @Environment(EnvType.CLIENT)
 public class ChatReportContextBuilder {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_sqinfokw Lnet/minecraft/unmapped/C_gjlwtzxp;f_sqinfokw:I}
+    * @mapping {@literal named maxMessageCount Lnet/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder;maxMessageCount:I}
     */
-   final int f_sqinfokw;
+   final int maxMessageCount;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ghtmstuu Lnet/minecraft/unmapped/C_gjlwtzxp;f_ghtmstuu:Ljava/util/List;}
+    * @mapping {@literal named messages Lnet/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder;messages:Ljava/util/List;}
     */
-   private final List<ChatReportContextBuilder.C_eoehvdaj> f_ghtmstuu = new ArrayList();
+   private final List<ChatReportContextBuilder.C_eoehvdaj> messages = new ArrayList();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_gjlwtzxp;<init>(I)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder;<init>(I)V}
     */
-   public ChatReportContextBuilder(int i) {
-      this.f_sqinfokw = i;
+   public ChatReportContextBuilder(int maxMessageCount) {
+      this.maxMessageCount = maxMessageCount;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pkgfbzzz Lnet/minecraft/unmapped/C_gjlwtzxp;m_pkgfbzzz(Lnet/minecraft/unmapped/C_udbfbmhx;Lit/unimi/dsi/fastutil/ints/IntCollection;Lnet/minecraft/unmapped/C_gjlwtzxp$C_zzhlgzgg;)V}
+    * @mapping {@literal named m_pkgfbzzz Lnet/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder;m_pkgfbzzz(Lnet/minecraft/client/multiplayer/chat/ChatLog;Lit/unimi/dsi/fastutil/ints/IntCollection;Lnet/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder$C_zzhlgzgg;)V}
     */
-   public void m_pkgfbzzz(ChatLog arg, IntCollection intCollection, ChatReportContextBuilder.C_zzhlgzgg arg2) {
+   public void m_pkgfbzzz(ChatLog log, IntCollection intCollection, ChatReportContextBuilder.C_zzhlgzgg arg2) {
       IntSortedSet intSortedSet = new IntRBTreeSet(intCollection);
 
-      for (int i = intSortedSet.lastInt(); i >= arg.getStartId() && (this.m_utuackmj() || !intSortedSet.isEmpty()); --i) {
-         LoggedChatEvent bl = arg.get(i);
+      for (int i = intSortedSet.lastInt(); i >= log.getStartId() && (this.hasMessages() || !intSortedSet.isEmpty()); --i) {
+         LoggedChatEvent bl = log.get(i);
          if (bl instanceof LoggedChatMessage.Chat) {
             LoggedChatMessage.Chat lv = (LoggedChatMessage.Chat)bl;
             boolean blx = this.m_sdlfjkyw(lv.message());
             if (intSortedSet.remove(i)) {
-               this.m_iyzjgeih(lv.message());
+               this.addMessage(lv.message());
                arg2.accept(i, lv);
             } else if (blx) {
                arg2.accept(i, lv);
@@ -60,22 +64,24 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_iyzjgeih Lnet/minecraft/unmapped/C_gjlwtzxp;m_iyzjgeih(Lnet/minecraft/unmapped/C_zzdolisx;)V}
+    * @mapping {@literal named addMessage Lnet/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder;addMessage(Lnet/minecraft/network/message/SignedChatMessage;)V}
     */
-   public void m_iyzjgeih(SignedChatMessage arg) {
-      this.f_ghtmstuu.add(new ChatReportContextBuilder.C_eoehvdaj(arg));
+   public void addMessage(SignedChatMessage message) {
+      this.messages.add(new ChatReportContextBuilder.C_eoehvdaj(message));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_sdlfjkyw Lnet/minecraft/unmapped/C_gjlwtzxp;m_sdlfjkyw(Lnet/minecraft/unmapped/C_zzdolisx;)Z}
+    * @mapping {@literal named m_sdlfjkyw Lnet/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder;m_sdlfjkyw(Lnet/minecraft/network/message/SignedChatMessage;)Z}
     */
-   public boolean m_sdlfjkyw(SignedChatMessage arg) {
+   public boolean m_sdlfjkyw(SignedChatMessage message) {
       boolean bl = false;
-      Iterator<ChatReportContextBuilder.C_eoehvdaj> iterator = this.f_ghtmstuu.iterator();
+      Iterator<ChatReportContextBuilder.C_eoehvdaj> iterator = this.messages.iterator();
 
       while (iterator.hasNext()) {
          ChatReportContextBuilder.C_eoehvdaj lv = (ChatReportContextBuilder.C_eoehvdaj)iterator.next();
-         if (lv.m_jcuhlads(arg)) {
+         if (lv.m_jcuhlads(message)) {
             bl = true;
             if (lv.m_kzavofuj()) {
                iterator.remove();
@@ -87,10 +93,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_utuackmj Lnet/minecraft/unmapped/C_gjlwtzxp;m_utuackmj()Z}
+    * @mapping {@literal named hasMessages Lnet/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder;hasMessages()Z}
     */
-   public boolean m_utuackmj() {
-      return !this.f_ghtmstuu.isEmpty();
+   public boolean hasMessages() {
+      return !this.messages.isEmpty();
    }
 
    /**
@@ -100,13 +107,15 @@
    @Environment(EnvType.CLIENT)
    class C_eoehvdaj {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_qjvjlltw Lnet/minecraft/unmapped/C_gjlwtzxp$C_eoehvdaj;f_qjvjlltw:Ljava/util/Set;}
+       * @mapping {@literal named signatures Lnet/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder$C_eoehvdaj;signatures:Ljava/util/Set;}
        */
-      private final Set<MessageSignature> f_qjvjlltw;
+      private final Set<MessageSignature> signatures;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_nqwhztea Lnet/minecraft/unmapped/C_gjlwtzxp$C_eoehvdaj;f_nqwhztea:Lnet/minecraft/unmapped/C_zzdolisx;}
+       * @mapping {@literal named message Lnet/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder$C_eoehvdaj;message:Lnet/minecraft/network/message/SignedChatMessage;}
        */
-      private SignedChatMessage f_nqwhztea;
+      private SignedChatMessage message;
       /**
        * Mapping not found
        */
@@ -117,25 +126,27 @@
       private int f_erptkqvo;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_gjlwtzxp$C_eoehvdaj;<init>(Lnet/minecraft/unmapped/C_gjlwtzxp;Lnet/minecraft/unmapped/C_zzdolisx;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder$C_eoehvdaj;<init>(Lnet/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder;Lnet/minecraft/network/message/SignedChatMessage;)V}
        */
-      C_eoehvdaj(SignedChatMessage arg2) {
-         this.f_qjvjlltw = new ObjectOpenHashSet<>(arg2.body().lastSeen().entries());
-         this.f_nqwhztea = arg2;
+      C_eoehvdaj(SignedChatMessage message) {
+         this.signatures = new ObjectOpenHashSet<>(message.body().lastSeen().entries());
+         this.message = message;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_jcuhlads Lnet/minecraft/unmapped/C_gjlwtzxp$C_eoehvdaj;m_jcuhlads(Lnet/minecraft/unmapped/C_zzdolisx;)Z}
+       * @mapping {@literal named m_jcuhlads Lnet/minecraft/client/multiplayer/report/chat/ChatReportContextBuilder$C_eoehvdaj;m_jcuhlads(Lnet/minecraft/network/message/SignedChatMessage;)Z}
        */
-      boolean m_jcuhlads(SignedChatMessage arg) {
-         if (arg.equals(this.f_nqwhztea)) {
+      boolean m_jcuhlads(SignedChatMessage message) {
+         if (message.equals(this.message)) {
             return false;
          } else {
-            boolean bl = this.f_qjvjlltw.remove(arg.signature());
-            if (this.f_iiaydllt && this.f_nqwhztea.getSender().equals(arg.getSender())) {
-               if (this.f_nqwhztea.link().linksTo(arg.link())) {
+            boolean bl = this.signatures.remove(message.signature());
+            if (this.f_iiaydllt && this.message.getSender().equals(message.getSender())) {
+               if (this.message.link().linksTo(message.link())) {
                   bl = true;
-                  this.f_nqwhztea = arg;
+                  this.message = message;
                } else {
                   this.f_iiaydllt = false;
                }
@@ -153,7 +164,7 @@
        * Mapping not found
        */
       boolean m_kzavofuj() {
-         return this.f_erptkqvo >= ChatReportContextBuilder.this.f_sqinfokw || !this.f_iiaydllt && this.f_qjvjlltw.isEmpty();
+         return this.f_erptkqvo >= ChatReportContextBuilder.this.maxMessageCount || !this.f_iiaydllt && this.signatures.isEmpty();
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/network/ClientAdvancementManager.java namedSrc/net/minecraft/client/network/ClientAdvancementManager.java
--- namedTargetSrc/net/minecraft/client/network/ClientAdvancementManager.java	2023-08-02 15:52:15.933786245 +0000
+++ namedSrc/net/minecraft/client/network/ClientAdvancementManager.java	2023-08-02 15:50:15.018433132 +0000
@@ -35,9 +35,10 @@
     */
    private final MinecraftClient client;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_rxbgyhjm Lnet/minecraft/unmapped/C_wojlspxv;f_rxbgyhjm:Lnet/minecraft/unmapped/C_bfepxqwf;}
+    * @mapping {@literal named telemetryManager Lnet/minecraft/client/network/ClientAdvancementManager;telemetryManager:Lnet/minecraft/client/util/telemetry/WorldTelemetryManager;}
     */
-   private final WorldTelemetryManager f_rxbgyhjm;
+   private final WorldTelemetryManager telemetryManager;
    /**
     * @mapping {@literal hashed f_ogcldubj Lnet/minecraft/unmapped/C_wojlspxv;f_ogcldubj:Lnet/minecraft/unmapped/C_zidtcriy;}
     * @mapping {@literal named manager Lnet/minecraft/client/network/ClientAdvancementManager;manager:Lnet/minecraft/advancement/AdvancementManager;}
@@ -65,9 +66,9 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wojlspxv;<init>(Lnet/minecraft/unmapped/C_ayfeobid;Lnet/minecraft/unmapped/C_bfepxqwf;)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/network/ClientAdvancementManager;<init>(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/util/telemetry/WorldTelemetryManager;)V}
     */
-   public ClientAdvancementManager(MinecraftClient client, WorldTelemetryManager arg2) {
+   public ClientAdvancementManager(MinecraftClient client, WorldTelemetryManager telemetryManager) {
       this.client = client;
-      this.f_rxbgyhjm = arg2;
+      this.telemetryManager = telemetryManager;
    }
 
    /**
@@ -95,7 +96,7 @@
 
             if (!packet.shouldClearCurrent() && lv2.isDone()) {
                if (this.client.world != null) {
-                  this.f_rxbgyhjm.m_ksbcmwmh(this.client.world, lv);
+                  this.telemetryManager.m_ksbcmwmh(this.client.world, lv);
                }
 
                if (lv.getDisplay() != null && lv.getDisplay().shouldShowToast()) {
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java namedSrc/net/minecraft/client/network/ClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java	2023-08-02 15:52:16.025788787 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerEntity.java	2023-08-02 15:50:15.134436395 +0000
@@ -1534,10 +1534,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_syghdsvg Lnet/minecraft/unmapped/C_jlopmfei;m_syghdsvg(Lnet/minecraft/unmapped/C_lghcpyvl;)V}
+    * @mapping {@literal named onGameModeChanged Lnet/minecraft/client/network/ClientPlayerEntity;onGameModeChanged(Lnet/minecraft/world/GameMode;)V}
     */
-   public void m_syghdsvg(GameMode arg) {
-      if (arg == GameMode.SPECTATOR) {
+   public void onGameModeChanged(GameMode gameMode) {
+      if (gameMode == GameMode.SPECTATOR) {
          this.setVelocity(this.getVelocity().withAxis(Direction.Axis.Y, 0.0));
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2023-08-02 15:52:15.905785471 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerInteractionManager.java	2023-08-02 15:50:14.982432119 +0000
@@ -11,6 +11,7 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.OperatorBlock;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.multiplayer.prediction.PredictiveAction;
 import net.minecraft.client.recipe_book.ClientRecipeBook;
 import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.client.sound.SoundInstance;
@@ -42,7 +43,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.stat.StatHandler;
 import net.minecraft.unmapped.C_czisrdmd;
-import net.minecraft.unmapped.C_suesdakf;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
@@ -220,9 +220,9 @@
          if (this.gameMode.isCreative()) {
             BlockState lv = this.client.world.getBlockState(pos);
             this.client.getTutorialManager().onBlockBreaking(this.client.world, pos, lv, 1.0F);
-            this.m_vvsqjptk(this.client.world, i -> {
+            this.startPrediction(this.client.world, sequence -> {
                this.breakBlock(pos);
-               return new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, pos, direction, i);
+               return new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, pos, direction, sequence);
             });
             this.blockBreakingCooldown = 5;
          } else if (!this.breakingBlock || !this.isCurrentlyBreaking(pos)) {
@@ -232,7 +232,7 @@
 
             BlockState lv2 = this.client.world.getBlockState(pos);
             this.client.getTutorialManager().onBlockBreaking(this.client.world, pos, lv2, 0.0F);
-            this.m_vvsqjptk(this.client.world, i -> {
+            this.startPrediction(this.client.world, sequence -> {
                boolean bl = !lv2.isAir();
                if (bl && this.currentBreakingProgress == 0.0F) {
                   lv2.onBlockBreakStart(this.client.world, pos, this.client.player);
@@ -246,10 +246,10 @@
                   this.selectedStack = this.client.player.getMainHandStack();
                   this.currentBreakingProgress = 0.0F;
                   this.blockBreakingSoundCooldown = 0.0F;
-                  this.client.world.setBlockBreakingInfo(this.client.player.getId(), this.currentBreakingPos, this.m_uwzjaxdx());
+                  this.client.world.setBlockBreakingInfo(this.client.player.getId(), this.currentBreakingPos, this.getBlockBreakingProgress());
                }
 
-               return new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, pos, direction, i);
+               return new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, pos, direction, sequence);
             });
          }
 
@@ -286,9 +286,9 @@
          this.blockBreakingCooldown = 5;
          BlockState lv = this.client.world.getBlockState(pos);
          this.client.getTutorialManager().onBlockBreaking(this.client.world, pos, lv, 1.0F);
-         this.m_vvsqjptk(this.client.world, i -> {
+         this.startPrediction(this.client.world, sequence -> {
             this.breakBlock(pos);
-            return new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, pos, direction, i);
+            return new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, pos, direction, sequence);
          });
          return true;
       } else if (this.isCurrentlyBreaking(pos)) {
@@ -313,16 +313,16 @@
             this.client.getTutorialManager().onBlockBreaking(this.client.world, pos, lv2, MathHelper.clamp(this.currentBreakingProgress, 0.0F, 1.0F));
             if (this.currentBreakingProgress >= 1.0F) {
                this.breakingBlock = false;
-               this.m_vvsqjptk(this.client.world, i -> {
+               this.startPrediction(this.client.world, sequence -> {
                   this.breakBlock(pos);
-                  return new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, pos, direction, i);
+                  return new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, pos, direction, sequence);
                });
                this.currentBreakingProgress = 0.0F;
                this.blockBreakingSoundCooldown = 0.0F;
                this.blockBreakingCooldown = 5;
             }
 
-            this.client.world.setBlockBreakingInfo(this.client.player.getId(), this.currentBreakingPos, this.m_uwzjaxdx());
+            this.client.world.setBlockBreakingInfo(this.client.player.getId(), this.currentBreakingPos, this.getBlockBreakingProgress());
             return true;
          }
       } else {
@@ -332,12 +332,12 @@
 
    /**
     * @mapping {@literal hashed m_vvsqjptk Lnet/minecraft/unmapped/C_uxbydbcj;m_vvsqjptk(Lnet/minecraft/unmapped/C_ghdnlrrw;Lnet/minecraft/unmapped/C_suesdakf;)V}
-    * @mapping {@literal named m_vvsqjptk Lnet/minecraft/client/network/ClientPlayerInteractionManager;m_vvsqjptk(Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/unmapped/C_suesdakf;)V}
+    * @mapping {@literal named startPrediction Lnet/minecraft/client/network/ClientPlayerInteractionManager;startPrediction(Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/client/multiplayer/prediction/PredictiveAction;)V}
     */
-   private void m_vvsqjptk(ClientWorld world, C_suesdakf arg2) {
+   private void startPrediction(ClientWorld world, PredictiveAction action) {
       try (C_czisrdmd lv = world.m_lvsrwztn().m_rhbdpkkw()) {
          int i = lv.m_gqtwgmpw();
-         Packet<ServerPlayPacketListener> lv2 = arg2.predict(i);
+         Packet<ServerPlayPacketListener> lv2 = action.predict(i);
          this.networkHandler.sendPacket(lv2);
       }
    }
@@ -394,8 +394,8 @@
          return ActionResult.FAIL;
       } else {
          MutableObject<ActionResult> mutableObject = new MutableObject<>();
-         this.m_vvsqjptk(this.client.world, i -> {
-            mutableObject.setValue(this.m_wiqrsdhj(player, hand, hitResult));
+         this.startPrediction(this.client.world, i -> {
+            mutableObject.setValue(this.doInteractBlock(player, hand, hitResult));
             return new PlayerInteractionWithBlockC2SPacket(hand, hitResult, i);
          });
          return mutableObject.getValue();
@@ -403,30 +403,31 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wiqrsdhj Lnet/minecraft/unmapped/C_uxbydbcj;m_wiqrsdhj(Lnet/minecraft/unmapped/C_jlopmfei;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_jdakttms;)Lnet/minecraft/unmapped/C_ozuepbyj;}
+    * @mapping {@literal named doInteractBlock Lnet/minecraft/client/network/ClientPlayerInteractionManager;doInteractBlock(Lnet/minecraft/client/network/ClientPlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/util/hit/BlockHitResult;)Lnet/minecraft/util/ActionResult;}
     */
-   private ActionResult m_wiqrsdhj(ClientPlayerEntity arg, Hand arg2, BlockHitResult arg3) {
-      BlockPos lv = arg3.getBlockPos();
-      ItemStack lv2 = arg.getStackInHand(arg2);
+   private ActionResult doInteractBlock(ClientPlayerEntity player, Hand hand, BlockHitResult hitResult) {
+      BlockPos lv = hitResult.getBlockPos();
+      ItemStack lv2 = player.getStackInHand(hand);
       if (this.gameMode == GameMode.SPECTATOR) {
          return ActionResult.SUCCESS;
       } else {
-         boolean bl = !arg.getMainHandStack().isEmpty() || !arg.getOffHandStack().isEmpty();
-         boolean bl2 = arg.shouldCancelInteraction() && bl;
+         boolean bl = !player.getMainHandStack().isEmpty() || !player.getOffHandStack().isEmpty();
+         boolean bl2 = player.shouldCancelInteraction() && bl;
          if (!bl2) {
             BlockState lv3 = this.client.world.getBlockState(lv);
             if (!this.networkHandler.isEnabled(lv3.getBlock().getRequiredFlags())) {
                return ActionResult.FAIL;
             }
 
-            ActionResult lv4 = lv3.onUse(this.client.world, arg, arg2, arg3);
+            ActionResult lv4 = lv3.onUse(this.client.world, player, hand, hitResult);
             if (lv4.isAccepted()) {
                return lv4;
             }
          }
 
-         if (!lv2.isEmpty() && !arg.getItemCooldownManager().isCoolingDown(lv2.getItem())) {
-            ItemUsageContext lv5 = new ItemUsageContext(arg, arg2, arg3);
+         if (!lv2.isEmpty() && !player.getItemCooldownManager().isCoolingDown(lv2.getItem())) {
+            ItemUsageContext lv5 = new ItemUsageContext(player, hand, hitResult);
             ActionResult lv6;
             if (this.gameMode.isCreative()) {
                int i = lv2.getCount();
@@ -455,7 +456,7 @@
          this.networkHandler
             .sendPacket(new PlayerMoveC2SPacket.Full(player.getX(), player.getY(), player.getZ(), player.getYaw(), player.getPitch(), player.isOnGround()));
          MutableObject<ActionResult> mutableObject = new MutableObject<>();
-         this.m_vvsqjptk(this.client.world, i -> {
+         this.startPrediction(this.client.world, i -> {
             PlayerInteractionWithItemC2SPacket lv = new PlayerInteractionWithItemC2SPacket(hand, i);
             ItemStack lv2 = player.getStackInHand(hand);
             if (player.getItemCooldownManager().isCoolingDown(lv2.getItem())) {
@@ -681,9 +682,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_uwzjaxdx Lnet/minecraft/unmapped/C_uxbydbcj;m_uwzjaxdx()I}
+    * @mapping {@literal named getBlockBreakingProgress Lnet/minecraft/client/network/ClientPlayerInteractionManager;getBlockBreakingProgress()I}
     */
-   public int m_uwzjaxdx() {
+   public int getBlockBreakingProgress() {
       return this.currentBreakingProgress > 0.0F ? (int)(this.currentBreakingProgress * 10.0F) : -1;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2023-08-02 15:52:16.105790997 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2023-08-02 15:50:15.230439096 +0000
@@ -84,7 +84,7 @@
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.command.CommandBuildContext;
 import net.minecraft.command.CommandSource;
-import net.minecraft.command.SignedArgument;
+import net.minecraft.command.SignedCommand;
 import net.minecraft.command.argument.ArgumentSignatures;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
@@ -964,14 +964,15 @@
       int j = packet.getZ();
       ClientChunkManager lv = this.world.getChunkManager();
       lv.unload(i, j);
-      this.m_usqvsdvf(packet);
+      this.queueLightUnload(packet);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_usqvsdvf Lnet/minecraft/unmapped/C_nuofrxvi;m_usqvsdvf(Lnet/minecraft/unmapped/C_xrpvpfht;)V}
+    * @mapping {@literal named queueLightUnload Lnet/minecraft/client/network/ClientPlayNetworkHandler;queueLightUnload(Lnet/minecraft/network/packet/s2c/play/ChunkUnloadS2CPacket;)V}
     */
-   private void m_usqvsdvf(ChunkUnloadS2CPacket arg) {
-      ChunkPos lv = new ChunkPos(arg.getX(), arg.getZ());
+   private void queueLightUnload(ChunkUnloadS2CPacket unloadPacket) {
+      ChunkPos lv = new ChunkPos(unloadPacket.getX(), unloadPacket.getZ());
       this.world.queueLightUpdate(() -> {
          LightingProvider lvx = this.world.getLightingProvider();
          lvx.setLightEnabled(lv, false);
@@ -1857,7 +1858,7 @@
             }
       }
 
-      lv.getOrderedResults().forEach(arg2 -> arg2.initialize(lv));
+      lv.getOrderedResults().forEach(resultCollection -> resultCollection.initialize(lv));
       if (this.client.currentScreen instanceof RecipeBookProvider) {
          ((RecipeBookProvider)this.client.currentScreen).refreshRecipeBook();
       }
@@ -2196,7 +2197,7 @@
             if (playerListEntry.getGameMode() != playerEntry.gameMode()
                && this.client.player != null
                && this.client.player.getUuid().equals(playerEntry.profileId())) {
-               this.client.player.m_syghdsvg(playerEntry.gameMode());
+               this.client.player.onGameModeChanged(playerEntry.gameMode());
             }
 
             playerListEntry.setGameMode(playerEntry.gameMode());
@@ -3006,11 +3007,11 @@
     * @mapping {@literal hashed m_oyjilzsc Lnet/minecraft/unmapped/C_nuofrxvi;m_oyjilzsc(IILnet/minecraft/unmapped/C_ksposksb;Lnet/minecraft/unmapped/C_fhvlmqtw;Ljava/util/BitSet;Ljava/util/BitSet;Ljava/util/Iterator;)V}
     * @mapping {@literal named updateLighting Lnet/minecraft/client/network/ClientPlayNetworkHandler;updateLighting(IILnet/minecraft/world/chunk/light/LightingProvider;Lnet/minecraft/world/LightType;Ljava/util/BitSet;Ljava/util/BitSet;Ljava/util/Iterator;)V}
     */
-   private void updateLighting(int chunkX, int chunkZ, LightingProvider provider, LightType type, BitSet bitSet, BitSet bitSet2, Iterator<byte[]> nibbles) {
+   private void updateLighting(int chunkX, int chunkZ, LightingProvider provider, LightType type, BitSet mask, BitSet emptyMask, Iterator<byte[]> nibbles) {
       for (int k = 0; k < provider.getHeight(); ++k) {
          int l = provider.getBottomY() + k;
-         boolean bl = bitSet.get(k);
-         boolean bl2 = bitSet2.get(k);
+         boolean bl = mask.get(k);
+         boolean bl2 = emptyMask.get(k);
          if (bl || bl2) {
             provider.enqueueSectionData(
                type, ChunkSectionPos.from(chunkX, l, chunkZ), bl ? new ChunkNibbleArray((byte[])((byte[])nibbles.next()).clone()) : new ChunkNibbleArray()
@@ -3190,7 +3191,7 @@
       Instant instant = Instant.now();
       long l = NetworkEncryptionUtils.SaltSupplier.nextLong();
       LastSeenMessageTracker.Update lv = this.lastSeenMessageTracker.update();
-      ArgumentSignatures lv2 = ArgumentSignatures.m_hdioayeu(SignedArgument.m_lxppwkze(this.parse(command)), string -> {
+      ArgumentSignatures lv2 = ArgumentSignatures.sign(SignedCommand.of(this.parse(command)), string -> {
          MessageBody lvx = new MessageBody(string, instant, l, lv.lastSeen());
          return this.messageChainPacker.pack(lvx);
       });
@@ -3202,7 +3203,7 @@
     * @mapping {@literal named sendCommand Lnet/minecraft/client/network/ClientPlayNetworkHandler;sendCommand(Ljava/lang/String;)Z}
     */
    public boolean sendCommand(String command) {
-      if (SignedArgument.m_lxppwkze(this.parse(command)).arguments().isEmpty()) {
+      if (SignedCommand.of(this.parse(command)).arguments().isEmpty()) {
          LastSeenMessageTracker.Update lv = this.lastSeenMessageTracker.update();
          this.sendPacket(new ChatCommandC2SPacket(command, Instant.now(), 0L, ArgumentSignatures.EMPTY, lv.acknowledgment()));
          return true;
@@ -3227,7 +3228,7 @@
       if (this.connection.isEncrypted()) {
          PlayerKeyPairManager lv = this.client.getPlayerKeyPairManager();
          if (lv.isExpired()) {
-            lv.fetchKeyPair().thenAcceptAsync(optional -> optional.ifPresent(this::setKeyPair), this.client);
+            lv.fetchKeyPair().thenAcceptAsync(keyPair -> keyPair.ifPresent(this::setKeyPair), this.client);
          }
       }
 
diff -bur namedTargetSrc/net/minecraft/client/toast/AdvancementToast.java namedSrc/net/minecraft/client/toast/AdvancementToast.java
--- namedTargetSrc/net/minecraft/client/toast/AdvancementToast.java	2023-08-02 15:52:15.925786024 +0000
+++ namedSrc/net/minecraft/client/toast/AdvancementToast.java	2023-08-02 15:50:15.006432795 +0000
@@ -79,7 +79,7 @@
          }
 
          graphics.drawItemWithoutEntity(lv.getIcon(), 8, 8);
-         return (double)startTime >= 5000.0 * manager.m_lsmszfie() ? Toast.Visibility.HIDE : Toast.Visibility.SHOW;
+         return (double)startTime >= 5000.0 * manager.getNotificationDisplayTime() ? Toast.Visibility.HIDE : Toast.Visibility.SHOW;
       } else {
          return Toast.Visibility.HIDE;
       }
diff -bur namedTargetSrc/net/minecraft/client/toast/RecipeToast.java namedSrc/net/minecraft/client/toast/RecipeToast.java
--- namedTargetSrc/net/minecraft/client/toast/RecipeToast.java	2023-08-02 15:52:16.029788897 +0000
+++ namedSrc/net/minecraft/client/toast/RecipeToast.java	2023-08-02 15:50:15.138436508 +0000
@@ -71,14 +71,18 @@
          graphics.drawText(manager.getGame().textRenderer, TITLE, 30, 7, -11534256, false);
          graphics.drawText(manager.getGame().textRenderer, DESCRIPTION, 30, 18, -16777216, false);
          Recipe<?> lv = (Recipe)this.recipes
-            .get((int)((double)startTime / Math.max(1.0, 5000.0 * manager.m_lsmszfie() / (double)this.recipes.size()) % (double)this.recipes.size()));
+            .get(
+               (int)(
+                  (double)startTime / Math.max(1.0, 5000.0 * manager.getNotificationDisplayTime() / (double)this.recipes.size()) % (double)this.recipes.size()
+               )
+            );
          ItemStack lv2 = lv.createIcon();
          graphics.getMatrices().push();
          graphics.getMatrices().scale(0.6F, 0.6F, 1.0F);
          graphics.drawItemWithoutEntity(lv2, 3, 3);
          graphics.getMatrices().pop();
          graphics.drawItemWithoutEntity(lv.getResult(manager.getGame().world.getRegistryManager()), 8, 8);
-         return (double)(startTime - this.startTime) >= 5000.0 * manager.m_lsmszfie() ? Toast.Visibility.HIDE : Toast.Visibility.SHOW;
+         return (double)(startTime - this.startTime) >= 5000.0 * manager.getNotificationDisplayTime() ? Toast.Visibility.HIDE : Toast.Visibility.SHOW;
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/toast/SystemToast.java namedSrc/net/minecraft/client/toast/SystemToast.java
--- namedTargetSrc/net/minecraft/client/toast/SystemToast.java	2023-08-02 15:52:16.045789339 +0000
+++ namedSrc/net/minecraft/client/toast/SystemToast.java	2023-08-02 15:50:15.158437070 +0000
@@ -163,7 +163,9 @@
          }
       }
 
-      return (double)(startTime - this.startTime) < (double)this.type.f_frgowpuy * manager.m_lsmszfie() ? Toast.Visibility.SHOW : Toast.Visibility.HIDE;
+      return (double)(startTime - this.startTime) < (double)this.type.f_frgowpuy * manager.getNotificationDisplayTime()
+         ? Toast.Visibility.SHOW
+         : Toast.Visibility.HIDE;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/toast/ToastManager.java namedSrc/net/minecraft/client/toast/ToastManager.java
--- namedTargetSrc/net/minecraft/client/toast/ToastManager.java	2023-08-02 15:52:16.041789229 +0000
+++ namedSrc/net/minecraft/client/toast/ToastManager.java	2023-08-02 15:50:15.150436845 +0000
@@ -160,9 +160,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lsmszfie Lnet/minecraft/unmapped/C_eqfjupcc;m_lsmszfie()D}
+    * @mapping {@literal named getNotificationDisplayTime Lnet/minecraft/client/toast/ToastManager;getNotificationDisplayTime()D}
     */
-   public double m_lsmszfie() {
+   public double getNotificationDisplayTime() {
       return this.client.options.getNotificationDisplayTime().get();
    }
 
diff -bur namedTargetSrc/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.java namedSrc/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.java
--- namedTargetSrc/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.java	2023-08-02 15:52:16.033789008 +0000
+++ namedSrc/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.java	2023-08-02 15:50:15.142436620 +0000
@@ -114,8 +114,8 @@
     * @mapping {@literal hashed m_xripjpyk Lnet/minecraft/unmapped/C_rvbosdmf;m_xripjpyk(Lnet/minecraft/unmapped/C_jlopmfei;Lnet/minecraft/unmapped/C_ednuhnnn;)Z}
     * @mapping {@literal named hasCrafted Lnet/minecraft/client/tutorial/CraftPlanksTutorialStepHandler;hasCrafted(Lnet/minecraft/client/network/ClientPlayerEntity;Lnet/minecraft/registry/tag/TagKey;)Z}
     */
-   public static boolean hasCrafted(ClientPlayerEntity player, TagKey<Item> arg2) {
-      for (Holder<Item> lv : Registries.ITEM.getTagOrEmpty(arg2)) {
+   public static boolean hasCrafted(ClientPlayerEntity player, TagKey<Item> tag) {
+      for (Holder<Item> lv : Registries.ITEM.getTagOrEmpty(tag)) {
          if (player.getStatHandler().getStat(Stats.CRAFTED.getOrCreateStat(lv.value())) > 0) {
             return true;
          }
diff -bur namedTargetSrc/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.java namedSrc/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.java
--- namedTargetSrc/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.java	2023-08-02 15:52:15.937786356 +0000
+++ namedSrc/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.java	2023-08-02 15:50:15.022433245 +0000
@@ -73,7 +73,7 @@
       } else {
          if (this.ticks == 1) {
             ClientPlayerEntity lv = this.manager.getClient().player;
-            if (lv != null && (m_bizgrbna(lv) || hasBrokenTreeBlocks(lv))) {
+            if (lv != null && (hasCompletionItem(lv) || hasBrokenTreeBlocks(lv))) {
                this.manager.setStep(TutorialStep.CRAFT_PLANKS);
                return;
             }
@@ -121,10 +121,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bizgrbna Lnet/minecraft/unmapped/C_qvaeczgg;m_bizgrbna(Lnet/minecraft/unmapped/C_jlopmfei;)Z}
+    * @mapping {@literal named hasCompletionItem Lnet/minecraft/client/tutorial/FindTreeTutorialStepHandler;hasCompletionItem(Lnet/minecraft/client/network/ClientPlayerEntity;)Z}
     */
-   private static boolean m_bizgrbna(ClientPlayerEntity arg) {
-      return arg.getInventory().anyMatch(stack -> stack.isIn(ItemTags.COMPLETES_FIND_TREE_TUTORIAL));
+   private static boolean hasCompletionItem(ClientPlayerEntity player) {
+      return player.getInventory().anyMatch(stack -> stack.isIn(ItemTags.COMPLETES_FIND_TREE_TUTORIAL));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/command/argument/ArgumentSignatures.java namedSrc/net/minecraft/command/argument/ArgumentSignatures.java
--- namedTargetSrc/net/minecraft/command/argument/ArgumentSignatures.java	2023-08-02 15:52:16.109791107 +0000
+++ namedSrc/net/minecraft/command/argument/ArgumentSignatures.java	2023-08-02 15:50:15.234439208 +0000
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import net.minecraft.command.SignedArgument;
+import net.minecraft.command.SignedCommand;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.network.message.MessageSignature;
 import org.jetbrains.annotations.Nullable;
@@ -12,7 +12,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_vzdwlloh}
  * @mapping {@literal named net/minecraft/command/argument/ArgumentSignatures}
  */
-public record ArgumentSignatures(List<ArgumentSignatures.C_nyssgepw> entries) {
+public record ArgumentSignatures(List<ArgumentSignatures.Entry> entries) {
    /**
     * @mapping {@literal hashed f_ozzaytin Lnet/minecraft/unmapped/C_vzdwlloh;f_ozzaytin:Lnet/minecraft/unmapped/C_vzdwlloh;}
     * @mapping {@literal named EMPTY Lnet/minecraft/command/argument/ArgumentSignatures;EMPTY:Lnet/minecraft/command/argument/ArgumentSignatures;}
@@ -34,7 +34,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/command/argument/ArgumentSignatures;<init>(Lnet/minecraft/network/PacketByteBuf;)V}
     */
    public ArgumentSignatures(PacketByteBuf buf) {
-      this(buf.readCollection(PacketByteBuf.getMaxValidator(ArrayList::new, 8), ArgumentSignatures.C_nyssgepw::new));
+      this(buf.readCollection(PacketByteBuf.getMaxValidator(ArrayList::new, 8), ArgumentSignatures.Entry::new));
    }
 
    /**
@@ -42,7 +42,7 @@
     */
    @Nullable
    public MessageSignature m_vybulxck(String string) {
-      for (ArgumentSignatures.C_nyssgepw lv : this.entries) {
+      for (ArgumentSignatures.Entry lv : this.entries) {
          if (lv.name.equals(string)) {
             return lv.signature;
          }
@@ -60,51 +60,52 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hdioayeu Lnet/minecraft/unmapped/C_vzdwlloh;m_hdioayeu(Lnet/minecraft/unmapped/C_wdcbkyfy;Lnet/minecraft/unmapped/C_vzdwlloh$C_lciuughf;)Lnet/minecraft/unmapped/C_vzdwlloh;}
+    * @mapping {@literal named sign Lnet/minecraft/command/argument/ArgumentSignatures;sign(Lnet/minecraft/command/SignedCommand;Lnet/minecraft/command/argument/ArgumentSignatures$Signer;)Lnet/minecraft/command/argument/ArgumentSignatures;}
     */
-   public static ArgumentSignatures m_hdioayeu(SignedArgument<?> arg, ArgumentSignatures.C_lciuughf arg2) {
-      List<ArgumentSignatures.C_nyssgepw> list = arg.arguments().stream().map(arg2x -> {
+   public static ArgumentSignatures sign(SignedCommand<?> arg, ArgumentSignatures.Signer arg2) {
+      List<ArgumentSignatures.Entry> list = arg.arguments().stream().map(arg2x -> {
          MessageSignature lv = arg2.sign(arg2x.value());
-         return lv != null ? new ArgumentSignatures.C_nyssgepw(arg2x.getName(), lv) : null;
+         return lv != null ? new ArgumentSignatures.Entry(arg2x.getName(), lv) : null;
       }).filter(Objects::nonNull).toList();
       return new ArgumentSignatures(list);
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_vzdwlloh$C_lciuughf}
-    * @mapping {@literal named net/minecraft/command/argument/ArgumentSignatures$C_lciuughf}
-    */
-   @FunctionalInterface
-   public interface C_lciuughf {
-      /**
-       * @mapping {@literal hashed sign Lnet/minecraft/unmapped/C_vzdwlloh$C_lciuughf;sign(Ljava/lang/String;)Lnet/minecraft/unmapped/C_shphkjbi;}
-       * @mapping {@literal named sign Lnet/minecraft/command/argument/ArgumentSignatures$C_lciuughf;sign(Ljava/lang/String;)Lnet/minecraft/network/message/MessageSignature;}
-       */
-      @Nullable
-      MessageSignature sign(String string);
-   }
-
-   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_vzdwlloh$C_nyssgepw}
-    * @mapping {@literal named net/minecraft/command/argument/ArgumentSignatures$C_nyssgepw}
+    * @mapping {@literal named net/minecraft/command/argument/ArgumentSignatures$Entry}
     */
-   public static record C_nyssgepw(String name, MessageSignature signature) {
+   public static record Entry(String name, MessageSignature signature) {
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_vzdwlloh$C_nyssgepw;<init>(Lnet/minecraft/unmapped/C_idfydwco;)V}
-       * @mapping {@literal named <init> Lnet/minecraft/command/argument/ArgumentSignatures$C_nyssgepw;<init>(Lnet/minecraft/network/PacketByteBuf;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/command/argument/ArgumentSignatures$Entry;<init>(Lnet/minecraft/network/PacketByteBuf;)V}
        */
-      public C_nyssgepw(PacketByteBuf buf) {
+      public Entry(PacketByteBuf buf) {
          this(buf.readString(16), MessageSignature.read(buf));
       }
 
       /**
        * @mapping {@literal hashed m_nesthucx Lnet/minecraft/unmapped/C_vzdwlloh$C_nyssgepw;m_nesthucx(Lnet/minecraft/unmapped/C_idfydwco;)V}
-       * @mapping {@literal named m_nesthucx Lnet/minecraft/command/argument/ArgumentSignatures$C_nyssgepw;m_nesthucx(Lnet/minecraft/network/PacketByteBuf;)V}
+       * @mapping {@literal named m_nesthucx Lnet/minecraft/command/argument/ArgumentSignatures$Entry;m_nesthucx(Lnet/minecraft/network/PacketByteBuf;)V}
        */
       public void m_nesthucx(PacketByteBuf buf) {
          buf.writeString(this.name, 16);
          MessageSignature.write(buf, this.signature);
       }
    }
+
+   /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_vzdwlloh$C_lciuughf}
+    * @mapping {@literal named net/minecraft/command/argument/ArgumentSignatures$Signer}
+    */
+   @FunctionalInterface
+   public interface Signer {
+      /**
+       * @mapping {@literal hashed sign Lnet/minecraft/unmapped/C_vzdwlloh$C_lciuughf;sign(Ljava/lang/String;)Lnet/minecraft/unmapped/C_shphkjbi;}
+       * @mapping {@literal named sign Lnet/minecraft/command/argument/ArgumentSignatures$Signer;sign(Ljava/lang/String;)Lnet/minecraft/network/message/MessageSignature;}
+       */
+      @Nullable
+      MessageSignature sign(String string);
+   }
 }
Only in namedTargetSrc/net/minecraft/command: SignedArgument.java
Only in namedSrc/net/minecraft/command: SignedCommand.java
diff -bur namedTargetSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java namedSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java	2023-08-02 15:52:16.005788234 +0000
+++ namedSrc/net/minecraft/server/network/ServerPlayNetworkHandler.java	2023-08-02 15:50:15.106435608 +0000
@@ -41,7 +41,7 @@
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.block.entity.StructureBlockBlockEntity;
 import net.minecraft.client.option.ChatVisibility;
-import net.minecraft.command.SignedArgument;
+import net.minecraft.command.SignedCommand;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.ExperienceOrbEntity;
 import net.minecraft.entity.ItemEntity;
@@ -1620,7 +1620,7 @@
 
       Map<String, SignedChatMessage> map;
       try {
-         map = this.m_zqahozcp(commandPacket, SignedArgument.m_lxppwkze(parseResults), signatureList);
+         map = this.m_zqahozcp(commandPacket, SignedCommand.of(parseResults), signatureList);
       } catch (MessageChain.DecodingException var6) {
          this.handleDecodingException(var6);
          return;
@@ -1645,12 +1645,12 @@
 
    /**
     * @mapping {@literal hashed m_zqahozcp Lnet/minecraft/unmapped/C_hwbabymg;m_zqahozcp(Lnet/minecraft/unmapped/C_ahusqrxm;Lnet/minecraft/unmapped/C_wdcbkyfy;Lnet/minecraft/unmapped/C_mofgmouu;)Ljava/util/Map;}
-    * @mapping {@literal named m_zqahozcp Lnet/minecraft/server/network/ServerPlayNetworkHandler;m_zqahozcp(Lnet/minecraft/network/packet/c2s/play/ChatCommandC2SPacket;Lnet/minecraft/command/SignedArgument;Lnet/minecraft/network/message/MessageSignatureList;)Ljava/util/Map;}
+    * @mapping {@literal named m_zqahozcp Lnet/minecraft/server/network/ServerPlayNetworkHandler;m_zqahozcp(Lnet/minecraft/network/packet/c2s/play/ChatCommandC2SPacket;Lnet/minecraft/command/SignedCommand;Lnet/minecraft/network/message/MessageSignatureList;)Ljava/util/Map;}
     */
-   private Map<String, SignedChatMessage> m_zqahozcp(ChatCommandC2SPacket commandPacket, SignedArgument<?> arg2, MessageSignatureList signatures) throws MessageChain.DecodingException {
+   private Map<String, SignedChatMessage> m_zqahozcp(ChatCommandC2SPacket commandPacket, SignedCommand<?> arg2, MessageSignatureList signatures) throws MessageChain.DecodingException {
       Map<String, SignedChatMessage> map = new Object2ObjectOpenHashMap<>();
 
-      for (SignedArgument.Argument<?> lv : arg2.arguments()) {
+      for (SignedCommand.Argument<?> lv : arg2.arguments()) {
          MessageSignature lv2 = commandPacket.argumentSignatures().m_vybulxck(lv.getName());
          MessageBody lv3 = new MessageBody(lv.value(), commandPacket.timestamp(), commandPacket.salt(), signatures);
          map.put(lv.getName(), this.messageChainUnpacker.unpack(lv2, lv3));
Only in namedTargetSrc/net/minecraft/unmapped: C_pxvlatlk.java
Only in namedTargetSrc/net/minecraft/unmapped: C_srmdcrvq.java
Only in namedTargetSrc/net/minecraft/unmapped: C_suesdakf.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_thiwijsl.java namedSrc/net/minecraft/unmapped/C_thiwijsl.java
--- namedTargetSrc/net/minecraft/unmapped/C_thiwijsl.java	2023-08-02 15:52:15.921785914 +0000
+++ namedSrc/net/minecraft/unmapped/C_thiwijsl.java	2023-08-02 15:50:15.002432682 +0000
@@ -60,7 +60,7 @@
     * Mapping not found
     */
    @Override
-   public Either<FontTypeProvider.C_dbnueaxr, FontTypeProvider.C_wxrtqmdn> m_bcikbtqr() {
+   public Either<FontTypeProvider.Loader, FontTypeProvider.Reference> unpack() {
       return Either.left(this::m_kbvcvcpx);
    }
 
diff -bur namedTargetSrc/net/minecraft/unmapped/C_tpdqtyid.java namedSrc/net/minecraft/unmapped/C_tpdqtyid.java
--- namedTargetSrc/net/minecraft/unmapped/C_tpdqtyid.java	2023-08-02 15:52:16.061789781 +0000
+++ namedSrc/net/minecraft/unmapped/C_tpdqtyid.java	2023-08-02 15:50:15.178437633 +0000
@@ -34,7 +34,7 @@
     * Mapping not found
     */
    @Override
-   public Either<FontTypeProvider.C_dbnueaxr, FontTypeProvider.C_wxrtqmdn> m_bcikbtqr() {
-      return Either.right(new FontTypeProvider.C_wxrtqmdn(this.id));
+   public Either<FontTypeProvider.Loader, FontTypeProvider.Reference> unpack() {
+      return Either.right(new FontTypeProvider.Reference(this.id));
    }
 }

Please sign in to comment.