more client mappings! (#471) · QuiltMC/quilt-mappings@676b880

github-actions · 2023-08-09T03:28:10Z

With commit 676b880, 136 file(s) were updated with 1209 line(s) added and 1070 removed compared to the latest Quilt Mappings version.

View the diff here (1/3):

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-09 03:28:06.877868289 +0000
+++ namedSrc/com/mojang/blaze3d/font/SpaceFont.java	2023-08-09 03:26:33.306359006 +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-09 03:28:06.865868352 +0000
+++ namedSrc/net/minecraft/client/font/BitmapFont.java	2023-08-09 03:26:33.286359111 +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$Definition}
     */
    @Environment(EnvType.CLIENT)
-   public static record C_qoeqnynz(Identifier file, int height, int ascent, int[][] codepointGrid) implements FontTypeProvider {
+   public static record Definition(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$Definition;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.Definition::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$Definition;MAP_CODEC:Lcom/mojang/serialization/MapCodec;}
        */
-      public static final MapCodec<BitmapFont.C_qoeqnynz> f_cgyvixla = Codecs.validate(
+      public static final MapCodec<BitmapFont.Definition> 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.Definition::file),
+                     Codec.INT.optionalFieldOf("height", Integer.valueOf(8)).forGetter(BitmapFont.Definition::height),
+                     Codec.INT.fieldOf("ascent").forGetter(BitmapFont.Definition::ascent),
+                     CODEC.fieldOf("chars").forGetter(BitmapFont.Definition::codepointGrid)
                   )
-                  .apply(instance, BitmapFont.C_qoeqnynz::new)
+                  .apply(instance, BitmapFont.Definition::new)
          ),
-         BitmapFont.C_qoeqnynz::m_uzvsmvxq
+         BitmapFont.Definition::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$Definition;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$Definition;validate(Lnet/minecraft/client/font/BitmapFont$Definition;)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.Definition> validate(BitmapFont.Definition 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$Definition;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$Definition;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-09 03:28:06.785868769 +0000
+++ namedSrc/net/minecraft/client/font/EmptyGlyphRenderer.java	2023-08-09 03:26:33.190359612 +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-09 03:28:06.885868248 +0000
+++ namedSrc/net/minecraft/client/font/FontManager.java	2023-08-09 03:26:33.314358965 +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-09 03:28:06.825868561 +0000
+++ namedSrc/net/minecraft/client/font/FontRenderType.java	2023-08-09 03:26:33.242359340 +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-09 03:28:06.817868602 +0000
+++ namedSrc/net/minecraft/client/font/FontStorage.java	2023-08-09 03:26:33.230359403 +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-09 03:28:06.785868769 +0000
+++ namedSrc/net/minecraft/client/font/FontType.java	2023-08-09 03:26:33.190359612 +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.Definition.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-09 03:28:06.877868289 +0000
+++ namedSrc/net/minecraft/client/font/FontTypeProvider.java	2023-08-09 03:26:33.306359006 +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-09 03:28:06.821868581 +0000
+++ namedSrc/net/minecraft/client/font/GlyphAtlasTexture.java	2023-08-09 03:26:33.230359403 +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-09 03:28:06.825868561 +0000
+++ namedSrc/net/minecraft/client/font/GlyphRenderer.java	2023-08-09 03:26:33.242359340 +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-09 03:28:06.893868206 +0000
+++ namedSrc/net/minecraft/client/gui/ChatReportCategory.java	2023-08-09 03:26:33.326358902 +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");
    }
Only in namedSrc/net/minecraft/client/gui: GuiAtlasManager.java

github-actions · 2023-08-09T03:28:11Z

View the diff here (2/3):

diff -bur namedTargetSrc/net/minecraft/client/gui/GuiGraphics.java namedSrc/net/minecraft/client/gui/GuiGraphics.java
--- namedTargetSrc/net/minecraft/client/gui/GuiGraphics.java	2023-08-09 03:28:06.781868790 +0000
+++ namedSrc/net/minecraft/client/gui/GuiGraphics.java	2023-08-09 03:26:33.190359612 +0000
@@ -35,6 +35,7 @@
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.json.ModelTransformationMode;
 import net.minecraft.client.texture.Sprite;
+import net.minecraft.client.texture.SpriteScaling;
 import net.minecraft.client.util.ColorUtil;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.LivingEntity;
@@ -44,8 +45,6 @@
 import net.minecraft.text.StringVisitable;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_ctosjovs;
-import net.minecraft.unmapped.C_ihnghycr;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.crash.CrashCallable;
 import net.minecraft.util.crash.CrashException;
@@ -99,9 +98,10 @@
     */
    private final GuiGraphics.ScissorStack scissorStack = new GuiGraphics.ScissorStack();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_pwjfkarr Lnet/minecraft/unmapped/C_sedilmty;f_pwjfkarr:Lnet/minecraft/unmapped/C_ihnghycr;}
+    * @mapping {@literal named guiAtlasManager Lnet/minecraft/client/gui/GuiGraphics;guiAtlasManager:Lnet/minecraft/client/gui/GuiAtlasManager;}
     */
-   private final C_ihnghycr f_pwjfkarr;
+   private final GuiAtlasManager guiAtlasManager;
    /**
     * @mapping {@literal hashed f_nyndozay Lnet/minecraft/unmapped/C_sedilmty;f_nyndozay:Z}
     * @mapping {@literal named managed Lnet/minecraft/client/gui/GuiGraphics;managed:Z}
@@ -116,7 +116,7 @@
       this.client = client;
       this.matrices = matrices;
       this.vertexConsumers = vertexConsumerProvider;
-      this.f_pwjfkarr = client.m_hbzestyd();
+      this.guiAtlasManager = client.getGuiAtlasManager();
    }
 
    /**
@@ -504,7 +504,7 @@
     * @mapping {@literal named drawSprite Lnet/minecraft/client/gui/GuiGraphics;drawSprite(IIIIILnet/minecraft/client/texture/Sprite;)V}
     */
    public void drawSprite(int x, int y, int z, int width, int height, Sprite sprite) {
-      this.m_rfponljw(sprite, x, y, z, width, height);
+      this.drawSprite(sprite, x, y, z, width, height);
    }
 
    /**
@@ -529,70 +529,78 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pycordis Lnet/minecraft/unmapped/C_sedilmty;m_pycordis(Lnet/minecraft/unmapped/C_ncpywfca;IIII)V}
+    * @mapping {@literal named drawGuiTexture Lnet/minecraft/client/gui/GuiGraphics;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V}
     */
-   public void m_pycordis(Identifier arg, int i, int j, int k, int l) {
-      this.m_tfcymekl(arg, i, j, 0, k, l);
+   public void drawGuiTexture(Identifier texture, int x, int y, int width, int height) {
+      this.drawGuiTexture(texture, x, y, 0, width, height);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_tfcymekl Lnet/minecraft/unmapped/C_sedilmty;m_tfcymekl(Lnet/minecraft/unmapped/C_ncpywfca;IIIII)V}
+    * @mapping {@literal named drawGuiTexture Lnet/minecraft/client/gui/GuiGraphics;drawGuiTexture(Lnet/minecraft/util/Identifier;IIIII)V}
     */
-   public void m_tfcymekl(Identifier arg, int i, int j, int k, int l, int m) {
-      Sprite lv = this.f_pwjfkarr.getSprite(arg);
-      C_ctosjovs lv2 = this.f_pwjfkarr.m_rszfzndd(lv);
-      if (lv2 instanceof C_ctosjovs.C_cpptpfhz) {
-         this.m_rfponljw(lv, i, j, k, l, m);
-      } else if (lv2 instanceof C_ctosjovs.C_estbfezj lv3) {
-         this.m_mssucndx(lv, i, j, k, l, m, 0, 0, lv3.width(), lv3.height(), lv3.width(), lv3.height());
-      } else if (lv2 instanceof C_ctosjovs.C_ycdqkkvr lv4) {
-         this.m_yrmetwxg(lv, lv4, i, j, k, l, m);
+   public void drawGuiTexture(Identifier texture, int x, int y, int z, int width, int height) {
+      Sprite lv = this.guiAtlasManager.getSprite(texture);
+      SpriteScaling lv2 = this.guiAtlasManager.getScaling(lv);
+      if (lv2 instanceof SpriteScaling.Stretch) {
+         this.drawSprite(lv, x, y, z, width, height);
+      } else if (lv2 instanceof SpriteScaling.Tile lv3) {
+         this.drawTiledSprite(lv, x, y, z, width, height, 0, 0, lv3.width(), lv3.height(), lv3.width(), lv3.height());
+      } else if (lv2 instanceof SpriteScaling.NineSlice lv4) {
+         this.drawNineSlicedSprite(lv, lv4, x, y, z, width, height);
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_gtwewgcz Lnet/minecraft/unmapped/C_sedilmty;m_gtwewgcz(Lnet/minecraft/unmapped/C_ncpywfca;IIIIIIII)V}
+    * @mapping {@literal named drawGuiTexture Lnet/minecraft/client/gui/GuiGraphics;drawGuiTexture(Lnet/minecraft/util/Identifier;IIIIIIII)V}
     */
-   public void m_gtwewgcz(Identifier arg, int i, int j, int k, int l, int m, int n, int o, int p) {
-      this.m_gxfmwcnk(arg, i, j, k, l, m, n, 0, o, p);
+   public void drawGuiTexture(Identifier texture, int sliceWidth1, int sliceHeight1, int sliceWidth2, int sliceHeight2, int x, int y, int width, int height) {
+      this.drawGuiTexture(texture, sliceWidth1, sliceHeight1, sliceWidth2, sliceHeight2, x, y, 0, width, height);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_gxfmwcnk Lnet/minecraft/unmapped/C_sedilmty;m_gxfmwcnk(Lnet/minecraft/unmapped/C_ncpywfca;IIIIIIIII)V}
+    * @mapping {@literal named drawGuiTexture Lnet/minecraft/client/gui/GuiGraphics;drawGuiTexture(Lnet/minecraft/util/Identifier;IIIIIIIII)V}
     */
-   public void m_gxfmwcnk(Identifier arg, int i, int j, int k, int l, int m, int n, int o, int p, int q) {
-      Sprite lv = this.f_pwjfkarr.getSprite(arg);
-      C_ctosjovs lv2 = this.f_pwjfkarr.m_rszfzndd(lv);
-      if (lv2 instanceof C_ctosjovs.C_cpptpfhz) {
-         this.m_zxyljofk(lv, i, j, k, l, m, n, o, p, q);
+   public void drawGuiTexture(
+      Identifier texture, int sliceWidth1, int sliceHeight1, int sliceWidth2, int sliceHeight2, int x, int y, int z, int width, int height
+   ) {
+      Sprite lv = this.guiAtlasManager.getSprite(texture);
+      SpriteScaling lv2 = this.guiAtlasManager.getScaling(lv);
+      if (lv2 instanceof SpriteScaling.Stretch) {
+         this.drawSprite(lv, sliceWidth1, sliceHeight1, sliceWidth2, sliceHeight2, x, y, z, width, height);
       } else {
-         this.m_tfcymekl(arg, m, n, o, p, q);
+         this.drawGuiTexture(texture, x, y, z, width, height);
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zxyljofk Lnet/minecraft/unmapped/C_sedilmty;m_zxyljofk(Lnet/minecraft/unmapped/C_uflrwbwt;IIIIIIIII)V}
+    * @mapping {@literal named drawSprite Lnet/minecraft/client/gui/GuiGraphics;drawSprite(Lnet/minecraft/client/texture/Sprite;IIIIIIIII)V}
     */
-   private void m_zxyljofk(Sprite arg, int i, int j, int k, int l, int m, int n, int o, int p, int q) {
+   private void drawSprite(Sprite sprite, int sliceWidth1, int sliceHeight1, int sliceWidth2, int sliceHeight2, int x, int y, int z, int width, int height) {
       this.drawTexturedQuad(
-         arg.getId(),
-         m,
-         m + p,
-         n,
-         n + q,
-         o,
-         arg.getFrameU((float)k / (float)i),
-         arg.getFrameU((float)(k + p) / (float)i),
-         arg.getFrameV((float)l / (float)j),
-         arg.getFrameV((float)(l + q) / (float)j)
+         sprite.getId(),
+         x,
+         x + width,
+         y,
+         y + height,
+         z,
+         sprite.getFrameU((float)sliceWidth2 / (float)sliceWidth1),
+         sprite.getFrameU((float)(sliceWidth2 + width) / (float)sliceWidth1),
+         sprite.getFrameV((float)sliceHeight2 / (float)sliceHeight1),
+         sprite.getFrameV((float)(sliceHeight2 + height) / (float)sliceHeight1)
       );
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rfponljw Lnet/minecraft/unmapped/C_sedilmty;m_rfponljw(Lnet/minecraft/unmapped/C_uflrwbwt;IIIII)V}
+    * @mapping {@literal named drawSprite Lnet/minecraft/client/gui/GuiGraphics;drawSprite(Lnet/minecraft/client/texture/Sprite;IIIII)V}
     */
-   private void m_rfponljw(Sprite arg, int i, int j, int k, int l, int m) {
-      this.drawTexturedQuad(arg.getId(), i, i + l, j, j + m, k, arg.getMinU(), arg.getMaxU(), arg.getMinV(), arg.getMaxV());
+   private void drawSprite(Sprite sprite, int x, int y, int z, int width, int height) {
+      this.drawTexturedQuad(sprite.getId(), x, x + width, y, y + height, z, sprite.getMinU(), sprite.getMaxU(), sprite.getMinV(), sprite.getMaxV());
    }
 
    /**
@@ -689,47 +697,72 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yrmetwxg Lnet/minecraft/unmapped/C_sedilmty;m_yrmetwxg(Lnet/minecraft/unmapped/C_uflrwbwt;Lnet/minecraft/unmapped/C_ctosjovs$C_ycdqkkvr;IIIII)V}
+    * @mapping {@literal named drawNineSlicedSprite Lnet/minecraft/client/gui/GuiGraphics;drawNineSlicedSprite(Lnet/minecraft/client/texture/Sprite;Lnet/minecraft/client/texture/SpriteScaling$NineSlice;IIIII)V}
     */
-   private void m_yrmetwxg(Sprite arg, C_ctosjovs.C_ycdqkkvr arg2, int i, int j, int k, int l, int m) {
-      C_ctosjovs.C_ycdqkkvr.C_cynmfqgo lv = arg2.border();
-      int n = Math.min(lv.left(), l / 2);
-      int o = Math.min(lv.right(), l / 2);
-      int p = Math.min(lv.top(), m / 2);
-      int q = Math.min(lv.bottom(), m / 2);
-      if (l == arg2.width() && m == arg2.height()) {
-         this.m_zxyljofk(arg, arg2.width(), arg2.height(), 0, 0, i, j, k, l, m);
-      } else if (m == arg2.height()) {
-         this.m_zxyljofk(arg, arg2.width(), arg2.height(), 0, 0, i, j, k, n, m);
-         this.m_mssucndx(arg, i + n, j, k, l - o - n, m, n, 0, arg2.width() - o - n, arg2.height(), arg2.width(), arg2.height());
-         this.m_zxyljofk(arg, arg2.width(), arg2.height(), arg2.width() - o, 0, i + l - o, j, k, o, m);
-      } else if (l == arg2.width()) {
-         this.m_zxyljofk(arg, arg2.width(), arg2.height(), 0, 0, i, j, k, l, p);
-         this.m_mssucndx(arg, i, j + p, k, l, m - q - p, 0, p, arg2.width(), arg2.height() - q - p, arg2.width(), arg2.height());
-         this.m_zxyljofk(arg, arg2.width(), arg2.height(), 0, arg2.height() - q, i, j + m - q, k, l, q);
+   private void drawNineSlicedSprite(Sprite sprite, SpriteScaling.NineSlice nineSlice, int x, int y, int z, int width, int height) {
+      SpriteScaling.NineSlice.Border lv = nineSlice.border();
+      int n = Math.min(lv.left(), width / 2);
+      int o = Math.min(lv.right(), width / 2);
+      int p = Math.min(lv.top(), height / 2);
+      int q = Math.min(lv.bottom(), height / 2);
+      if (width == nineSlice.width() && height == nineSlice.height()) {
+         this.drawSprite(sprite, nineSlice.width(), nineSlice.height(), 0, 0, x, y, z, width, height);
+      } else if (height == nineSlice.height()) {
+         this.drawSprite(sprite, nineSlice.width(), nineSlice.height(), 0, 0, x, y, z, n, height);
+         this.drawTiledSprite(
+            sprite, x + n, y, z, width - o - n, height, n, 0, nineSlice.width() - o - n, nineSlice.height(), nineSlice.width(), nineSlice.height()
+         );
+         this.drawSprite(sprite, nineSlice.width(), nineSlice.height(), nineSlice.width() - o, 0, x + width - o, y, z, o, height);
+      } else if (width == nineSlice.width()) {
+         this.drawSprite(sprite, nineSlice.width(), nineSlice.height(), 0, 0, x, y, z, width, p);
+         this.drawTiledSprite(
+            sprite, x, y + p, z, width, height - q - p, 0, p, nineSlice.width(), nineSlice.height() - q - p, nineSlice.width(), nineSlice.height()
+         );
+         this.drawSprite(sprite, nineSlice.width(), nineSlice.height(), 0, nineSlice.height() - q, x, y + height - q, z, width, q);
       } else {
-         this.m_zxyljofk(arg, arg2.width(), arg2.height(), 0, 0, i, j, k, n, p);
-         this.m_mssucndx(arg, i + n, j, k, l - o - n, p, n, 0, arg2.width() - o - n, p, arg2.width(), arg2.height());
-         this.m_zxyljofk(arg, arg2.width(), arg2.height(), arg2.width() - o, 0, i + l - o, j, k, o, p);
-         this.m_zxyljofk(arg, arg2.width(), arg2.height(), 0, arg2.height() - q, i, j + m - q, k, n, q);
-         this.m_mssucndx(arg, i + n, j + m - q, k, l - o - n, q, n, arg2.height() - q, arg2.width() - o - n, q, arg2.width(), arg2.height());
-         this.m_zxyljofk(arg, arg2.width(), arg2.height(), arg2.width() - o, arg2.height() - q, i + l - o, j + m - q, k, o, q);
-         this.m_mssucndx(arg, i, j + p, k, n, m - q - p, 0, p, n, arg2.height() - q - p, arg2.width(), arg2.height());
-         this.m_mssucndx(arg, i + n, j + p, k, l - o - n, m - q - p, n, p, arg2.width() - o - n, arg2.height() - q - p, arg2.width(), arg2.height());
-         this.m_mssucndx(arg, i + l - o, j + p, k, n, m - q - p, arg2.width() - o, p, o, arg2.height() - q - p, arg2.width(), arg2.height());
+         this.drawSprite(sprite, nineSlice.width(), nineSlice.height(), 0, 0, x, y, z, n, p);
+         this.drawTiledSprite(sprite, x + n, y, z, width - o - n, p, n, 0, nineSlice.width() - o - n, p, nineSlice.width(), nineSlice.height());
+         this.drawSprite(sprite, nineSlice.width(), nineSlice.height(), nineSlice.width() - o, 0, x + width - o, y, z, o, p);
+         this.drawSprite(sprite, nineSlice.width(), nineSlice.height(), 0, nineSlice.height() - q, x, y + height - q, z, n, q);
+         this.drawTiledSprite(
+            sprite, x + n, y + height - q, z, width - o - n, q, n, nineSlice.height() - q, nineSlice.width() - o - n, q, nineSlice.width(), nineSlice.height()
+         );
+         this.drawSprite(sprite, nineSlice.width(), nineSlice.height(), nineSlice.width() - o, nineSlice.height() - q, x + width - o, y + height - q, z, o, q);
+         this.drawTiledSprite(sprite, x, y + p, z, n, height - q - p, 0, p, n, nineSlice.height() - q - p, nineSlice.width(), nineSlice.height());
+         this.drawTiledSprite(
+            sprite,
+            x + n,
+            y + p,
+            z,
+            width - o - n,
+            height - q - p,
+            n,
+            p,
+            nineSlice.width() - o - n,
+            nineSlice.height() - q - p,
+            nineSlice.width(),
+            nineSlice.height()
+         );
+         this.drawTiledSprite(
+            sprite, x + width - o, y + p, z, n, height - q - p, nineSlice.width() - o, p, o, nineSlice.height() - q - p, nineSlice.width(), nineSlice.height()
+         );
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mssucndx Lnet/minecraft/unmapped/C_sedilmty;m_mssucndx(Lnet/minecraft/unmapped/C_uflrwbwt;IIIIIIIIIII)V}
+    * @mapping {@literal named drawTiledSprite Lnet/minecraft/client/gui/GuiGraphics;drawTiledSprite(Lnet/minecraft/client/texture/Sprite;IIIIIIIIIII)V}
     */
-   private void m_mssucndx(Sprite arg, int i, int j, int k, int l, int m, int n, int o, int p, int q, int r, int s) {
-      for (int t = 0; t < l; t += p) {
-         int u = Math.min(p, l - t);
+   private void drawTiledSprite(
+      Sprite sprite, int x, int y, int z, int width, int height, int sliceWidth2, int sliceHeight2, int xStep, int yStep, int sliceWidth1, int sliceHeight1
+   ) {
+      for (int t = 0; t < width; t += xStep) {
+         int u = Math.min(xStep, width - t);
 
-         for (int v = 0; v < m; v += q) {
-            int w = Math.min(q, m - v);
-            this.m_zxyljofk(arg, r, s, n, o, i + t, j + v, k, u, w);
+         for (int v = 0; v < height; v += yStep) {
+            int w = Math.min(yStep, height - v);
+            this.drawSprite(sprite, sliceWidth1, sliceHeight1, sliceWidth2, sliceHeight2, x + t, y + v, z, u, w);
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/BossBarHud.java namedSrc/net/minecraft/client/gui/hud/BossBarHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/BossBarHud.java	2023-08-09 03:28:06.873868310 +0000
+++ namedSrc/net/minecraft/client/gui/hud/BossBarHud.java	2023-08-09 03:26:33.302359027 +0000
@@ -132,10 +132,10 @@
     * @mapping {@literal named m_wmrefgml Lnet/minecraft/client/gui/hud/BossBarHud;m_wmrefgml(Lnet/minecraft/client/gui/GuiGraphics;IILnet/minecraft/entity/boss/BossBar;I[Lnet/minecraft/util/Identifier;[Lnet/minecraft/util/Identifier;)V}
     */
    private void m_wmrefgml(GuiGraphics graphics, int i, int j, BossBar arg2, int k, Identifier[] args, Identifier[] args2) {
-      graphics.m_gtwewgcz(args[arg2.getColor().ordinal()], 182, 5, 0, 0, i, j, k, 5);
+      graphics.drawGuiTexture(args[arg2.getColor().ordinal()], 182, 5, 0, 0, i, j, k, 5);
       if (arg2.getStyle() != BossBar.Style.PROGRESS) {
          RenderSystem.enableBlend();
-         graphics.m_pycordis(args2[arg2.getStyle().ordinal() - 1], i, j, k, 5);
+         graphics.drawGuiTexture(args2[arg2.getStyle().ordinal() - 1], i, j, k, 5);
          RenderSystem.disableBlend();
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/ChatMessageTag.java namedSrc/net/minecraft/client/gui/hud/ChatMessageTag.java
--- namedTargetSrc/net/minecraft/client/gui/hud/ChatMessageTag.java	2023-08-09 03:28:06.909868122 +0000
+++ namedSrc/net/minecraft/client/gui/hud/ChatMessageTag.java	2023-08-09 03:26:33.342358818 +0000
@@ -137,7 +137,7 @@
        * @mapping {@literal named render Lnet/minecraft/client/gui/hud/ChatMessageTag$Icon;render(Lnet/minecraft/client/gui/GuiGraphics;II)V}
        */
       public void render(GuiGraphics graphics, int x, int y) {
-         graphics.m_pycordis(this.f_ngelpmwg, x, y, this.width, this.height);
+         graphics.drawGuiTexture(this.f_ngelpmwg, x, y, this.width, this.height);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/InGameHud.java namedSrc/net/minecraft/client/gui/hud/InGameHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/InGameHud.java	2023-08-09 03:28:06.833868519 +0000
+++ namedSrc/net/minecraft/client/gui/hud/InGameHud.java	2023-08-09 03:26:33.254359278 +0000
@@ -703,7 +703,7 @@
                   GlStateManager.DestFactor.ZERO
                );
                int i = 15;
-               graphics.m_pycordis(f_yorzlrbh, (this.scaledWidth - 15) / 2, (this.scaledHeight - 15) / 2, 15, 15);
+               graphics.drawGuiTexture(f_yorzlrbh, (this.scaledWidth - 15) / 2, (this.scaledHeight - 15) / 2, 15, 15);
                if (this.client.options.getAttackIndicator().get() == AttackIndicator.CROSSHAIR) {
                   float f = this.client.player.getAttackCooldownProgress(0.0F);
                   boolean bl = false;
@@ -715,11 +715,11 @@
                   int j = this.scaledHeight / 2 - 7 + 16;
                   int k = this.scaledWidth / 2 - 8;
                   if (bl) {
-                     graphics.m_pycordis(f_ismzrsgq, k, j, 16, 16);
+                     graphics.drawGuiTexture(f_ismzrsgq, k, j, 16, 16);
                   } else if (f < 1.0F) {
                      int l = (int)(f * 17.0F);
-                     graphics.m_pycordis(f_jwjdbxak, k, j, 16, 4);
-                     graphics.m_gtwewgcz(f_xaxyfvom, 16, 4, 0, 0, k, j, l, 4);
+                     graphics.drawGuiTexture(f_jwjdbxak, k, j, 16, 4);
+                     graphics.drawGuiTexture(f_xaxyfvom, 16, 4, 0, 0, k, j, l, 4);
                   }
                }
 
@@ -785,9 +785,9 @@
 
                float f = 1.0F;
                if (lv3.isAmbient()) {
-                  graphics.m_pycordis(f_xwzjlhlv, k, l, 24, 24);
+                  graphics.drawGuiTexture(f_xwzjlhlv, k, l, 24, 24);
                } else {
-                  graphics.m_pycordis(f_xrlzwbek, k, l, 24, 24);
+                  graphics.drawGuiTexture(f_xrlzwbek, k, l, 24, 24);
                   if (lv3.endsWithin(200)) {
                      int m = lv3.getDuration();
                      int n = 10 - m / 20;
@@ -825,13 +825,13 @@
          int k = 91;
          graphics.getMatrices().push();
          graphics.getMatrices().translate(0.0F, 0.0F, -90.0F);
-         graphics.m_pycordis(f_xhnbgrbh, i - 91, this.scaledHeight - 22, 182, 22);
-         graphics.m_pycordis(f_ivttzeka, i - 91 - 1 + lv.getInventory().selectedSlot * 20, this.scaledHeight - 22 - 1, 24, 23);
+         graphics.drawGuiTexture(f_xhnbgrbh, i - 91, this.scaledHeight - 22, 182, 22);
+         graphics.drawGuiTexture(f_ivttzeka, i - 91 - 1 + lv.getInventory().selectedSlot * 20, this.scaledHeight - 22 - 1, 24, 23);
          if (!lv2.isEmpty()) {
             if (lv3 == Arm.LEFT) {
-               graphics.m_pycordis(f_zcsyhyls, i - 91 - 29, this.scaledHeight - 23, 29, 24);
+               graphics.drawGuiTexture(f_zcsyhyls, i - 91 - 29, this.scaledHeight - 23, 29, 24);
             } else {
-               graphics.m_pycordis(f_owbnqhay, i + 91, this.scaledHeight - 23, 29, 24);
+               graphics.drawGuiTexture(f_owbnqhay, i + 91, this.scaledHeight - 23, 29, 24);
             }
          }
 
@@ -864,8 +864,8 @@
                }
 
                int s = (int)(g * 19.0F);
-               graphics.m_pycordis(f_cbldahxt, r, q, 18, 18);
-               graphics.m_gtwewgcz(f_kwmfnuqz, 18, 18, 0, 18 - s, r, q + 18 - s, 18, s);
+               graphics.drawGuiTexture(f_cbldahxt, r, q, 18, 18);
+               graphics.drawGuiTexture(f_kwmfnuqz, 18, 18, 0, 18 - s, r, q + 18 - s, 18, s);
             }
          }
 
@@ -883,11 +883,11 @@
       int j = 182;
       int k = (int)(f * 183.0F);
       int l = this.scaledHeight - 32 + 3;
-      graphics.m_pycordis(f_xtbenypu, x, l, 182, 5);
+      graphics.drawGuiTexture(f_xtbenypu, x, l, 182, 5);
       if (mount.getJumpCooldown() > 0) {
-         graphics.m_pycordis(f_yxxcqdip, x, l, 182, 5);
+         graphics.drawGuiTexture(f_yxxcqdip, x, l, 182, 5);
       } else if (k > 0) {
-         graphics.m_gtwewgcz(f_rwhujnyh, 182, 5, 0, 0, x, l, k, 5);
+         graphics.drawGuiTexture(f_rwhujnyh, 182, 5, 0, 0, x, l, k, 5);
       }
 
       this.client.getProfiler().pop();
@@ -904,9 +904,9 @@
          int k = 182;
          int l = (int)(this.client.player.experienceProgress * 183.0F);
          int m = this.scaledHeight - 32 + 3;
-         graphics.m_pycordis(f_yhumvrht, x, m, 182, 5);
+         graphics.drawGuiTexture(f_yhumvrht, x, m, 182, 5);
          if (l > 0) {
-            graphics.m_gtwewgcz(f_wbaqdnkr, 182, 5, 0, 0, x, m, l, 5);
+            graphics.drawGuiTexture(f_wbaqdnkr, 182, 5, 0, 0, x, m, l, 5);
          }
       }
 
@@ -1137,15 +1137,15 @@
             if (u > 0) {
                int x = m + w * 8;
                if (w * 2 + 1 < u) {
-                  graphics.m_pycordis(f_markpmsv, x, s, 9, 9);
+                  graphics.drawGuiTexture(f_markpmsv, x, s, 9, 9);
                }
 
                if (w * 2 + 1 == u) {
-                  graphics.m_pycordis(f_euyhizod, x, s, 9, 9);
+                  graphics.drawGuiTexture(f_euyhizod, x, s, 9, 9);
                }
 
                if (w * 2 + 1 > u) {
-                  graphics.m_pycordis(f_zmeylqar, x, s, 9, 9);
+                  graphics.drawGuiTexture(f_zmeylqar, x, s, 9, 9);
                }
             }
          }
@@ -1177,13 +1177,13 @@
                }
 
                int ab = n - z * 8 - 9;
-               graphics.m_pycordis(lv4, ab, aa, 9, 9);
+               graphics.drawGuiTexture(lv4, ab, aa, 9, 9);
                if (z * 2 + 1 < k) {
-                  graphics.m_pycordis(lv5, ab, aa, 9, 9);
+                  graphics.drawGuiTexture(lv5, ab, aa, 9, 9);
                }
 
                if (z * 2 + 1 == k) {
-                  graphics.m_pycordis(lv6, ab, aa, 9, 9);
+                  graphics.drawGuiTexture(lv6, ab, aa, 9, 9);
                }
             }
 
@@ -1201,9 +1201,9 @@
 
             for (int ah = 0; ah < af + ag; ++ah) {
                if (ah < af) {
-                  graphics.m_pycordis(f_toqeljpj, n - ah * 8 - 9, t, 9, 9);
+                  graphics.drawGuiTexture(f_toqeljpj, n - ah * 8 - 9, t, 9, 9);
                } else {
-                  graphics.m_pycordis(f_zejvkkxd, n - ah * 8 - 9, t, 9, 9);
+                  graphics.drawGuiTexture(f_zejvkkxd, n - ah * 8 - 9, t, 9, 9);
                }
             }
          }
@@ -1276,7 +1276,7 @@
     * @mapping {@literal named drawHeart Lnet/minecraft/client/gui/hud/InGameHud;drawHeart(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/gui/hud/InGameHud$HeartType;IIZZZ)V}
     */
    private void drawHeart(GuiGraphics graphics, InGameHud.HeartType type, int x, int y, boolean blinking, boolean halfHeart, boolean bl3) {
-      graphics.m_pycordis(type.m_sdsbilum(blinking, bl3, halfHeart), x, y, 9, 9);
+      graphics.drawGuiTexture(type.m_sdsbilum(blinking, bl3, halfHeart), x, y, 9, 9);
    }
 
    /**
@@ -1300,13 +1300,13 @@
 
                for (int p = 0; p < o; ++p) {
                   int q = l - p * 8 - 9;
-                  graphics.m_pycordis(f_pptoyijx, q, m, 9, 9);
+                  graphics.drawGuiTexture(f_pptoyijx, q, m, 9, 9);
                   if (p * 2 + 1 + n < j) {
-                     graphics.m_pycordis(f_wafytgbv, q, m, 9, 9);
+                     graphics.drawGuiTexture(f_wafytgbv, q, m, 9, 9);
                   }
 
                   if (p * 2 + 1 + n == j) {
-                     graphics.m_pycordis(f_loishnny, q, m, 9, 9);
+                     graphics.drawGuiTexture(f_loishnny, q, m, 9, 9);
                   }
                }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/PlayerListHud.java namedSrc/net/minecraft/client/gui/hud/PlayerListHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/PlayerListHud.java	2023-08-09 03:28:06.781868790 +0000
+++ namedSrc/net/minecraft/client/gui/hud/PlayerListHud.java	2023-08-09 03:26:33.186359633 +0000
@@ -347,7 +347,7 @@
 
       graphics.getMatrices().push();
       graphics.getMatrices().translate(0.0F, 0.0F, 100.0F);
-      graphics.m_pycordis(lv, x + width - 11, y, 10, 8);
+      graphics.drawGuiTexture(lv, x + width - 11, y, 10, 8);
       graphics.getMatrices().pop();
    }
 
@@ -391,27 +391,27 @@
             Identifier lv2 = bl ? f_jhcnkfav : f_emedoizb;
 
             for (int q = m; q < n; ++q) {
-               graphics.m_pycordis(lv2, left + q * o, y, 9, 9);
+               graphics.drawGuiTexture(lv2, left + q * o, y, 9, 9);
             }
 
             for (int r = 0; r < m; ++r) {
-               graphics.m_pycordis(lv2, left + r * o, y, 9, 9);
+               graphics.drawGuiTexture(lv2, left + r * o, y, 9, 9);
                if (bl) {
                   if (r * 2 + 1 < lv.getValue()) {
-                     graphics.m_pycordis(f_jkcanugf, left + r * o, y, 9, 9);
+                     graphics.drawGuiTexture(f_jkcanugf, left + r * o, y, 9, 9);
                   }
 
                   if (r * 2 + 1 == lv.getValue()) {
-                     graphics.m_pycordis(f_wclourtf, left + r * o, y, 9, 9);
+                     graphics.drawGuiTexture(f_wclourtf, left + r * o, y, 9, 9);
                   }
                }
 
                if (r * 2 + 1 < playerScore) {
-                  graphics.m_pycordis(r >= 10 ? f_tdjdpgrs : f_umakqjuj, left + r * o, y, 9, 9);
+                  graphics.drawGuiTexture(r >= 10 ? f_tdjdpgrs : f_umakqjuj, left + r * o, y, 9, 9);
                }
 
                if (r * 2 + 1 == playerScore) {
-                  graphics.m_pycordis(r >= 10 ? f_arjiwzge : f_vkoeybdy, left + r * o, y, 9, 9);
+                  graphics.drawGuiTexture(r >= 10 ? f_arjiwzge : f_vkoeybdy, left + r * o, y, 9, 9);
                }
             }
          }
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/spectator/SpectatorMenu.java namedSrc/net/minecraft/client/gui/hud/spectator/SpectatorMenu.java
--- namedTargetSrc/net/minecraft/client/gui/hud/spectator/SpectatorMenu.java	2023-08-09 03:28:06.785868769 +0000
+++ namedSrc/net/minecraft/client/gui/hud/spectator/SpectatorMenu.java	2023-08-09 03:26:33.190359612 +0000
@@ -279,9 +279,9 @@
       @Override
       public void renderIcon(GuiGraphics graphics, float brightness, int alpha) {
          if (this.direction < 0) {
-            graphics.m_pycordis(SpectatorMenu.f_hvyokmgg, 0, 0, 16, 16);
+            graphics.drawGuiTexture(SpectatorMenu.f_hvyokmgg, 0, 0, 16, 16);
          } else {
-            graphics.m_pycordis(SpectatorMenu.f_ijgmqnit, 0, 0, 16, 16);
+            graphics.drawGuiTexture(SpectatorMenu.f_ijgmqnit, 0, 0, 16, 16);
          }
       }
 
@@ -321,7 +321,7 @@
        */
       @Override
       public void renderIcon(GuiGraphics graphics, float brightness, int alpha) {
-         graphics.m_pycordis(SpectatorMenu.f_cnrnubhr, 0, 0, 16, 16);
+         graphics.drawGuiTexture(SpectatorMenu.f_cnrnubhr, 0, 0, 16, 16);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.java namedSrc/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.java
--- namedTargetSrc/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.java	2023-08-09 03:28:06.829868540 +0000
+++ namedSrc/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.java	2023-08-09 03:26:33.246359320 +0000
@@ -11,10 +11,10 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.PlayerFaceRenderer;
 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.client.texture.PlayerSkin;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.scoreboard.Team;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_idvschhb;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.random.RandomGenerator;
@@ -99,7 +99,7 @@
     */
    @Override
    public void renderIcon(GuiGraphics graphics, float brightness, int alpha) {
-      graphics.m_pycordis(f_jceldyls, 0, 0, 16, 16);
+      graphics.drawGuiTexture(f_jceldyls, 0, 0, 16, 16);
    }
 
    /**
@@ -125,7 +125,7 @@
        * @mapping {@literal hashed f_gilffkyr Lnet/minecraft/unmapped/C_oocustim$C_zkyqknpn;f_gilffkyr:Ljava/util/function/Supplier;}
        * @mapping {@literal named texture Lnet/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu$TeleportToSpecificTeamCommand;texture:Ljava/util/function/Supplier;}
        */
-      private final Supplier<C_idvschhb> texture;
+      private final Supplier<PlayerSkin> texture;
       /**
        * @mapping {@literal hashed f_jqytafgr Lnet/minecraft/unmapped/C_oocustim$C_zkyqknpn;f_jqytafgr:Ljava/util/List;}
        * @mapping {@literal named scoreboardEntries Lnet/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu$TeleportToSpecificTeamCommand;scoreboardEntries:Ljava/util/List;}
@@ -136,7 +136,7 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_oocustim$C_zkyqknpn;<init>(Lnet/minecraft/unmapped/C_dvkwmbxw;Ljava/util/List;Ljava/util/function/Supplier;)V}
        * @mapping {@literal named <init> Lnet/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu$TeleportToSpecificTeamCommand;<init>(Lnet/minecraft/scoreboard/Team;Ljava/util/List;Ljava/util/function/Supplier;)V}
        */
-      private TeleportToSpecificTeamCommand(Team team, List<PlayerListEntry> scoreboardEntries, Supplier<C_idvschhb> texture) {
+      private TeleportToSpecificTeamCommand(Team team, List<PlayerListEntry> scoreboardEntries, Supplier<PlayerSkin> texture) {
          this.team = team;
          this.scoreboardEntries = scoreboardEntries;
          this.texture = texture;
@@ -160,7 +160,7 @@
             return Optional.empty();
          } else {
             GameProfile gameProfile = ((PlayerListEntry)list.get(RandomGenerator.createLegacy().nextInt(list.size()))).getProfile();
-            Supplier<C_idvschhb> supplier = client.getSkinProvider().m_bopsjrvv(gameProfile);
+            Supplier<PlayerSkin> supplier = client.getSkinProvider().getSkinSupplier(gameProfile);
             return Optional.of(new TeamTeleportSpectatorMenu.TeleportToSpecificTeamCommand(team, list, supplier));
          }
       }
@@ -195,7 +195,7 @@
          }
 
          graphics.setShaderColor(brightness, brightness, brightness, (float)alpha / 255.0F);
-         PlayerFaceRenderer.m_rtszscfd(graphics, (C_idvschhb)this.texture.get(), 2, 2, 12);
+         PlayerFaceRenderer.draw(graphics, (PlayerSkin)this.texture.get(), 2, 2, 12);
          graphics.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
       }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu.java namedSrc/net/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu.java
--- namedTargetSrc/net/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu.java	2023-08-09 03:28:06.877868289 +0000
+++ namedSrc/net/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu.java	2023-08-09 03:26:33.306359006 +0000
@@ -99,7 +99,7 @@
     */
    @Override
    public void renderIcon(GuiGraphics graphics, float brightness, int alpha) {
-      graphics.m_pycordis(f_ajxcvery, 0, 0, 16, 16);
+      graphics.drawGuiTexture(f_ajxcvery, 0, 0, 16, 16);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand.java namedSrc/net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand.java
--- namedTargetSrc/net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand.java	2023-08-09 03:28:06.833868519 +0000
+++ namedSrc/net/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand.java	2023-08-09 03:26:33.254359278 +0000
@@ -7,9 +7,9 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.PlayerFaceRenderer;
+import net.minecraft.client.texture.PlayerSkin;
 import net.minecraft.network.packet.c2s.play.SpectatorTeleportationC2SPacket;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_idvschhb;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_ghlrelrn}
@@ -25,7 +25,7 @@
    /**
     * Mapping not found
     */
-   private final Supplier<C_idvschhb> f_ynfnbtru;
+   private final Supplier<PlayerSkin> f_ynfnbtru;
    /**
     * @mapping {@literal hashed f_kgwhdceb Lnet/minecraft/unmapped/C_ghlrelrn;f_kgwhdceb:Lnet/minecraft/unmapped/C_rdaqiwdt;}
     * @mapping {@literal named name Lnet/minecraft/client/gui/hud/spectator/TeleportToSpecificPlayerSpectatorCommand;name:Lnet/minecraft/text/Text;}
@@ -38,7 +38,7 @@
     */
    public TeleportToSpecificPlayerSpectatorCommand(GameProfile gameProfile) {
       this.gameProfile = gameProfile;
-      this.f_ynfnbtru = MinecraftClient.getInstance().getSkinProvider().m_bopsjrvv(gameProfile);
+      this.f_ynfnbtru = MinecraftClient.getInstance().getSkinProvider().getSkinSupplier(gameProfile);
       this.name = Text.literal(gameProfile.getName());
    }
 
@@ -64,7 +64,7 @@
    @Override
    public void renderIcon(GuiGraphics graphics, float brightness, int alpha) {
       graphics.setShaderColor(1.0F, 1.0F, 1.0F, (float)alpha / 255.0F);
-      PlayerFaceRenderer.m_rtszscfd(graphics, (C_idvschhb)this.f_ynfnbtru.get(), 2, 2, 12);
+      PlayerFaceRenderer.draw(graphics, (PlayerSkin)this.f_ynfnbtru.get(), 2, 2, 12);
       graphics.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/SpectatorHud.java namedSrc/net/minecraft/client/gui/hud/SpectatorHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/SpectatorHud.java	2023-08-09 03:28:06.801868686 +0000
+++ namedSrc/net/minecraft/client/gui/hud/SpectatorHud.java	2023-08-09 03:26:33.210359508 +0000
@@ -114,9 +114,9 @@
    protected void renderSpectatorMenu(GuiGraphics graphics, float alpha, int x, int y, SpectatorMenuState menuState) {
       RenderSystem.enableBlend();
       graphics.setShaderColor(1.0F, 1.0F, 1.0F, alpha);
-      graphics.m_pycordis(f_trziepdz, x - 91, y, 182, 22);
+      graphics.drawGuiTexture(f_trziepdz, x - 91, y, 182, 22);
       if (menuState.getSelectedSlot() >= 0) {
-         graphics.m_pycordis(f_cdjeafxi, x - 91 - 1 + menuState.getSelectedSlot() * 20, y - 1, 24, 23);
+         graphics.drawGuiTexture(f_cdjeafxi, x - 91 - 1 + menuState.getSelectedSlot() * 20, y - 1, 24, 23);
       }
 
       graphics.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
diff -bur namedTargetSrc/net/minecraft/client/gui/PlayerFaceRenderer.java namedSrc/net/minecraft/client/gui/PlayerFaceRenderer.java
--- namedTargetSrc/net/minecraft/client/gui/PlayerFaceRenderer.java	2023-08-09 03:28:06.833868519 +0000
+++ namedSrc/net/minecraft/client/gui/PlayerFaceRenderer.java	2023-08-09 03:26:33.250359299 +0000
@@ -3,7 +3,7 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.unmapped.C_idvschhb;
+import net.minecraft.client.texture.PlayerSkin;
 import net.minecraft.util.Identifier;
 
 /**
@@ -65,10 +65,10 @@
 
    /**
     * @mapping {@literal hashed m_rtszscfd Lnet/minecraft/unmapped/C_vefskfru;m_rtszscfd(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_idvschhb;III)V}
-    * @mapping {@literal named m_rtszscfd Lnet/minecraft/client/gui/PlayerFaceRenderer;m_rtszscfd(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_idvschhb;III)V}
+    * @mapping {@literal named draw Lnet/minecraft/client/gui/PlayerFaceRenderer;draw(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/texture/PlayerSkin;III)V}
     */
-   public static void m_rtszscfd(GuiGraphics graphics, C_idvschhb arg2, int i, int j, int k) {
-      draw(graphics, arg2.texture(), i, j, k);
+   public static void draw(GuiGraphics graphics, PlayerSkin skin, int x, int y, int size) {
+      draw(graphics, skin.texture(), x, y, size);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementTabType.java namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementTabType.java
--- namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementTabType.java	2023-08-09 03:28:06.893868206 +0000
+++ namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementTabType.java	2023-08-09 03:26:33.326358902 +0000
@@ -140,7 +140,7 @@
          lv2 = lv.middle();
       }
 
-      graphics.m_pycordis(lv2, x + this.getTabX(index), y + this.getTabY(index), this.width, this.height);
+      graphics.drawGuiTexture(lv2, x + this.getTabX(index), y + this.getTabY(index), this.width, this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java	2023-08-09 03:28:06.785868769 +0000
+++ namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java	2023-08-09 03:26:33.190359612 +0000
@@ -278,7 +278,7 @@
             lv = AdvancementObtainedStatus.UNOBTAINED;
          }
 
-         graphics.m_pycordis(lv.m_hajbibtv(this.display.getFrame()), x + this.x + 3, y + this.y, 26, 26);
+         graphics.drawGuiTexture(lv.m_hajbibtv(this.display.getFrame()), x + this.x + 3, y + this.y, 26, 26);
          graphics.drawItemWithoutEntity(this.display.getIcon(), x + this.x + 8, y + this.y + 5);
       }
 
@@ -359,15 +359,15 @@
       int s = 32 + this.description.size() * 9;
       if (!this.description.isEmpty()) {
          if (bl2) {
-            graphics.m_pycordis(f_gcsnmqoj, q, p + 26 - s, this.width, s);
+            graphics.drawGuiTexture(f_gcsnmqoj, q, p + 26 - s, this.width, s);
          } else {
-            graphics.m_pycordis(f_gcsnmqoj, q, p, this.width, s);
+            graphics.drawGuiTexture(f_gcsnmqoj, q, p, this.width, s);
          }
       }
 
-      graphics.m_gtwewgcz(lv.m_chrnijcb(), 200, 26, 0, 0, q, p, n, 26);
-      graphics.m_gtwewgcz(lv2.m_chrnijcb(), 200, 26, 200 - o, 0, q + n, p, o, 26);
-      graphics.m_pycordis(lv3.m_hajbibtv(this.display.getFrame()), originX + this.x + 3, originY + this.y, 26, 26);
+      graphics.drawGuiTexture(lv.m_chrnijcb(), 200, 26, 0, 0, q, p, n, 26);
+      graphics.drawGuiTexture(lv2.m_chrnijcb(), 200, 26, 200 - o, 0, q + n, p, o, 26);
+      graphics.drawGuiTexture(lv3.m_hajbibtv(this.display.getFrame()), originX + this.x + 3, originY + this.y, 26, 26);
       if (bl) {
          graphics.drawShadowedText(this.client.textRenderer, this.title, q + 5, originY + this.y + 9, -1);
          if (string != null) {
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/CustomizeFlatWorldScreen.java namedSrc/net/minecraft/client/gui/screen/CustomizeFlatWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/CustomizeFlatWorldScreen.java	2023-08-09 03:28:06.837868498 +0000
+++ namedSrc/net/minecraft/client/gui/screen/CustomizeFlatWorldScreen.java	2023-08-09 03:26:33.254359278 +0000
@@ -370,7 +370,7 @@
           * @mapping {@literal named renderIconBackgroundTexture Lnet/minecraft/client/gui/screen/CustomizeFlatWorldScreen$SuperflatLayersListWidget$SuperflatLayerEntry;renderIconBackgroundTexture(Lnet/minecraft/client/gui/GuiGraphics;II)V}
           */
          private void renderIconBackgroundTexture(GuiGraphics graphics, int x, int y) {
-            graphics.m_tfcymekl(CustomizeFlatWorldScreen.f_alguvrba, x, y, 0, 18, 18);
+            graphics.drawGuiTexture(CustomizeFlatWorldScreen.f_alguvrba, x, y, 0, 18, 18);
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/DeathScreen.java namedSrc/net/minecraft/client/gui/screen/DeathScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/DeathScreen.java	2023-08-09 03:28:06.897868185 +0000
+++ namedSrc/net/minecraft/client/gui/screen/DeathScreen.java	2023-08-09 03:26:33.330358881 +0000
@@ -163,7 +163,7 @@
       }
 
       if (this.titleScreenButton != null && this.client.getChatReportingContext().hasDraftReport()) {
-         graphics.m_pycordis(f_ndmtqjyt, this.titleScreenButton.getX() + this.titleScreenButton.getWidth() - 17, this.titleScreenButton.getY() + 3, 15, 15);
+         graphics.drawGuiTexture(f_ndmtqjyt, this.titleScreenButton.getX() + this.titleScreenButton.getWidth() - 17, this.titleScreenButton.getY() + 3, 15, 15);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/GameMenuScreen.java namedSrc/net/minecraft/client/gui/screen/GameMenuScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/GameMenuScreen.java	2023-08-09 03:28:06.841868477 +0000
+++ namedSrc/net/minecraft/client/gui/screen/GameMenuScreen.java	2023-08-09 03:26:33.262359236 +0000
@@ -227,7 +227,7 @@
    public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
       super.render(graphics, mouseX, mouseY, delta);
       if (this.showMenu && this.client != null && this.client.getChatReportingContext().hasDraftReport() && this.reportButton != null) {
-         graphics.m_pycordis(f_igrcbiod, this.reportButton.getX() + this.reportButton.getWidth() - 17, this.reportButton.getY() + 3, 15, 15);
+         graphics.drawGuiTexture(f_igrcbiod, this.reportButton.getX() + this.reportButton.getWidth() - 17, this.reportButton.getY() + 3, 15, 15);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/GameModeSelectionScreen.java namedSrc/net/minecraft/client/gui/screen/GameModeSelectionScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/GameModeSelectionScreen.java	2023-08-09 03:28:06.837868498 +0000
+++ namedSrc/net/minecraft/client/gui/screen/GameModeSelectionScreen.java	2023-08-09 03:26:33.254359278 +0000
@@ -315,7 +315,7 @@
        * @mapping {@literal named drawBackground Lnet/minecraft/client/gui/screen/GameModeSelectionScreen$ButtonWidget;drawBackground(Lnet/minecraft/client/gui/GuiGraphics;)V}
        */
       private void drawBackground(GuiGraphics graphics) {
-         graphics.m_pycordis(GameModeSelectionScreen.f_cfyxaade, this.getX(), this.getY(), 26, 26);
+         graphics.drawGuiTexture(GameModeSelectionScreen.f_cfyxaade, this.getX(), this.getY(), 26, 26);
       }
 
       /**
@@ -323,7 +323,7 @@
        * @mapping {@literal named drawSelectionBox Lnet/minecraft/client/gui/screen/GameModeSelectionScreen$ButtonWidget;drawSelectionBox(Lnet/minecraft/client/gui/GuiGraphics;)V}
        */
       private void drawSelectionBox(GuiGraphics graphics) {
-         graphics.m_pycordis(GameModeSelectionScreen.f_fsjyqabz, this.getX(), this.getY(), 26, 26);
+         graphics.drawGuiTexture(GameModeSelectionScreen.f_fsjyqabz, this.getX(), this.getY(), 26, 26);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.java	2023-08-09 03:28:06.781868790 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/AbstractFurnaceScreen.java	2023-08-09 03:26:33.190359612 +0000
@@ -112,11 +112,11 @@
       graphics.drawTexture(this.background, k, l, 0, 0, this.backgroundWidth, this.backgroundHeight);
       if (this.handler.isBurning()) {
          int m = this.handler.getFuelProgress();
-         graphics.m_gtwewgcz(this.f_pleoyvmd, 14, 14, 0, 12 - m, k + 56, l + 36 + 12 - m, 14, m + 1);
+         graphics.drawGuiTexture(this.f_pleoyvmd, 14, 14, 0, 12 - m, k + 56, l + 36 + 12 - m, 14, m + 1);
       }
 
       int n = this.handler.getCookProgress();
-      graphics.m_gtwewgcz(this.f_cwmddelf, 24, 16, 0, 0, k + 79, l + 34, n + 1, 16);
+      graphics.drawGuiTexture(this.f_cwmddelf, 24, 16, 0, 0, k + 79, l + 34, n + 1, 16);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.java	2023-08-09 03:28:06.865868352 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.java	2023-08-09 03:26:33.290359090 +0000
@@ -109,9 +109,9 @@
 
       for (StatusEffectInstance lv : statusEffects) {
          if (wide) {
-            graphics.m_pycordis(f_acjatqul, x, k, 120, 32);
+            graphics.drawGuiTexture(f_acjatqul, x, k, 120, 32);
          } else {
-            graphics.m_pycordis(f_gofjfrqt, x, k, 32, 32);
+            graphics.drawGuiTexture(f_gofjfrqt, x, k, 32, 32);
          }
 
          k += height;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/AnvilScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/AnvilScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/AnvilScreen.java	2023-08-09 03:28:06.897868185 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/AnvilScreen.java	2023-08-09 03:26:33.334358860 +0000
@@ -162,7 +162,7 @@
    @Override
    protected void drawBackground(GuiGraphics graphics, float delta, int mouseX, int mouseY) {
       super.drawBackground(graphics, delta, mouseX, mouseY);
-      graphics.m_pycordis(this.handler.getSlot(0).hasStack() ? f_ukpkgwte : f_ggwfhxke, this.x + 59, this.y + 20, 110, 16);
+      graphics.drawGuiTexture(this.handler.getSlot(0).hasStack() ? f_ukpkgwte : f_ggwfhxke, this.x + 59, this.y + 20, 110, 16);
    }
 
    /**
@@ -179,7 +179,7 @@
    @Override
    protected void renderIcon(GuiGraphics graphics, int x, int y) {
       if ((this.handler.getSlot(0).hasStack() || this.handler.getSlot(1).hasStack()) && !this.handler.getSlot(this.handler.getResultSlotIndex()).hasStack()) {
-         graphics.m_pycordis(f_ilyhrskz, x + 99, y + 45, 28, 21);
+         graphics.drawGuiTexture(f_ilyhrskz, x + 99, y + 45, 28, 21);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java	2023-08-09 03:28:06.805868665 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java	2023-08-09 03:26:33.214359487 +0000
@@ -264,7 +264,7 @@
             lv = BeaconScreen.f_sutgxpqf;
          }
 
-         graphics.m_pycordis(lv, this.getX(), this.getY(), this.width, this.height);
+         graphics.drawGuiTexture(lv, this.getX(), this.getY(), this.width, this.height);
          this.renderExtra(graphics);
       }
 
@@ -498,7 +498,7 @@
        */
       @Override
       protected void renderExtra(GuiGraphics graphics) {
-         graphics.m_pycordis(this.f_uivjzuji, this.getX() + 2, this.getY() + 2, 18, 18);
+         graphics.drawGuiTexture(this.f_uivjzuji, this.getX() + 2, this.getY() + 2, 18, 18);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/BookEditScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/BookEditScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/BookEditScreen.java	2023-08-09 03:28:06.873868310 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BookEditScreen.java	2023-08-09 03:26:33.302359027 +0000
@@ -455,23 +455,23 @@
          this.currentPageSelectionManager.cut();
          return true;
       } else {
-         SelectionManager.C_tsgglpov lv = Screen.hasControlDown() ? SelectionManager.C_tsgglpov.WORD : SelectionManager.C_tsgglpov.CHARACTER;
+         SelectionManager.SelectionType lv = Screen.hasControlDown() ? SelectionManager.SelectionType.WORD : SelectionManager.SelectionType.CHARACTER;
          switch (keyCode) {
             case 257:
             case 335:
                this.currentPageSelectionManager.insert("\n");
                return true;
             case 259:
-               this.currentPageSelectionManager.m_lrfqzsrp(-1, lv);
+               this.currentPageSelectionManager.delete(-1, lv);
                return true;
             case 261:
-               this.currentPageSelectionManager.m_lrfqzsrp(1, lv);
+               this.currentPageSelectionManager.delete(1, lv);
                return true;
             case 262:
-               this.currentPageSelectionManager.m_izxhtejg(1, Screen.hasShiftDown(), lv);
+               this.currentPageSelectionManager.moveCursor(1, Screen.hasShiftDown(), lv);
                return true;
             case 263:
-               this.currentPageSelectionManager.m_izxhtejg(-1, Screen.hasShiftDown(), lv);
+               this.currentPageSelectionManager.moveCursor(-1, Screen.hasShiftDown(), lv);
                return true;
             case 264:
                this.moveDownLine();
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.java	2023-08-09 03:28:06.885868248 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.java	2023-08-09 03:26:33.318358944 +0000
@@ -75,19 +75,19 @@
       int m = this.handler.getFuel();
       int n = MathHelper.clamp((18 * m + 20 - 1) / 20, 0, 18);
       if (n > 0) {
-         graphics.m_gtwewgcz(f_qmjmxtvi, 18, 4, 0, 0, k + 60, l + 44, n, 4);
+         graphics.drawGuiTexture(f_qmjmxtvi, 18, 4, 0, 0, k + 60, l + 44, n, 4);
       }
 
       int o = this.handler.getBrewTime();
       if (o > 0) {
          int p = (int)(28.0F * (1.0F - (float)o / 400.0F));
          if (p > 0) {
-            graphics.m_gtwewgcz(f_tgpitlwz, 9, 28, 0, 0, k + 97, l + 16, 9, p);
+            graphics.drawGuiTexture(f_tgpitlwz, 9, 28, 0, 0, k + 97, l + 16, 9, p);
          }
 
          p = BUBBLE_PROGRESS[o / 2 % 7];
          if (p > 0) {
-            graphics.m_gtwewgcz(f_tsmrkuqr, 12, 29, 0, 29 - p, k + 63, l + 14 + 29 - p, 12, p);
+            graphics.drawGuiTexture(f_tsmrkuqr, 12, 29, 0, 29 - p, k + 63, l + 14 + 29 - p, 12, p);
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java	2023-08-09 03:28:06.797868707 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java	2023-08-09 03:26:33.206359528 +0000
@@ -86,13 +86,13 @@
             if (lv3.locked) {
                bl4 = true;
                if (bl2 || bl3) {
-                  graphics.m_pycordis(f_yhrlneie, k + 35, l + 31, 28, 21);
+                  graphics.drawGuiTexture(f_yhrlneie, k + 35, l + 31, 28, 21);
                }
             }
 
             if (bl2 && lv3.scale >= 4) {
                bl4 = true;
-               graphics.m_pycordis(f_yhrlneie, k + 35, l + 31, 28, 21);
+               graphics.drawGuiTexture(f_yhrlneie, k + 35, l + 31, 28, 21);
             }
          }
       } else {
@@ -113,25 +113,25 @@
       int i = this.x;
       int j = this.y;
       if (expandMode && !cannotExpand) {
-         graphics.m_pycordis(f_xdlypaxp, i + 67, j + 13, 66, 66);
+         graphics.drawGuiTexture(f_xdlypaxp, i + 67, j + 13, 66, 66);
          this.drawMap(graphics, mapId, mapState, i + 85, j + 31, 0.226F);
       } else if (cloneMode) {
-         graphics.m_pycordis(f_ugqbcczl, i + 67 + 16, j + 13, 50, 66);
+         graphics.drawGuiTexture(f_ugqbcczl, i + 67 + 16, j + 13, 50, 66);
          this.drawMap(graphics, mapId, mapState, i + 86, j + 16, 0.34F);
          graphics.getMatrices().push();
          graphics.getMatrices().translate(0.0F, 0.0F, 1.0F);
-         graphics.m_pycordis(f_ugqbcczl, i + 67, j + 13 + 16, 50, 66);
+         graphics.drawGuiTexture(f_ugqbcczl, i + 67, j + 13 + 16, 50, 66);
          this.drawMap(graphics, mapId, mapState, i + 70, j + 32, 0.34F);
          graphics.getMatrices().pop();
       } else if (lockMode) {
-         graphics.m_pycordis(f_sfkketuy, i + 67, j + 13, 66, 66);
+         graphics.drawGuiTexture(f_sfkketuy, i + 67, j + 13, 66, 66);
          this.drawMap(graphics, mapId, mapState, i + 71, j + 17, 0.45F);
          graphics.getMatrices().push();
          graphics.getMatrices().translate(0.0F, 0.0F, 1.0F);
-         graphics.m_pycordis(f_ybhadfiz, i + 118, j + 60, 10, 14);
+         graphics.drawGuiTexture(f_ybhadfiz, i + 118, j + 60, 10, 14);
          graphics.getMatrices().pop();
       } else {
-         graphics.m_pycordis(f_sfkketuy, i + 67, j + 13, 66, 66);
+         graphics.drawGuiTexture(f_sfkketuy, i + 67, j + 13, 66, 66);
          this.drawMap(graphics, mapId, mapState, i + 71, j + 17, 0.45F);
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2023-08-09 03:28:06.805868665 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2023-08-09 03:26:33.214359487 +0000
@@ -915,7 +915,7 @@
       int m = l + 112;
       if (selectedTab.hasScrollbar()) {
          Identifier lv2 = this.hasScrollbar() ? f_gghfeqtx : f_ftbqkbjy;
-         graphics.m_pycordis(lv2, k, l + (int)((float)(m - l - 17) * this.scrollPosition), 12, 15);
+         graphics.drawGuiTexture(lv2, k, l + (int)((float)(m - l - 17) * this.scrollPosition), 12, 15);
       }
 
       this.renderTabIcon(graphics, selectedTab);
@@ -996,7 +996,7 @@
          lvs = bl ? f_jpwzikiu : f_hgnyxfmt;
       }
 
-      graphics.m_pycordis(lvs[MathHelper.clamp(i, 0, lvs.length)], j, k, 26, 32);
+      graphics.drawGuiTexture(lvs[MathHelper.clamp(i, 0, lvs.length)], j, k, 26, 32);
       graphics.getMatrices().push();
       graphics.getMatrices().translate(0.0F, 0.0F, 100.0F);
       j += 5;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java	2023-08-09 03:28:06.821868581 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java	2023-08-09 03:26:33.230359403 +0000
@@ -182,28 +182,28 @@
          int p = o + 20;
          int q = this.handler.enchantmentPower[n];
          if (q == 0) {
-            graphics.m_pycordis(f_jgfgisgp, o, l + 14 + 19 * n, 108, 19);
+            graphics.drawGuiTexture(f_jgfgisgp, o, l + 14 + 19 * n, 108, 19);
          } else {
             String string = q + "";
             int r = 86 - this.textRenderer.getWidth(string);
             StringVisitable lv = EnchantingPhrases.getInstance().generatePhrase(this.textRenderer, r);
             int s = 6839882;
             if ((m < n + 1 || this.client.player.experienceLevel < q) && !this.client.player.getAbilities().creativeMode) {
-               graphics.m_pycordis(f_jgfgisgp, o, l + 14 + 19 * n, 108, 19);
-               graphics.m_pycordis(f_lbjhibdo[n], o + 1, l + 15 + 19 * n, 16, 16);
+               graphics.drawGuiTexture(f_jgfgisgp, o, l + 14 + 19 * n, 108, 19);
+               graphics.drawGuiTexture(f_lbjhibdo[n], o + 1, l + 15 + 19 * n, 16, 16);
                graphics.drawTextWrapped(this.textRenderer, lv, p, l + 16 + 19 * n, r, (s & 16711422) >> 1);
                s = 4226832;
             } else {
                int t = mouseX - (k + 60);
                int u = mouseY - (l + 14 + 19 * n);
                if (t >= 0 && u >= 0 && t < 108 && u < 19) {
-                  graphics.m_pycordis(f_zzrxagqq, o, l + 14 + 19 * n, 108, 19);
+                  graphics.drawGuiTexture(f_zzrxagqq, o, l + 14 + 19 * n, 108, 19);
                   s = 16777088;
                } else {
-                  graphics.m_pycordis(f_clsuxbnv, o, l + 14 + 19 * n, 108, 19);
+                  graphics.drawGuiTexture(f_clsuxbnv, o, l + 14 + 19 * n, 108, 19);
                }
 
-               graphics.m_pycordis(f_hyofcfmh[n], o + 1, l + 15 + 19 * n, 16, 16);
+               graphics.drawGuiTexture(f_hyofcfmh[n], o + 1, l + 15 + 19 * n, 16, 16);
                graphics.drawTextWrapped(this.textRenderer, lv, p, l + 16 + 19 * n, r, s);
                s = 8453920;
             }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.java	2023-08-09 03:28:06.829868540 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.java	2023-08-09 03:26:33.246359320 +0000
@@ -50,7 +50,7 @@
       int l = (this.height - this.backgroundHeight) / 2;
       graphics.drawTexture(TEXTURE, k, l, 0, 0, this.backgroundWidth, this.backgroundHeight);
       if ((this.handler.getSlot(0).hasStack() || this.handler.getSlot(1).hasStack()) && !this.handler.getSlot(2).hasStack()) {
-         graphics.m_pycordis(f_eusrygwf, k + 92, l + 31, 28, 21);
+         graphics.drawGuiTexture(f_eusrygwf, k + 92, l + 31, 28, 21);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/HorseScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/HorseScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/HorseScreen.java	2023-08-09 03:28:06.889868227 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/HorseScreen.java	2023-08-09 03:26:33.322358923 +0000
@@ -71,18 +71,18 @@
       int l = (this.height - this.backgroundHeight) / 2;
       graphics.drawTexture(TEXTURE, k, l, 0, 0, this.backgroundWidth, this.backgroundHeight);
       if (this.entity instanceof AbstractDonkeyEntity lv && lv.hasChest()) {
-         graphics.m_gtwewgcz(f_fsjkvqgx, 90, 54, 0, 0, k + 79, l + 17, lv.getInventoryColumns() * 18, 54);
+         graphics.drawGuiTexture(f_fsjkvqgx, 90, 54, 0, 0, k + 79, l + 17, lv.getInventoryColumns() * 18, 54);
       }
 
       if (this.entity.canBeSaddled()) {
-         graphics.m_pycordis(f_chessimq, k + 7, l + 35 - 18, 18, 18);
+         graphics.drawGuiTexture(f_chessimq, k + 7, l + 35 - 18, 18, 18);
       }
 
       if (this.entity.hasArmorSlot()) {
          if (this.entity instanceof LlamaEntity) {
-            graphics.m_pycordis(f_xmamuaod, k + 7, l + 35, 18, 18);
+            graphics.drawGuiTexture(f_xmamuaod, k + 7, l + 35, 18, 18);
          } else {
-            graphics.m_pycordis(f_cygpwhbl, k + 7, l + 35, 18, 18);
+            graphics.drawGuiTexture(f_cygpwhbl, k + 7, l + 35, 18, 18);
          }
       }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/LoomScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/LoomScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/LoomScreen.java	2023-08-09 03:28:06.881868268 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/LoomScreen.java	2023-08-09 03:26:33.310358985 +0000
@@ -219,20 +219,20 @@
       Slot lv2 = this.handler.getDyeSlot();
       Slot lv3 = this.handler.getPatternSlot();
       if (!lv.hasStack()) {
-         graphics.m_pycordis(f_qrbxxeam, k + lv.x, l + lv.y, 16, 16);
+         graphics.drawGuiTexture(f_qrbxxeam, k + lv.x, l + lv.y, 16, 16);
       }
 
       if (!lv2.hasStack()) {
-         graphics.m_pycordis(f_mwmypzji, k + lv2.x, l + lv2.y, 16, 16);
+         graphics.drawGuiTexture(f_mwmypzji, k + lv2.x, l + lv2.y, 16, 16);
       }
 
       if (!lv3.hasStack()) {
-         graphics.m_pycordis(f_srhbhagj, k + lv3.x, l + lv3.y, 16, 16);
+         graphics.drawGuiTexture(f_srhbhagj, k + lv3.x, l + lv3.y, 16, 16);
       }
 
       int m = (int)(41.0F * this.scrollPosition);
       Identifier lv4 = this.canApplyDyePattern ? f_rawpajmx : f_wqbgivcn;
-      graphics.m_pycordis(lv4, k + 119, l + 13 + m, 12, 15);
+      graphics.drawGuiTexture(lv4, k + 119, l + 13 + m, 12, 15);
       DiffuseLighting.setupFlatGuiLighting();
       if (this.bannerPatterns != null && !this.hasTooManyPatterns) {
          graphics.getMatrices().push();
@@ -283,7 +283,7 @@
                   lv5 = f_olbvepik;
                }
 
-               graphics.m_pycordis(lv5, t, u, 14, 14);
+               graphics.drawGuiTexture(lv5, t, u, 14, 14);
                this.drawBanner(graphics, (Holder<BannerPattern>)list.get(s), t, u);
             }
          }

github-actions · 2023-08-09T03:28:12Z

View the diff here (3/3):

diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/MerchantScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/MerchantScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/MerchantScreen.java	2023-08-09 03:28:06.881868268 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/MerchantScreen.java	2023-08-09 03:26:33.310358985 +0000
@@ -268,7 +268,7 @@
 
          TradeOffer lv2 = (TradeOffer)lv.get(m);
          if (lv2.isDisabled()) {
-            graphics.m_tfcymekl(f_aetjxctp, this.x + 83 + 99, this.y + 35, 0, 28, 21);
+            graphics.drawGuiTexture(f_aetjxctp, this.x + 83 + 99, this.y + 35, 0, 28, 21);
          }
       }
    }
@@ -281,17 +281,17 @@
       int k = this.handler.getLevelProgress();
       int l = this.handler.getExperience();
       if (k < 5) {
-         graphics.m_tfcymekl(f_ailpuxlr, x + 136, y + 16, 0, 102, 5);
+         graphics.drawGuiTexture(f_ailpuxlr, x + 136, y + 16, 0, 102, 5);
          int m = VillagerData.getLowerLevelExperience(k);
          if (l >= m && VillagerData.canLevelUp(k)) {
             int n = 102;
             float f = 102.0F / (float)(VillagerData.getUpperLevelExperience(k) - m);
             int o = Math.min(MathHelper.floor(f * (float)(l - m)), 102);
-            graphics.m_gxfmwcnk(f_njkukxiz, 102, 5, 0, 0, x + 136, y + 16, 0, o, 5);
+            graphics.drawGuiTexture(f_njkukxiz, 102, 5, 0, 0, x + 136, y + 16, 0, o, 5);
             int p = this.handler.getMerchantRewardedExperience();
             if (p > 0) {
                int q = Math.min(MathHelper.floor((float)p * f), 102 - o);
-               graphics.m_gxfmwcnk(f_ecsnqact, 102, 5, o, 0, x + 136 + o, y + 16, 0, q, 5);
+               graphics.drawGuiTexture(f_ecsnqact, 102, 5, o, 0, x + 136 + o, y + 16, 0, q, 5);
             }
          }
       }
@@ -312,9 +312,9 @@
             o = 113;
          }
 
-         graphics.m_tfcymekl(f_kpwxonuc, x + 94, y + 18 + o, 0, 6, 27);
+         graphics.drawGuiTexture(f_kpwxonuc, x + 94, y + 18 + o, 0, 6, 27);
       } else {
-         graphics.m_tfcymekl(f_lrtwadxh, x + 94, y + 18, 0, 6, 27);
+         graphics.drawGuiTexture(f_lrtwadxh, x + 94, y + 18, 0, 6, 27);
       }
    }
 
@@ -390,9 +390,9 @@
    private void renderArrow(GuiGraphics graphics, TradeOffer tradeOffer, int x, int y) {
       RenderSystem.enableBlend();
       if (tradeOffer.isDisabled()) {
-         graphics.m_tfcymekl(f_ijrzmxjo, x + 5 + 35 + 20, y + 3, 0, 10, 9);
+         graphics.drawGuiTexture(f_ijrzmxjo, x + 5 + 35 + 20, y + 3, 0, 10, 9);
       } else {
-         graphics.m_tfcymekl(f_tjxbjbvb, x + 5 + 35 + 20, y + 3, 0, 10, 9);
+         graphics.drawGuiTexture(f_tjxbjbvb, x + 5 + 35 + 20, y + 3, 0, 10, 9);
       }
    }
 
@@ -409,7 +409,7 @@
          graphics.drawItemInSlot(this.textRenderer, adjustedFirstBuyItem, x + 14, y, adjustedFirstBuyItem.getCount() == 1 ? "1" : null);
          graphics.getMatrices().push();
          graphics.getMatrices().translate(0.0F, 0.0F, 300.0F);
-         graphics.m_tfcymekl(f_cwhnqqng, x + 7, y + 12, 0, 9, 2);
+         graphics.drawGuiTexture(f_cwhnqqng, x + 7, y + 12, 0, 9, 2);
          graphics.getMatrices().pop();
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2023-08-09 03:28:06.865868352 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2023-08-09 03:26:33.290359090 +0000
@@ -258,7 +258,7 @@
    @Override
    protected void renderIcon(GuiGraphics graphics, int x, int y) {
       if (this.isRecipeError()) {
-         graphics.m_pycordis(f_faboauvc, x + 65, y + 46, 28, 21);
+         graphics.drawGuiTexture(f_faboauvc, x + 65, y + 46, 28, 21);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/StonecutterScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/StonecutterScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/StonecutterScreen.java	2023-08-09 03:28:06.789868748 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/StonecutterScreen.java	2023-08-09 03:26:33.194359591 +0000
@@ -140,7 +140,7 @@
       graphics.drawTexture(TEXTURE, k, l, 0, 0, this.backgroundWidth, this.backgroundHeight);
       int m = (int)(41.0F * this.scrollAmount);
       Identifier lv = this.shouldScroll() ? f_ojfpwums : f_jwcdznek;
-      graphics.m_pycordis(lv, k + 119, l + 15 + m, 12, 15);
+      graphics.drawGuiTexture(lv, k + 119, l + 15 + m, 12, 15);
       int n = this.x + 52;
       int o = this.y + 14;
       int p = this.scrollOffset + 12;
@@ -190,7 +190,7 @@
             lv = f_psyjlwab;
          }
 
-         graphics.m_pycordis(lv, p, r - 1, 16, 18);
+         graphics.drawGuiTexture(lv, p, r - 1, 16, 18);
       }
    }
 
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-09 03:28:06.897868185 +0000
+++ namedSrc/net/minecraft/client/gui/screen/multiplayer/ChatSelectionLogFiller.java	2023-08-09 03:26:33.330358881 +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/multiplayer/ChatSelectionScreen.java namedSrc/net/minecraft/client/gui/screen/multiplayer/ChatSelectionScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/ChatSelectionScreen.java	2023-08-09 03:28:06.873868310 +0000
+++ namedSrc/net/minecraft/client/gui/screen/multiplayer/ChatSelectionScreen.java	2023-08-09 03:26:33.302359027 +0000
@@ -23,11 +23,11 @@
 import net.minecraft.client.multiplayer.report.chat.ChatReportBuilder;
 import net.minecraft.client.multiplayer.report.chat.ChatReportingContext;
 import net.minecraft.client.network.TrustLevel;
+import net.minecraft.client.texture.PlayerSkin;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.StringVisitable;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_idvschhb;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Language;
@@ -458,7 +458,7 @@
           * @mapping {@literal hashed f_kraunuxu Lnet/minecraft/unmapped/C_pcqupwtw$C_rfvspxnz$C_tnzdhanf;f_kraunuxu:Ljava/util/function/Supplier;}
           * @mapping {@literal named skinTexture Lnet/minecraft/client/gui/screen/multiplayer/ChatSelectionScreen$SelectionList$HeadingEntry;skinTexture:Ljava/util/function/Supplier;}
           */
-         private final Supplier<C_idvschhb> skinTexture;
+         private final Supplier<PlayerSkin> skinTexture;
          /**
           * @mapping {@literal hashed f_kcyleaof Lnet/minecraft/unmapped/C_pcqupwtw$C_rfvspxnz$C_tnzdhanf;f_kcyleaof:Z}
           * @mapping {@literal named selected Lnet/minecraft/client/gui/screen/multiplayer/ChatSelectionScreen$SelectionList$HeadingEntry;selected:Z}
@@ -472,7 +472,7 @@
          public HeadingEntry(GameProfile profile, Text message, boolean selected) {
             this.message = message;
             this.selected = selected;
-            this.skinTexture = SelectionList.this.client.getSkinProvider().m_bopsjrvv(profile);
+            this.skinTexture = SelectionList.this.client.getSkinProvider().getSkinSupplier(profile);
          }
 
          /**
@@ -484,7 +484,7 @@
          ) {
             int p = x - 12 - 4;
             int q = y + (entryHeight - 12) / 2;
-            PlayerFaceRenderer.m_rtszscfd(graphics, (C_idvschhb)this.skinTexture.get(), p, q, 12);
+            PlayerFaceRenderer.draw(graphics, (PlayerSkin)this.skinTexture.get(), p, q, 12);
             int r = y + 1 + (entryHeight - 9) / 2;
             graphics.drawShadowedText(ChatSelectionScreen.this.textRenderer, this.message, x, r, this.selected ? -1 : -1593835521);
          }
@@ -630,7 +630,7 @@
          private void drawCheckmark(GuiGraphics graphics, int y, int x, int entryHeight) {
             int m = y + (entryHeight - 8) / 2;
             RenderSystem.enableBlend();
-            graphics.m_pycordis(ChatSelectionScreen.f_nilrvbgt, x, m, 9, 8);
+            graphics.drawGuiTexture(ChatSelectionScreen.f_nilrvbgt, x, m, 9, 8);
             RenderSystem.disableBlend();
          }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.java namedSrc/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.java	2023-08-09 03:28:06.853868414 +0000
+++ namedSrc/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.java	2023-08-09 03:26:33.278359153 +0000
@@ -596,7 +596,7 @@
             list2 = Collections.emptyList();
          }
 
-         graphics.m_pycordis(lv2, x + entryWidth - 15, y, 10, 8);
+         graphics.drawGuiTexture(lv2, x + entryWidth - 15, y, 10, 8);
          byte[] bs = this.server.getFavicon();
          if (!Arrays.equals(bs, this.favicon)) {
             if (this.isNewIconValid(bs)) {
@@ -622,25 +622,25 @@
             int v = mouseY - y;
             if (this.canConnect()) {
                if (u < 32 && u > 16) {
-                  graphics.m_pycordis(MultiplayerServerListWidget.f_ktbjbgrz, x, y, 32, 32);
+                  graphics.drawGuiTexture(MultiplayerServerListWidget.f_ktbjbgrz, x, y, 32, 32);
                } else {
-                  graphics.m_pycordis(MultiplayerServerListWidget.f_lbtrvgnl, x, y, 32, 32);
+                  graphics.drawGuiTexture(MultiplayerServerListWidget.f_lbtrvgnl, x, y, 32, 32);
                }
             }
 
             if (index > 0) {
                if (u < 16 && v < 16) {
-                  graphics.m_pycordis(MultiplayerServerListWidget.f_ndjvvmpo, x, y, 32, 32);
+                  graphics.drawGuiTexture(MultiplayerServerListWidget.f_ndjvvmpo, x, y, 32, 32);
                } else {
-                  graphics.m_pycordis(MultiplayerServerListWidget.f_idnslvgc, x, y, 32, 32);
+                  graphics.drawGuiTexture(MultiplayerServerListWidget.f_idnslvgc, x, y, 32, 32);
                }
             }
 
             if (index < this.screen.getServerList().size() - 1) {
                if (u < 16 && v > 16) {
-                  graphics.m_pycordis(MultiplayerServerListWidget.f_xuvttrec, x, y, 32, 32);
+                  graphics.drawGuiTexture(MultiplayerServerListWidget.f_xuvttrec, x, y, 32, 32);
                } else {
-                  graphics.m_pycordis(MultiplayerServerListWidget.f_cmlwpjvh, x, y, 32, 32);
+                  graphics.drawGuiTexture(MultiplayerServerListWidget.f_cmlwpjvh, x, y, 32, 32);
                }
             }
          }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.java namedSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.java
--- namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.java	2023-08-09 03:28:06.801868686 +0000
+++ namedSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry.java	2023-08-09 03:26:33.206359528 +0000
@@ -19,12 +19,12 @@
 import net.minecraft.client.gui.widget.TexturedButtonWidget;
 import net.minecraft.client.multiplayer.report.chat.ChatReportingContext;
 import net.minecraft.client.network.SocialInteractionsManager;
+import net.minecraft.client.texture.PlayerSkin;
 import net.minecraft.client.util.ColorUtil;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_fajlgudl;
-import net.minecraft.unmapped.C_idvschhb;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
@@ -88,7 +88,7 @@
     * @mapping {@literal hashed f_cegyjxex Lnet/minecraft/unmapped/C_wolpvava;f_cegyjxex:Ljava/util/function/Supplier;}
     * @mapping {@literal named skinTexture Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;skinTexture:Ljava/util/function/Supplier;}
     */
-   private final Supplier<C_idvschhb> skinTexture;
+   private final Supplier<PlayerSkin> skinTexture;
    /**
     * @mapping {@literal hashed f_edbalobk Lnet/minecraft/unmapped/C_wolpvava;f_edbalobk:Z}
     * @mapping {@literal named offline Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;offline:Z}
@@ -233,7 +233,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListEntry;<init>(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen;Ljava/util/UUID;Ljava/lang/String;Ljava/util/function/Supplier;Z)V}
     */
    public SocialInteractionsPlayerListEntry(
-      MinecraftClient client, SocialInteractionsScreen parent, UUID uuid, String name, Supplier<C_idvschhb> skinTexture, boolean reportable
+      MinecraftClient client, SocialInteractionsScreen parent, UUID uuid, String name, Supplier<PlayerSkin> skinTexture, boolean reportable
    ) {
       this.client = client;
       this.uuid = uuid;
@@ -341,7 +341,7 @@
          graphics.drawText(this.client.textRenderer, lv, r, s + 12, LIGHT_GRAY_COLOR, false);
       }
 
-      PlayerFaceRenderer.m_rtszscfd(graphics, (C_idvschhb)this.skinTexture.get(), p, q, 24);
+      PlayerFaceRenderer.draw(graphics, (PlayerSkin)this.skinTexture.get(), p, q, 24);
       graphics.drawText(this.client.textRenderer, this.name, r, s, WHITE_COLOR, false);
       if (this.offline) {
          graphics.fill(p, q, p + 24, q + 24, BLACK_COLOR);
@@ -364,7 +364,7 @@
       }
 
       if (this.hasDraftReport && this.reportButton != null) {
-         graphics.m_pycordis(f_ieinirqc, this.reportButton.getX() + 5, this.reportButton.getY() + 1, 15, 15);
+         graphics.drawGuiTexture(f_ieinirqc, this.reportButton.getX() + 5, this.reportButton.getY() + 1, 15, 15);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.java namedSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.java	2023-08-09 03:28:06.873868310 +0000
+++ namedSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.java	2023-08-09 03:26:33.302359027 +0000
@@ -106,7 +106,7 @@
                gameProfile.getId(),
                uuid -> {
                   SocialInteractionsPlayerListEntry lvx = new SocialInteractionsPlayerListEntry(
-                     this.client, this.parent, gameProfile.getId(), gameProfile.getName(), this.client.getSkinProvider().m_bopsjrvv(gameProfile), true
+                     this.client, this.parent, gameProfile.getId(), gameProfile.getName(), this.client.getSkinProvider().getSkinSupplier(gameProfile), true
                   );
                   lvx.setOffline(true);
                   return lvx;
@@ -149,7 +149,7 @@
     */
    private void sortPlayers() {
       this.players.sort(Comparator.comparing(arg -> {
-         if (this.client.m_feekilwg(arg.getUuid())) {
+         if (this.client.isCurrentPlayer(arg.getUuid())) {
             return 0;
          } else if (arg.getUuid().version() == 2) {
             return 4;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.java namedSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.java	2023-08-09 03:28:06.905868143 +0000
+++ namedSrc/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsScreen.java	2023-08-09 03:26:33.338358839 +0000
@@ -346,8 +346,8 @@
    public void renderBackground(GuiGraphics graphics, int i, int j, float f) {
       int k = this.getXMargin() + 3;
       super.renderBackground(graphics, i, j, f);
-      graphics.m_pycordis(f_eyoclwvf, k, 64, 236, this.getWindowHeight() + 16);
-      graphics.m_pycordis(f_crmfxscu, k + 10, 76, 12, 12);
+      graphics.drawGuiTexture(f_eyoclwvf, k, 64, 236, this.getWindowHeight() + 16);
+      graphics.drawGuiTexture(f_crmfxscu, k + 10, 76, 12, 12);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/pack/PackListWidget.java namedSrc/net/minecraft/client/gui/screen/pack/PackListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/pack/PackListWidget.java	2023-08-09 03:28:06.885868248 +0000
+++ namedSrc/net/minecraft/client/gui/screen/pack/PackListWidget.java	2023-08-09 03:26:33.314358965 +0000
@@ -272,32 +272,32 @@
 
             if (this.pack.canBeEnabled()) {
                if (p < 32) {
-                  graphics.m_pycordis(PackListWidget.f_yolysbla, x, y, 32, 32);
+                  graphics.drawGuiTexture(PackListWidget.f_yolysbla, x, y, 32, 32);
                } else {
-                  graphics.m_pycordis(PackListWidget.f_ccnhkjdp, x, y, 32, 32);
+                  graphics.drawGuiTexture(PackListWidget.f_ccnhkjdp, x, y, 32, 32);
                }
             } else {
                if (this.pack.canBeDisabled()) {
                   if (p < 16) {
-                     graphics.m_pycordis(PackListWidget.f_ougwkmnf, x, y, 32, 32);
+                     graphics.drawGuiTexture(PackListWidget.f_ougwkmnf, x, y, 32, 32);
                   } else {
-                     graphics.m_pycordis(PackListWidget.f_dskixuix, x, y, 32, 32);
+                     graphics.drawGuiTexture(PackListWidget.f_dskixuix, x, y, 32, 32);
                   }
                }
 
                if (this.pack.canMoveTowardStart()) {
                   if (p < 32 && p > 16 && q < 16) {
-                     graphics.m_pycordis(PackListWidget.f_wululuxd, x, y, 32, 32);
+                     graphics.drawGuiTexture(PackListWidget.f_wululuxd, x, y, 32, 32);
                   } else {
-                     graphics.m_pycordis(PackListWidget.f_gdnxmonh, x, y, 32, 32);
+                     graphics.drawGuiTexture(PackListWidget.f_gdnxmonh, x, y, 32, 32);
                   }
                }
 
                if (this.pack.canMoveTowardEnd()) {
                   if (p < 32 && p > 16 && q > 16) {
-                     graphics.m_pycordis(PackListWidget.f_zbqjqqvs, x, y, 32, 32);
+                     graphics.drawGuiTexture(PackListWidget.f_zbqjqqvs, x, y, 32, 32);
                   } else {
-                     graphics.m_pycordis(PackListWidget.f_hikiodhx, x, y, 32, 32);
+                     graphics.drawGuiTexture(PackListWidget.f_hikiodhx, x, y, 32, 32);
                   }
                }
             }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/pack/PackScreen.java namedSrc/net/minecraft/client/gui/screen/pack/PackScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/pack/PackScreen.java	2023-08-09 03:28:06.785868769 +0000
+++ namedSrc/net/minecraft/client/gui/screen/pack/PackScreen.java	2023-08-09 03:26:33.190359612 +0000
@@ -342,7 +342,7 @@
                   if (bl) {
                      List<Path> list2 = new ArrayList(paths.size());
                      Set<Path> set = new HashSet(paths);
-                     C_dwkmbiso<Path> lv = new C_dwkmbiso<Path>(this.client.m_bbptvjve()) {
+                     C_dwkmbiso<Path> lv = new C_dwkmbiso<Path>(this.client.getSymlinkValidator()) {
                         /**
                          * @mapping {@literal hashed m_xwmvmopj Lnet/minecraft/unmapped/C_vndksvfp$C_tbnnkniv;m_xwmvmopj(Ljava/nio/file/Path;)Ljava/nio/file/Path;}
                          * @mapping {@literal named m_jdqwsamm Lnet/minecraft/client/gui/screen/pack/PackScreen$C_tbnnkniv;m_jdqwsamm(Ljava/nio/file/Path;)Ljava/nio/file/Path;}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/PresetsScreen.java namedSrc/net/minecraft/client/gui/screen/PresetsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/PresetsScreen.java	2023-08-09 03:28:06.877868289 +0000
+++ namedSrc/net/minecraft/client/gui/screen/PresetsScreen.java	2023-08-09 03:26:33.306359006 +0000
@@ -496,7 +496,7 @@
           * @mapping {@literal named drawIconBackground Lnet/minecraft/client/gui/screen/PresetsScreen$SuperflatPresetsListWidget$SuperflatPresetEntry;drawIconBackground(Lnet/minecraft/client/gui/GuiGraphics;II)V}
           */
          private void drawIconBackground(GuiGraphics graphics, int x, int y) {
-            graphics.m_tfcymekl(PresetsScreen.f_vsnipnbh, x, y, 0, 18, 18);
+            graphics.drawGuiTexture(PresetsScreen.f_vsnipnbh, x, y, 0, 18, 18);
          }
 
          /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/AnimatedResultButton.java namedSrc/net/minecraft/client/gui/screen/recipe/book/AnimatedResultButton.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/AnimatedResultButton.java	2023-08-09 03:28:06.861868373 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe/book/AnimatedResultButton.java	2023-08-09 03:26:33.282359132 +0000
@@ -159,7 +159,7 @@
          this.bounce -= delta;
       }
 
-      graphics.m_pycordis(lv, this.getX(), this.getY(), this.width, this.height);
+      graphics.drawGuiTexture(lv, this.getX(), this.getY(), this.width, this.height);
       List<Recipe<?>> list = this.getResults();
       this.currentResultIndex = MathHelper.floor(this.time / 30.0F) % list.size();
       ItemStack lv5 = ((Recipe)list.get(this.currentResultIndex)).getResult(this.resultCollection.getRegistryManager());
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-09 03:28:06.841868477 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java	2023-08-09 03:26:33.262359236 +0000
@@ -233,7 +233,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return false;
    }
 
@@ -251,7 +251,7 @@
          int l = Math.min(this.alternativeButtons.size(), k);
          int m = MathHelper.ceil((float)this.alternativeButtons.size() / (float)k);
          int n = 4;
-         graphics.m_pycordis(f_fwqjfxec, this.buttonX, this.buttonY, l * 25 + 8, m * 25 + 8);
+         graphics.drawGuiTexture(f_fwqjfxec, this.buttonX, this.buttonY, l * 25 + 8, m * 25 + 8);
          RenderSystem.disableBlend();
 
          for (RecipeAlternativesWidget.AlternativeButtonWidget lv : this.alternativeButtons) {
@@ -375,7 +375,7 @@
             lv = this.isHoveredOrFocused() ? RecipeAlternativesWidget.f_lenxreel : RecipeAlternativesWidget.f_bxatotve;
          }
 
-         graphics.m_pycordis(lv, this.getX(), this.getY(), this.width, this.height);
+         graphics.drawGuiTexture(lv, this.getX(), this.getY(), this.width, this.height);
          graphics.getMatrices().push();
          graphics.getMatrices().translate((double)(this.getX() + 2), (double)(this.getY() + 2), 150.0);
 
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-09 03:28:06.905868143 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java	2023-08-09 03:26:33.338358839 +0000
@@ -628,7 +628,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeGroupButtonWidget.java namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeGroupButtonWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeGroupButtonWidget.java	2023-08-09 03:28:06.925868039 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeGroupButtonWidget.java	2023-08-09 03:26:33.370358672 +0000
@@ -93,7 +93,7 @@
             k -= 2;
          }
 
-         graphics.m_pycordis(lv2, k, this.getY(), this.width, this.height);
+         graphics.drawGuiTexture(lv2, k, this.getY(), this.width, this.height);
          RenderSystem.enableDepthTest();
          this.renderIcons(graphics, lv.getItemRenderer());
          if (this.bounce > 0.0F) {
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-09 03:28:06.809868644 +0000
+++ namedSrc/net/minecraft/client/gui/screen/Screen.java	2023-08-09 03:26:33.218359466 +0000
@@ -737,7 +737,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return true;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/StatsScreen.java namedSrc/net/minecraft/client/gui/screen/StatsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/StatsScreen.java	2023-08-09 03:28:06.925868039 +0000
+++ namedSrc/net/minecraft/client/gui/screen/StatsScreen.java	2023-08-09 03:26:33.366358693 +0000
@@ -319,7 +319,7 @@
     * @mapping {@literal named renderIcon Lnet/minecraft/client/gui/screen/StatsScreen;renderIcon(Lnet/minecraft/client/gui/GuiGraphics;IILnet/minecraft/util/Identifier;)V}
     */
    void renderIcon(GuiGraphics graphics, int x, int y, Identifier arg2) {
-      graphics.m_tfcymekl(arg2, x, y, 0, 18, 18);
+      graphics.drawGuiTexture(arg2, x, y, 0, 18, 18);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2023-08-09 03:28:06.797868707 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2023-08-09 03:26:33.202359549 +0000
@@ -229,7 +229,7 @@
     */
    public static void open(MinecraftClient client, @Nullable Screen parent) {
       showMessage(client, PREPARING);
-      ResourcePackManager lv = new ResourcePackManager(new VanillaDataPackProvider(client.m_bbptvjve()));
+      ResourcePackManager lv = new ResourcePackManager(new VanillaDataPackProvider(client.getSymlinkValidator()));
       WorldLoader.InitConfig lv2 = createDefaultLoadConfig(lv, FeatureAndDataSettings.MINIMAL);
       CompletableFuture<WorldCreationContext> completableFuture = WorldLoader.load(
          lv2,
@@ -289,7 +289,7 @@
    ) {
       super(Text.translatable("selectWorld.create"));
       this.parent = parent;
-      this.f_yednpqse = client.m_bbptvjve();
+      this.f_yednpqse = client.getSymlinkValidator();
       this.worldCreator = new WorldCreator(client.getWorldStorage().getSavesDirectory(), context, typeKey, seed);
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/WorldListWidget.java namedSrc/net/minecraft/client/gui/screen/world/WorldListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/WorldListWidget.java	2023-08-09 03:28:06.869868331 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/WorldListWidget.java	2023-08-09 03:26:33.290359090 +0000
@@ -510,7 +510,7 @@
             try {
                BasicFileAttributes basicFileAttributes = Files.readAttributes(this.iconFile, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS);
                if (basicFileAttributes.isSymbolicLink()) {
-                  List<Symlink> list = this.client.m_bbptvjve().m_ztjbybov(this.iconFile);
+                  List<Symlink> list = this.client.getSymlinkValidator().m_ztjbybov(this.iconFile);
                   if (!list.isEmpty()) {
                      WorldListWidget.LOGGER.warn("{}", InvalidSymlinkException.createErrorMessage(this.iconFile, list));
                      this.iconFile = null;
@@ -582,25 +582,25 @@
             Identifier lv4 = bl2 ? WorldListWidget.f_ijizppsv : WorldListWidget.f_hkspkame;
             Identifier lv5 = bl2 ? WorldListWidget.f_iryfsjin : WorldListWidget.f_xshrcksa;
             if (this.level instanceof WorldSaveSummary.SymlinkSaveSummary) {
-               graphics.m_pycordis(lv4, x, y, 32, 32);
-               graphics.m_pycordis(lv5, x, y, 32, 32);
+               graphics.drawGuiTexture(lv4, x, y, 32, 32);
+               graphics.drawGuiTexture(lv5, x, y, 32, 32);
                return;
             }
 
             if (this.level.isLocked()) {
-               graphics.m_pycordis(lv4, x, y, 32, 32);
+               graphics.drawGuiTexture(lv4, x, y, 32, 32);
                if (bl2) {
                   this.screen.setDeferredTooltip(this.client.textRenderer.wrapLines(WorldListWidget.LOCKED, 175));
                }
             } else if (this.level.doesRequireConversion()) {
-               graphics.m_pycordis(lv4, x, y, 32, 32);
+               graphics.drawGuiTexture(lv4, x, y, 32, 32);
                if (bl2) {
                   this.screen.setDeferredTooltip(this.client.textRenderer.wrapLines(WorldListWidget.CONVERSION_TOOLTIP, 175));
                }
             } else if (this.level.isDifferentVersion()) {
-               graphics.m_pycordis(lv5, x, y, 32, 32);
+               graphics.drawGuiTexture(lv5, x, y, 32, 32);
                if (this.level.isFutureLevel()) {
-                  graphics.m_pycordis(lv4, x, y, 32, 32);
+                  graphics.drawGuiTexture(lv4, x, y, 32, 32);
                   if (bl2) {
                      this.screen
                         .setDeferredTooltip(
@@ -610,7 +610,7 @@
                         );
                   }
                } else if (!SharedConstants.getGameVersion().isStable()) {
-                  graphics.m_pycordis(lv3, x, y, 32, 32);
+                  graphics.drawGuiTexture(lv3, x, y, 32, 32);
                   if (bl2) {
                      this.screen
                         .setDeferredTooltip(
@@ -619,7 +619,7 @@
                   }
                }
             } else {
-               graphics.m_pycordis(lv2, x, y, 32, 32);
+               graphics.drawGuiTexture(lv2, x, y, 32, 32);
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/gui/tooltip/BundleTooltipComponent.java namedSrc/net/minecraft/client/gui/tooltip/BundleTooltipComponent.java
--- namedTargetSrc/net/minecraft/client/gui/tooltip/BundleTooltipComponent.java	2023-08-09 03:28:06.781868790 +0000
+++ namedSrc/net/minecraft/client/gui/tooltip/BundleTooltipComponent.java	2023-08-09 03:26:33.190359612 +0000
@@ -97,7 +97,7 @@
    public void drawItems(TextRenderer textRenderer, int x, int y, GuiGraphics graphics) {
       int k = this.getColumns();
       int l = this.getRows();
-      graphics.m_pycordis(f_kjzalbkb, x, y, this.m_tlppmcjp(), this.m_sstewzeo());
+      graphics.drawGuiTexture(f_kjzalbkb, x, y, this.m_tlppmcjp(), this.m_sstewzeo());
       boolean bl = this.occupancy >= 64;
       int m = 0;
 
@@ -133,7 +133,7 @@
     * @mapping {@literal named draw Lnet/minecraft/client/gui/tooltip/BundleTooltipComponent;draw(Lnet/minecraft/client/gui/GuiGraphics;IILnet/minecraft/client/gui/tooltip/BundleTooltipComponent$Sprite;)V}
     */
    private void draw(GuiGraphics graphics, int x, int y, BundleTooltipComponent.Sprite sprite) {
-      graphics.m_tfcymekl(sprite.f_uyyhtthq, x, y, 0, sprite.width, sprite.height);
+      graphics.drawGuiTexture(sprite.f_uyyhtthq, x, y, 0, sprite.width, sprite.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/CheckboxWidget.java namedSrc/net/minecraft/client/gui/widget/CheckboxWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/CheckboxWidget.java	2023-08-09 03:28:06.861868373 +0000
+++ namedSrc/net/minecraft/client/gui/widget/CheckboxWidget.java	2023-08-09 03:26:33.286359111 +0000
@@ -116,7 +116,7 @@
          lv3 = this.isFocused() ? f_epfkmuwh : f_fmrbhduc;
       }
 
-      graphics.m_pycordis(lv3, this.getX(), this.getY(), 20, this.height);
+      graphics.drawGuiTexture(lv3, this.getX(), this.getY(), 20, this.height);
       graphics.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
       if (this.showMessage) {
          graphics.drawShadowedText(
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-09 03:28:06.901868164 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-08-09 03:26:33.338358839 +0000
@@ -385,13 +385,13 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return this.active
          && this.visible
-         && mouseX >= (double)this.getX()
-         && mouseY >= (double)this.getY()
-         && mouseX < (double)(this.getX() + this.width)
-         && mouseY < (double)(this.getY() + this.height);
+         && d >= (double)this.getX()
+         && e >= (double)this.getY()
+         && d < (double)(this.getX() + this.width)
+         && e < (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-09 03:28:06.801868686 +0000
+++ namedSrc/net/minecraft/client/gui/widget/EntryListWidget.java	2023-08-09 03:26:33.210359508 +0000
@@ -652,8 +652,8 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
-      return mouseY >= (double)this.top && mouseY <= (double)this.bottom && mouseX >= (double)this.left && mouseX <= (double)this.right;
+   public boolean isMouseOver(double d, double e) {
+      return e >= (double)this.top && e <= (double)this.bottom && d >= (double)this.left && d <= (double)this.right;
    }
 
    /**
@@ -926,8 +926,8 @@
        * @mapping {@literal named isMouseOver Lnet/minecraft/client/gui/widget/EntryListWidget$Entry;isMouseOver(DD)Z}
        */
       @Override
-      public boolean isMouseOver(double mouseX, double mouseY) {
-         return Objects.equals(this.parentList.getEntryAtPosition(mouseX, mouseY), this);
+      public boolean isMouseOver(double d, double e) {
+         return Objects.equals(this.parentList.getEntryAtPosition(d, e), this);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/LockButtonWidget.java namedSrc/net/minecraft/client/gui/widget/LockButtonWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/LockButtonWidget.java	2023-08-09 03:28:06.893868206 +0000
+++ namedSrc/net/minecraft/client/gui/widget/LockButtonWidget.java	2023-08-09 03:26:33.326358902 +0000
@@ -69,7 +69,7 @@
          lv = this.locked ? LockButtonWidget.IconLocation.LOCKED : LockButtonWidget.IconLocation.UNLOCKED;
       }
 
-      graphics.m_pycordis(lv.f_kloxitsg, this.getX(), this.getY(), this.width, this.height);
+      graphics.drawGuiTexture(lv.f_kloxitsg, this.getX(), this.getY(), this.width, this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/PageTurnWidget.java namedSrc/net/minecraft/client/gui/widget/PageTurnWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/PageTurnWidget.java	2023-08-09 03:28:06.817868602 +0000
+++ namedSrc/net/minecraft/client/gui/widget/PageTurnWidget.java	2023-08-09 03:26:33.230359403 +0000
@@ -64,7 +64,7 @@
          lv = this.isHoveredOrFocused() ? f_ozftaelr : f_jzoyeixi;
       }
 
-      graphics.m_pycordis(lv, this.getX(), this.getY(), 23, 13);
+      graphics.drawGuiTexture(lv, this.getX(), this.getY(), 23, 13);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/PressableWidget.java namedSrc/net/minecraft/client/gui/widget/PressableWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/PressableWidget.java	2023-08-09 03:28:06.897868185 +0000
+++ namedSrc/net/minecraft/client/gui/widget/PressableWidget.java	2023-08-09 03:26:33.330358881 +0000
@@ -55,7 +55,7 @@
       graphics.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
       RenderSystem.enableBlend();
       RenderSystem.enableDepthTest();
-      graphics.m_pycordis(f_letkhfne.m_cyjmeyju(this.active, this.isHoveredOrFocused()), this.getX(), this.getY(), this.getWidth(), this.getHeight());
+      graphics.drawGuiTexture(f_letkhfne.m_cyjmeyju(this.active, this.isHoveredOrFocused()), this.getX(), this.getY(), this.getWidth(), this.getHeight());
       graphics.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
       int k = this.active ? 16777215 : 10526880;
       this.drawScrollableText(graphics, lv.textRenderer, k | MathHelper.ceil(this.alpha * 255.0F) << 24);
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/SliderWidget.java namedSrc/net/minecraft/client/gui/widget/SliderWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/SliderWidget.java	2023-08-09 03:28:06.797868707 +0000
+++ namedSrc/net/minecraft/client/gui/widget/SliderWidget.java	2023-08-09 03:26:33.202359549 +0000
@@ -125,8 +125,8 @@
       RenderSystem.enableBlend();
       RenderSystem.defaultBlendFunc();
       RenderSystem.enableDepthTest();
-      graphics.m_pycordis(this.m_wcczchis(), this.getX(), this.getY(), this.getWidth(), this.getHeight());
-      graphics.m_pycordis(this.m_wrkhndfp(), this.getX() + (int)(this.value * (double)(this.width - 8)), this.getY(), 8, 20);
+      graphics.drawGuiTexture(this.m_wcczchis(), this.getX(), this.getY(), this.getWidth(), this.getHeight());
+      graphics.drawGuiTexture(this.m_wrkhndfp(), this.getX() + (int)(this.value * (double)(this.width - 8)), this.getY(), 8, 20);
       graphics.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
       int k = this.active ? 16777215 : 10526880;
       this.drawScrollingText(graphics, lv.textRenderer, 2, k | MathHelper.ceil(this.alpha * 255.0F) << 24);
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TabWidget.java namedSrc/net/minecraft/client/gui/widget/TabWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TabWidget.java	2023-08-09 03:28:06.805868665 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TabWidget.java	2023-08-09 03:26:33.214359487 +0000
@@ -80,7 +80,7 @@
     */
    @Override
    public void drawWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
-      graphics.m_pycordis(f_dxqspqba.m_cyjmeyju(this.isSelected(), this.isHovered()), this.getX(), this.getY(), this.width, this.height);
+      graphics.drawGuiTexture(f_dxqspqba.m_cyjmeyju(this.isSelected(), this.isHovered()), this.getX(), this.getY(), this.width, this.height);
       TextRenderer lv = MinecraftClient.getInstance().textRenderer;
       int k = this.active ? -1 : -6250336;
       this.drawMessage(graphics, lv, k);
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-09 03:28:06.781868790 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TelemetryEventWidget.java	2023-08-09 03:26:33.190359612 +0000
@@ -147,7 +147,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();
    }
 
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-09 03:28:06.809868644 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2023-08-09 03:26:33.218359466 +0000
@@ -741,12 +741,12 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return this.visible
-         && mouseX >= (double)this.getX()
-         && mouseX < (double)(this.getX() + this.width)
-         && mouseY >= (double)this.getY()
-         && mouseY < (double)(this.getY() + this.height);
+         && d >= (double)this.getX()
+         && d < (double)(this.getX() + this.width)
+         && e >= (double)this.getY()
+         && e < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TexturedButtonWidget.java namedSrc/net/minecraft/client/gui/widget/TexturedButtonWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TexturedButtonWidget.java	2023-08-09 03:28:06.849868435 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TexturedButtonWidget.java	2023-08-09 03:26:33.270359194 +0000
@@ -47,6 +47,6 @@
    @Override
    public void drawWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
       Identifier lv = this.f_zblflxzn.m_cyjmeyju(this.isNarratable(), this.isHoveredOrFocused());
-      graphics.m_pycordis(lv, this.getX(), this.getY(), this.width, this.height);
+      graphics.drawGuiTexture(lv, this.getX(), this.getY(), this.width, this.height);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TexturedWidget.java namedSrc/net/minecraft/client/gui/widget/TexturedWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TexturedWidget.java	2023-08-09 03:28:06.921868060 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TexturedWidget.java	2023-08-09 03:26:33.366358693 +0000
@@ -93,7 +93,7 @@
        */
       @Override
       public void drawWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
-         graphics.m_pycordis(this.f_yslsyqch, this.getX(), this.getY(), this.getWidth(), this.getHeight());
+         graphics.drawGuiTexture(this.f_yslsyqch, this.getX(), this.getY(), this.getWidth(), this.getHeight());
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ToggleButtonWidget.java namedSrc/net/minecraft/client/gui/widget/ToggleButtonWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ToggleButtonWidget.java	2023-08-09 03:28:06.797868707 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ToggleButtonWidget.java	2023-08-09 03:26:33.206359528 +0000
@@ -74,7 +74,7 @@
    public void drawWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
       if (this.f_iknneogk != null) {
          RenderSystem.disableDepthTest();
-         graphics.m_pycordis(this.f_iknneogk.m_cyjmeyju(this.toggled, this.isHoveredOrFocused()), this.getX(), this.getY(), this.width, this.height);
+         graphics.drawGuiTexture(this.f_iknneogk.m_cyjmeyju(this.toggled, this.isHoveredOrFocused()), this.getX(), this.getY(), this.width, this.height);
          RenderSystem.enableDepthTest();
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2023-08-09 03:28:06.813868623 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2023-08-09 03:26:33.222359445 +0000
@@ -67,6 +67,7 @@
 import net.minecraft.client.color.item.ItemColors;
 import net.minecraft.client.font.FontManager;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.GuiAtlasManager;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.WorldGenerationProgressTracker;
 import net.minecraft.client.gui.hud.InGameHud;
@@ -208,7 +209,6 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.text.component.KeyBindTextResolver;
-import net.minecraft.unmapped.C_ihnghycr;
 import net.minecraft.unmapped.C_tdolpopx;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.FileNameUtil;
@@ -667,9 +667,10 @@
     */
    private final StatusEffectSpriteManager statusEffectSpriteManager;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jdwcaqvb Lnet/minecraft/unmapped/C_ayfeobid;f_jdwcaqvb:Lnet/minecraft/unmapped/C_ihnghycr;}
+    * @mapping {@literal named guiAtlasManager Lnet/minecraft/client/MinecraftClient;guiAtlasManager:Lnet/minecraft/client/gui/GuiAtlasManager;}
     */
-   private final C_ihnghycr f_jdwcaqvb;
+   private final GuiAtlasManager guiAtlasManager;
    /**
     * @mapping {@literal hashed f_dufhrfcz Lnet/minecraft/unmapped/C_ayfeobid;f_dufhrfcz:Lnet/minecraft/unmapped/C_eqfjupcc;}
     * @mapping {@literal named toastManager Lnet/minecraft/client/MinecraftClient;toastManager:Lnet/minecraft/client/toast/ToastManager;}
@@ -987,9 +988,10 @@
     */
    private final C_tdolpopx f_rxmfauqf;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_chwmpxzl Lnet/minecraft/unmapped/C_ayfeobid;f_chwmpxzl:Lnet/minecraft/unmapped/C_jgxjjhjn;}
+    * @mapping {@literal named symlinkValidator Lnet/minecraft/client/MinecraftClient;symlinkValidator:Lnet/minecraft/util/path/SymlinkValidator;}
     */
-   private final SymlinkValidator f_chwmpxzl;
+   private final SymlinkValidator symlinkValidator;
    /**
     * @mapping {@literal hashed f_vstmqzvt Lnet/minecraft/unmapped/C_ayfeobid;f_vstmqzvt:Ljava/lang/String;}
     * @mapping {@literal named openProfilerSection Lnet/minecraft/client/MinecraftClient;openProfilerSection:Ljava/lang/String;}
@@ -1010,11 +1012,11 @@
       this.versionType = args.game.versionType;
       this.sessionPropertyMap = args.network.profileProperties;
       Path path = this.runDirectory.toPath();
-      this.f_chwmpxzl = WorldSaveStorage.getSymlinkValidator(path.resolve("allowed_symlinks.txt"));
-      ClientBuiltinResourcePackProvider lv = new ClientBuiltinResourcePackProvider(args.directories.getExternalAssetDirectory(), this.f_chwmpxzl);
+      this.symlinkValidator = WorldSaveStorage.getSymlinkValidator(path.resolve("allowed_symlinks.txt"));
+      ClientBuiltinResourcePackProvider lv = new ClientBuiltinResourcePackProvider(args.directories.getExternalAssetDirectory(), this.symlinkValidator);
       this.remoteResourcePackProvider = new RemoteResourcePackProvider(new File(this.runDirectory, "server-resource-packs"));
       ResourcePackProvider lv2 = new FileResourcePackProvider(
-         this.resourcePackDir, ResourceType.CLIENT_RESOURCES, ResourcePackSource.PACK_SOURCE_NONE, this.f_chwmpxzl
+         this.resourcePackDir, ResourceType.CLIENT_RESOURCES, ResourcePackSource.PACK_SOURCE_NONE, this.symlinkValidator
       );
       this.resourcePackManager = new ResourcePackManager(lv, this.remoteResourcePackProvider, lv2);
       this.defaultResourcePack = lv.getVanillaResourcePack();
@@ -1082,7 +1084,7 @@
       this.textureManager = new TextureManager(this.resourceManager);
       this.resourceManager.registerReloader(this.textureManager);
       this.skinProvider = new PlayerSkinProvider(this.textureManager, file.toPath().resolve("skins"), this.sessionService, this);
-      this.worldStorage = new WorldSaveStorage(path.resolve("saves"), path.resolve("backups"), this.f_chwmpxzl, this.dataFixer);
+      this.worldStorage = new WorldSaveStorage(path.resolve("saves"), path.resolve("backups"), this.symlinkValidator, this.dataFixer);
       this.f_rxmfauqf = new C_tdolpopx(path);
       this.soundManager = new SoundManager(this.options);
       this.resourceManager.registerReloader(this.soundManager);
@@ -1133,8 +1135,8 @@
       this.resourceManager.registerReloader(this.paintingManager);
       this.statusEffectSpriteManager = new StatusEffectSpriteManager(this.textureManager);
       this.resourceManager.registerReloader(this.statusEffectSpriteManager);
-      this.f_jdwcaqvb = new C_ihnghycr(this.textureManager);
-      this.resourceManager.registerReloader(this.f_jdwcaqvb);
+      this.guiAtlasManager = new GuiAtlasManager(this.textureManager);
+      this.resourceManager.registerReloader(this.guiAtlasManager);
       this.videoWarningManager = new VideoWarningManager();
       this.resourceManager.registerReloader(this.videoWarningManager);
       this.resourceManager.registerReloader(this.regionalComplianciesManager);
@@ -1811,7 +1813,7 @@
          this.particleManager.clearAtlas();
          this.statusEffectSpriteManager.close();
          this.paintingManager.close();
-         this.f_jdwcaqvb.close();
+         this.guiAtlasManager.close();
          this.textureManager.close();
          this.resourceManager.close();
          Util.shutdownExecutors();
@@ -2114,10 +2116,10 @@
          this.stopRecorder();
          return false;
       } else {
-         Consumer<ProfileResult> consumer2 = arg -> {
-            if (arg != EmptyProfileResult.INSTANCE) {
-               int i = arg.getTickSpan();
-               double d = (double)arg.getTimeSpan() / (double)TimeHelper.SECOND_IN_MILLIS;
+         Consumer<ProfileResult> consumer2 = result -> {
+            if (result != EmptyProfileResult.INSTANCE) {
+               int i = result.getTickSpan();
+               double d = (double)result.getTimeSpan() / (double)TimeHelper.SECOND_IN_MILLIS;
                this.execute(
                   () -> chatMessageSender.accept(
                         Text.translatable("commands.debug.stopped", String.format(Locale.ROOT, "%.2f", d), i, String.format(Locale.ROOT, "%.2f", (double)i / d))
@@ -2128,12 +2130,12 @@
          Consumer<Path> consumer3 = path -> {
             Text lvx = Text.literal(path.toString())
                .formatted(Formatting.UNDERLINE)
-               .styled(arg -> arg.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, path.toFile().getParent())));
+               .styled(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, path.toFile().getParent())));
             this.execute(() -> chatMessageSender.accept(Text.translatable("debug.profiling.stop", lvx)));
          };
          SystemDetails lv = addSystemDetailsToCrashReport(new SystemDetails(), this, this.languageManager, this.gameVersion, this.options);
-         Consumer<List<Path>> consumer4 = list -> {
-            Path path = this.archiveProfilingReport(lv, list);
+         Consumer<List<Path>> consumer4 = files -> {
+            Path path = this.archiveProfilingReport(lv, files);
             consumer3.accept(path);
          };
          Consumer<Path> consumer5;
@@ -2147,7 +2149,7 @@
                .thenRunAsync(
                   () -> consumer4.accept(ImmutableList.of((Path)completableFuture.join(), (Path)completableFuture2.join())), Util.getIoWorkerExecutor()
                );
-            this.server.setupRecorder(arg -> {
+            this.server.setupRecorder(profileResult -> {
             }, completableFuture2::complete);
             consumer5 = completableFuture::complete;
          }
@@ -2157,9 +2159,9 @@
             Util.nanoTimeSupplier,
             Util.getIoWorkerExecutor(),
             new RecordDumper("client"),
-            arg -> {
+            profileResult -> {
                this.recorder = DummyRecorder.INSTANCE;
-               consumer2.accept(arg);
+               consumer2.accept(profileResult);
             },
             consumer5
          );
@@ -3432,9 +3434,9 @@
 
    /**
     * @mapping {@literal hashed m_feekilwg Lnet/minecraft/unmapped/C_ayfeobid;m_feekilwg(Ljava/util/UUID;)Z}
-    * @mapping {@literal named m_feekilwg Lnet/minecraft/client/MinecraftClient;m_feekilwg(Ljava/util/UUID;)Z}
+    * @mapping {@literal named isCurrentPlayer Lnet/minecraft/client/MinecraftClient;isCurrentPlayer(Ljava/util/UUID;)Z}
     */
-   public boolean m_feekilwg(UUID uuid) {
+   public boolean isCurrentPlayer(UUID uuid) {
       return uuid.equals(this.getSession().getPlayerUuid());
    }
 
@@ -3815,10 +3817,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hbzestyd Lnet/minecraft/unmapped/C_ayfeobid;m_hbzestyd()Lnet/minecraft/unmapped/C_ihnghycr;}
+    * @mapping {@literal named getGuiAtlasManager Lnet/minecraft/client/MinecraftClient;getGuiAtlasManager()Lnet/minecraft/client/gui/GuiAtlasManager;}
     */
-   public C_ihnghycr m_hbzestyd() {
-      return this.f_jdwcaqvb;
+   public GuiAtlasManager getGuiAtlasManager() {
+      return this.guiAtlasManager;
    }
 
    /**
@@ -4151,10 +4154,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bbptvjve Lnet/minecraft/unmapped/C_ayfeobid;m_bbptvjve()Lnet/minecraft/unmapped/C_jgxjjhjn;}
+    * @mapping {@literal named getSymlinkValidator Lnet/minecraft/client/MinecraftClient;getSymlinkValidator()Lnet/minecraft/util/path/SymlinkValidator;}
     */
-   public SymlinkValidator m_bbptvjve() {
-      return this.f_chwmpxzl;
+   public SymlinkValidator getSymlinkValidator() {
+      return this.symlinkValidator;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/Mouse.java namedSrc/net/minecraft/client/Mouse.java
--- namedTargetSrc/net/minecraft/client/Mouse.java	2023-08-09 03:28:06.857868394 +0000
+++ namedSrc/net/minecraft/client/Mouse.java	2023-08-09 03:26:33.282359132 +0000
@@ -97,13 +97,15 @@
     */
    private double cursorDeltaY;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_okstrpms Lnet/minecraft/unmapped/C_zgebrxop;f_okstrpms:D}
+    * @mapping {@literal named accumulatedScrollX Lnet/minecraft/client/Mouse;accumulatedScrollX:D}
     */
-   private double f_okstrpms;
+   private double accumulatedScrollX;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_rlvqfnpm Lnet/minecraft/unmapped/C_zgebrxop;f_rlvqfnpm:D}
+    * @mapping {@literal named accumulatedScrollY Lnet/minecraft/client/Mouse;accumulatedScrollY:D}
     */
-   private double f_rlvqfnpm;
+   private double accumulatedScrollY;
    /**
     * @mapping {@literal hashed f_ctzqjeip Lnet/minecraft/unmapped/C_zgebrxop;f_ctzqjeip:D}
     * @mapping {@literal named lastMouseUpdateTime Lnet/minecraft/client/Mouse;lastMouseUpdateTime:D}
@@ -219,24 +221,24 @@
                this.client.currentScreen.mouseScrolled(i, j, g, h);
                this.client.currentScreen.applyMousePressScrollNarratorDelay();
             } else if (this.client.player != null) {
-               if (this.f_okstrpms != 0.0 && Math.signum(g) != Math.signum(this.f_okstrpms)) {
-                  this.f_okstrpms = 0.0;
+               if (this.accumulatedScrollX != 0.0 && Math.signum(g) != Math.signum(this.accumulatedScrollX)) {
+                  this.accumulatedScrollX = 0.0;
                }
 
-               if (this.f_rlvqfnpm != 0.0 && Math.signum(h) != Math.signum(this.f_rlvqfnpm)) {
-                  this.f_rlvqfnpm = 0.0;
+               if (this.accumulatedScrollY != 0.0 && Math.signum(h) != Math.signum(this.accumulatedScrollY)) {
+                  this.accumulatedScrollY = 0.0;
                }
 
-               this.f_okstrpms += g;
-               this.f_rlvqfnpm += h;
-               int k = (int)this.f_okstrpms;
-               int m = (int)this.f_rlvqfnpm;
+               this.accumulatedScrollX += g;
+               this.accumulatedScrollY += h;
+               int k = (int)this.accumulatedScrollX;
+               int m = (int)this.accumulatedScrollY;
                if (k == 0 && m == 0) {
                   return;
                }
 
-               this.f_okstrpms -= (double)k;
-               this.f_rlvqfnpm -= (double)m;
+               this.accumulatedScrollX -= (double)k;
+               this.accumulatedScrollY -= (double)m;
                int n = m == 0 ? -k : m;
                if (this.client.player.isSpectator()) {
                   if (this.client.inGameHud.getSpectatorHud().isOpen()) {
Only in namedSrc/net/minecraft/client/multiplayer/prediction: PredictiveAction.java


The remaining diff is too long!

-Original file line number
+Diff line change
@@ Expand Up / @@ -79,6 +79,7 @@ google @@
     quaternionf
     taggable
     workflow
+    unihex
     // word combinations
     backend
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     		COMMENT or having an advance greater than {@value net.minecraft.client.font.FontStorage#MAX_GLYPH_ADVANCE}.
     		COMMENT
     		COMMENT @see #textRenderer
+    	FIELD f_chwmpxzl symlinkValidator Lnet/minecraft/unmapped/C_jgxjjhjn;
     	FIELD f_cipivcjw particleManager Lnet/minecraft/unmapped/C_ttbvlsde;
     	FIELD f_cnbjrnkz fontManager Lnet/minecraft/unmapped/C_hoztwset;
     	FIELD f_cngdjofb textRenderer Lnet/minecraft/unmapped/C_mavozmpp;
@@ Expand Down Expand Up @@
     	FIELD f_iuqlwerq bufferBuilders Lnet/minecraft/unmapped/C_dfmwjguw;
     	FIELD f_ivvuitjx blockColors Lnet/minecraft/unmapped/C_iiyegykq;
     	FIELD f_jdtmkbfx splashTextLoader Lnet/minecraft/unmapped/C_iyhcmfwn;
+    	FIELD f_jdwcaqvb guiAtlasManager Lnet/minecraft/unmapped/C_ihnghycr;
     	FIELD f_jgndswme attackCooldown I
     	FIELD f_juejclec worldStorage Lnet/minecraft/unmapped/C_bpwagnit;
     	FIELD f_jztrpgfi metricsData Lnet/minecraft/unmapped/C_hqvvtxmh;
@@ Expand Down Expand Up @@
     	METHOD m_awiobpey getFramebuffer ()Lnet/minecraft/unmapped/C_xxwgvelc;
     	METHOD m_ayrxztdp setWorld (Lnet/minecraft/unmapped/C_ghdnlrrw;)V
     		ARG 1 world
+    	METHOD m_bbptvjve getSymlinkValidator ()Lnet/minecraft/unmapped/C_jgxjjhjn;
     	METHOD m_bhnqqnmz getChatRestriction ()Lnet/minecraft/unmapped/C_ayfeobid$C_xucqfcml;
     	METHOD m_bpwoykoi startMonitor (ZLnet/minecraft/unmapped/C_vuxtoiqa;)Lnet/minecraft/unmapped/C_eslcbfsq;
     		ARG 1 active
@@ Expand All @@
     	METHOD m_cbjyfsge refreshSearch (Lnet/minecraft/unmapped/C_zqzigdge$C_gvofkqkn;Ljava/util/List;)V
     		ARG 1 key
     		ARG 2 searchables
+    	METHOD m_ccoxkwrp (Ljava/util/function/Consumer;Ljava/nio/file/Path;)V
+    		ARG 1 path
     	METHOD m_cfkdcloy (Z)V
     		ARG 1 confirmed
     	METHOD m_cfvjiijv cancelRecorder ()V
@@ Expand Down Expand Up @@
     	METHOD m_egpifpov isOptionalTelemetryEnabled ()Z
     	METHOD m_ejicmrfw (Ljava/lang/String;)Z
     		ARG 0 string
+    	METHOD m_eqymcyun (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_dzczqjri;)V
+    		ARG 2 result
     	METHOD m_exakjteb getSessionProperties ()Lcom/mojang/authlib/properties/PropertyMap;
     	METHOD m_faatluqx (Ljava/util/List;)V
     		ARG 0 stacks
@@ Expand All @@
     		ARG 1 chatMessageSender
     	METHOD m_fctndloq (Lnet/minecraft/unmapped/C_rdaqiwdt;)Ljava/lang/String;
     		ARG 0 text
+    	METHOD m_feekilwg isCurrentPlayer (Ljava/util/UUID;)Z
     	METHOD m_fnnphfvj getEntityRenderDispatcher ()Lnet/minecraft/unmapped/C_gmkqxljo;
     	METHOD m_fquuldng isPaused ()Z
     	METHOD m_fsvbdqcr getResourcePackDir ()Ljava/nio/file/Path;
@@ Expand All @@
     		COMMENT
     		COMMENT @see #reloadResources(boolean)
     	METHOD m_hbdizzrx getResourcePackManager ()Lnet/minecraft/unmapped/C_dqfyacfy;
+    	METHOD m_hbzestyd getGuiAtlasManager ()Lnet/minecraft/unmapped/C_ihnghycr;
     	METHOD m_hfnsejey isFabulousGraphicsOrBetter ()Z
     	METHOD m_hknmykuo handleGlErrorByDisableVsync (IJ)V
     		ARG 1 error
@@ Expand All @@
     		COMMENT Gets this client's own integrated server.
     		COMMENT
     		COMMENT <p>The integrated server is only present when a local single player world is open.
+    	METHOD m_jksiigrm (Lnet/minecraft/unmapped/C_fprbxnfr;Ljava/util/function/Consumer;Ljava/util/List;)V
+    		ARG 3 files
     	METHOD m_jtfycguy getVersionType ()Ljava/lang/String;
     	METHOD m_jvlajuse onGameLoaded ()V
+    	METHOD m_jytofnym (Lnet/minecraft/unmapped/C_dzczqjri;)V
+    		ARG 0 profileResult
     	METHOD m_jytpvdsa countryEqualsISO3 (Ljava/lang/Object;)Z
     		ARG 0 o
     	METHOD m_kclqbfew cleanUpAfterCrash ()V
@@ Expand Down Expand Up @@
     	METHOD m_potaagxt (Lnet/minecraft/unmapped/C_rdaqiwdt;)V
     		ARG 0 text
     	METHOD m_ppqcqqyo stopRecorder ()V
+    	METHOD m_ppuzvmar (Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_cpwnhism;)Lnet/minecraft/unmapped/C_cpwnhism;
+    		ARG 1 style
     	METHOD m_ppypuskf displayPackLoadFailureToast (Lnet/minecraft/unmapped/C_rdaqiwdt;)V
     		ARG 1 message
     	METHOD m_ptakjikv getOverlay ()Lnet/minecraft/unmapped/C_gtnnbmai;
@@ Expand All @@
     		ARG 5 height
     	METHOD m_qitbpodu (Lnet/minecraft/unmapped/C_rdaqiwdt;)Ljava/lang/String;
     		ARG 0 text
+    	METHOD m_qnboulpj (Ljava/util/function/Consumer;Ljava/nio/file/Path;)V
+    		ARG 2 path
     	METHOD m_qozcjtsz setInitialScreen (Lnet/minecraft/unmapped/C_ivysvyzf;Lnet/minecraft/unmapped/C_dzecaeok;Lnet/minecraft/unmapped/C_pdsiuywi$C_ztbvorvu;)V
     		ARG 1 realmsClient
     		ARG 2 resourceReload
@@ Expand Down Expand Up @@
     	METHOD m_wkcnjoym isMultiplayerEnabled ()Z
     	METHOD m_wlckrozy (Lnet/minecraft/unmapped/C_ymmazfhq;)Ljava/util/stream/Stream;
     		ARG 0 resultCollection
+    	METHOD m_wmmoabhh (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_dzczqjri;)V
+    		ARG 2 profileResult
     	METHOD m_wnvdggdb shouldMonitorTickDuration ()Z
     	METHOD m_xlacueca getChatListener ()Lnet/minecraft/unmapped/C_bmbrcost;
     	METHOD m_xsnthzsp getNetworkHandler ()Lnet/minecraft/unmapped/C_nuofrxvi;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_jyymxfnt cursorXSmoother Lnet/minecraft/unmapped/C_wnbyzpdi;
     	FIELD f_lazttkdj leftClicked Z
     	FIELD f_mrhqmiqv y D
+    	FIELD f_okstrpms accumulatedScrollX D
     	FIELD f_ooacsdpr activeButton I
     	FIELD f_pdoxoshr rightClicked Z
     	FIELD f_pobldenb cursorLocked Z
     	FIELD f_qnxgfpgl ignorePastPos Z
+    	FIELD f_rlvqfnpm accumulatedScrollY D
     	FIELD f_urvgkvpt tapTicks I
     	FIELD f_vqrnspgs middleClicked Z
     	FIELD f_vykvmmai cursorDeltaX D
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_mrmzkoex image Lnet/minecraft/unmapped/C_ayikuhxa;
     	FIELD f_pjauldcv LOGGER Lorg/slf4j/Logger;
     	FIELD f_syldtzsw glyphs Lnet/minecraft/unmapped/C_srmdcrvq;
+    	CLASS C_qoeqnynz Definition
+    		FIELD f_cgyvixla MAP_CODEC Lcom/mojang/serialization/MapCodec;
+    		METHOD m_aaxjkjot (Ljava/util/List;)[[I
+    			ARG 0 list
+    		METHOD m_cbouqcop (I)[[Lnet/minecraft/unmapped/C_tfzxpuio$C_uvepmuuv;
+    			ARG 0 i
+    		METHOD m_cpshwqhq validateCodePointGrid ([[I)Lcom/mojang/serialization/DataResult;
+    			ARG 0 grid
+    		METHOD m_nmwzoeei getGlyphWidth (Lnet/minecraft/unmapped/C_ayikuhxa;IIII)I
+    			ARG 1 image
+    			ARG 2 charPosX
+    			ARG 3 charPosY
+    			ARG 4 gridPosX
+    			ARG 5 gridPosY
+    		METHOD m_pcwtnfss load (Lnet/minecraft/unmapped/C_tmnrpasf;)Lnet/minecraft/unmapped/C_wywmjnuh;
+    		METHOD m_pvydkhoe (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+    			ARG 0 instance
+    		METHOD m_qpantueq ([[I)Ljava/util/List;
+    			ARG 0 codePointGrid
+    		METHOD m_uzvsmvxq validate (Lnet/minecraft/unmapped/C_tfzxpuio$C_qoeqnynz;)Lcom/mojang/serialization/DataResult;
+    			ARG 0 definition
+    		METHOD m_ydfejztr (I)[Lnet/minecraft/unmapped/C_tfzxpuio$C_uvepmuuv;
+    			ARG 0 i
     	CLASS C_uvepmuuv BitmapFontGlyph
     		FIELD f_aitekdxj ascent I
     		FIELD f_aphcferf height I
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -0,0 +1,32 @@
+    CLASS net/minecraft/unmapped/C_srmdcrvq net/minecraft/client/font/CodepointMap
+    	FIELD f_ahcsnrnl BLOCK_COUNT I
+    	FIELD f_aucmwucg IN_BLOCK_MASK I
+    	FIELD f_ebzvpdjl BLOCK_SIZE I
+    	FIELD f_exfykonq MAX_BLOCK I
+    	FIELD f_fgoehuur empty [Ljava/lang/Object;
+    	FIELD f_fgtbguub blockFactory Ljava/util/function/IntFunction;
+    	FIELD f_kmyfnwtx blockMap [[Ljava/lang/Object;
+    	FIELD f_sgyrgajr BLOCK_BITS I
+    	METHOD <init> (Ljava/util/function/IntFunction;Ljava/util/function/IntFunction;)V
+    		ARG 2 mapFactory
+    	METHOD m_bnxytxeq remove (I)Ljava/lang/Object;
+    		ARG 1 codePoint
+    	METHOD m_eikegste forEach (Lnet/minecraft/unmapped/C_srmdcrvq$C_xbamquui;)V
+    		ARG 1 glyphConsumer
+    	METHOD m_higtkvia clear ()V
+    	METHOD m_pepaswby put (ILjava/lang/Object;)Ljava/lang/Object;
+    		ARG 1 codePoint
+    		ARG 2 glyph
+    	METHOD m_prbxgcyk keySet ()Lit/unimi/dsi/fastutil/ints/IntSet;
+    	METHOD m_qaadkitj get (I)Ljava/lang/Object;
+    		ARG 1 codePoint
+    	METHOD m_qntqpivy computeIfAbsent (ILjava/util/function/IntFunction;)Ljava/lang/Object;
+    		ARG 1 codePoint
+    		ARG 2 mappingFunction
+    	METHOD m_zrfypsvp (Lit/unimi/dsi/fastutil/ints/IntOpenHashSet;ILjava/lang/Object;)V
+    		ARG 1 codePoint
+    		ARG 2 glyph
+    	CLASS C_xbamquui GlyphConsumer
+    		METHOD accept (ILjava/lang/Object;)V
+    			ARG 1 codePoint
+    			ARG 2 glyph

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

3 comments on commit `676b880`

github-actions bot commented on `676b880` Aug 9, 2023

github-actions bot commented on `676b880` Aug 9, 2023

github-actions bot commented on `676b880` Aug 9, 2023

Commit

There are no files selected for viewing

3 comments on commit 676b880

github-actions bot commented on 676b880 Aug 9, 2023

Choose a reason for hiding this comment

github-actions bot commented on 676b880 Aug 9, 2023

Choose a reason for hiding this comment

github-actions bot commented on 676b880 Aug 9, 2023

Choose a reason for hiding this comment

3 comments on commit `676b880`

github-actions bot commented on `676b880` Aug 9, 2023

github-actions bot commented on `676b880` Aug 9, 2023

github-actions bot commented on `676b880` Aug 9, 2023