Skip to content

Commit

Permalink
completed recipe and inventory (#593)
Browse files Browse the repository at this point in the history 
* completed recipe and inventory

* iSlot -> slotIndex

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@supersaiyansubtlety @github-actions
supersaiyansubtlety and github-actions[bot] authored Jun 9, 2024
1 parent 7d56f76 commit 6c155ee
Show file tree
Hide file tree
Showing 24 changed files with 250 additions and 11 deletions.
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ CLASS net/minecraft/unmapped/C_sqxxaglx net/minecraft/block/entity/BrewingStandB
ARG 2 state
ARG 3 blockEntity
METHOD m_zxndtyxk canCraft (Lnet/minecraft/unmapped/C_ilssplzn;Lnet/minecraft/unmapped/C_rnrfftze;)Z
ARG 0 registry
ARG 1 slots
4 changes: 3 additions & 1 deletion mappings/net/minecraft/inventory/RecipeInputInventory.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
CLASS net/minecraft/unmapped/C_fcvwjvlq net/minecraft/inventory/RecipeInputInventory
METHOD m_dvbyvcly getHeight ()I
METHOD m_mmnfalel getInvStack ()Ljava/util/List;
METHOD m_mjhyecbx toPositionedInput ()Lnet/minecraft/unmapped/C_euomljmv$C_yjgdhrsl;
METHOD m_mmnfalel getStacks ()Ljava/util/List;
METHOD m_rkeovwln getWidth ()I
METHOD m_tegcmbjp toInput ()Lnet/minecraft/unmapped/C_euomljmv;
3 changes: 3 additions & 0 deletions mappings/net/minecraft/inventory/StackReference.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ CLASS net/minecraft/unmapped/C_xkkpnyvk net/minecraft/inventory/StackReference
COMMENT no filter, allowing direct manipulation of the equipment slot.
ARG 0 entity
ARG 1 slot
METHOD m_tyujkhps of (Ljava/util/function/Supplier;Ljava/util/function/Consumer;)Lnet/minecraft/unmapped/C_xkkpnyvk;
ARG 0 getter
ARG 1 setter
METHOD m_xhhfnfpi of (Lnet/minecraft/unmapped/C_pjtstjoq;I)Lnet/minecraft/unmapped/C_xkkpnyvk;
COMMENT Creates a stack reference backed by an index within an inventory.
ARG 0 inventory
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CLASS net/minecraft/unmapped/C_hpjdwiwu net/minecraft/recipe/AbstractCookingReci
METHOD m_colblqee getCategory ()Lnet/minecraft/unmapped/C_gtxamkec;
METHOD m_iphifltu getExperience ()F
METHOD m_pnrjaplr getCookTime ()I
CLASS C_fpdfhqvq
CLASS C_fpdfhqvq Factory
METHOD create create (Ljava/lang/String;Lnet/minecraft/unmapped/C_gtxamkec;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_sddaxwyk;FI)Lnet/minecraft/unmapped/C_hpjdwiwu;
ARG 1 group
ARG 2 category
Expand Down
42 changes: 37 additions & 5 deletions mappings/net/minecraft/recipe/BrewingRecipeRegistry.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,50 @@
CLASS net/minecraft/unmapped/C_ilssplzn net/minecraft/recipe/BrewingRecipeRegistry
FIELD f_aruotgdf potionRecipes Ljava/util/List;
FIELD f_dhquiuxe itemRecipes Ljava/util/List;
FIELD f_ltwfhqjw BREWING_TIME_SECONDS I
FIELD f_mxpxplfe bottomIngredients Ljava/util/List;
FIELD f_rhvjiasu EMPTY Lnet/minecraft/unmapped/C_ilssplzn;
METHOD m_bwccxzca create (Lnet/minecraft/unmapped/C_czxxrbcp;)Lnet/minecraft/unmapped/C_ilssplzn;
METHOD m_cugqmywj addVanillaRecipes (Lnet/minecraft/unmapped/C_ilssplzn$C_anvszzom;)V
ARG 0 builder
METHOD m_cwnwpxhs craft (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 input
ARG 1 topInput
ARG 2 bottomInput
METHOD m_fdkgeuuc hasItemRecipe (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
ARG 1 ingredient
METHOD m_ldkmprrc isValidIngredient (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
ARG 1 bottomInput
ARG 2 topInput
METHOD m_kdcuqyob isBottomIngredient (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
METHOD m_ldkmprrc isTopIngredient (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
METHOD m_lronsnat isPotionRecipeIngredient (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
METHOD m_ngonaytv hasPotionRecipe (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
ARG 1 ingredient
ARG 1 bottomInput
ARG 2 topInput
METHOD m_ngyngnto isBrewable (Lnet/minecraft/unmapped/C_cjzoxshv;)Z
ARG 1 potion
METHOD m_wrviwmkr hasRecipe (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
ARG 1 ingredient
ARG 1 bottomInput
ARG 2 topInput
METHOD m_zqdnpuap isItemRecipeIngredient (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
CLASS C_anvszzom Builder
FIELD f_cumxoxtw bottomIngredients Ljava/util/List;
FIELD f_exnloijq itemRecipes Ljava/util/List;
FIELD f_qqsssiby potionRecipes Ljava/util/List;
FIELD f_szfgeigs features Lnet/minecraft/unmapped/C_czxxrbcp;
METHOD m_ilqhdtus build ()Lnet/minecraft/unmapped/C_ilssplzn;
METHOD m_kjbtjqbn addItemRecipe (Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_vorddnax;)V
ARG 1 bottomInput
ARG 2 topInput
ARG 3 output
METHOD m_omxvxkhk addStarterRecipes (Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_cjzoxshv;)V
METHOD m_pdipybln addBottomIngredient (Lnet/minecraft/unmapped/C_vorddnax;)V
METHOD m_sieojnmp addPotionRecipe (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_cjzoxshv;)V
ARG 1 bottomInput
ARG 2 topInput
METHOD m_uovaqaoc requirePotion (Lnet/minecraft/unmapped/C_vorddnax;)V
ARG 0 item
CLASS C_uuqlcqac Recipe
FIELD f_fszziriy ingredient Lnet/minecraft/unmapped/C_tcpsydrv;
FIELD f_qoekordr input Lnet/minecraft/unmapped/C_cjzoxshv;
FIELD f_srxxptri output Lnet/minecraft/unmapped/C_cjzoxshv;
METHOD m_udixioab input ()Lnet/minecraft/unmapped/C_cjzoxshv;
METHOD m_yrmcoeqb output ()Lnet/minecraft/unmapped/C_cjzoxshv;
12 changes: 12 additions & 0 deletions mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,23 @@ CLASS net/minecraft/unmapped/C_nuvmhgvy net/minecraft/recipe/CookingRecipeSerial
FIELD f_wqsghihj packetCodec Lnet/minecraft/unmapped/C_qsrmwluu;
METHOD <init> (Lnet/minecraft/unmapped/C_hpjdwiwu$C_fpdfhqvq;I)V
ARG 2 defaultCookingTime
METHOD m_bmonsixt (Lnet/minecraft/unmapped/C_hpjdwiwu;)Ljava/lang/Integer;
ARG 0 recipe
METHOD m_effbipxl (Lnet/minecraft/unmapped/C_hpjdwiwu;)Lnet/minecraft/unmapped/C_tcpsydrv;
ARG 0 recipe
METHOD m_iklislsa write (Lnet/minecraft/unmapped/C_bngyzsts;Lnet/minecraft/unmapped/C_hpjdwiwu;)V
ARG 1 buf
ARG 2 recipe
METHOD m_nepmthol (Lnet/minecraft/unmapped/C_hpjdwiwu;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 0 recipe
METHOD m_pmzwogut create (Ljava/lang/String;Lnet/minecraft/unmapped/C_gtxamkec;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_sddaxwyk;FI)Lnet/minecraft/unmapped/C_hpjdwiwu;
METHOD m_resmgrzl read (Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_hpjdwiwu;
ARG 1 buf
METHOD m_sthivras (Lnet/minecraft/unmapped/C_hpjdwiwu;)Lnet/minecraft/unmapped/C_gtxamkec;
ARG 0 recipe
METHOD m_vdhhiinh (ILnet/minecraft/unmapped/C_hpjdwiwu$C_fpdfhqvq;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 2 instance
METHOD m_vlrdbrcg (Lnet/minecraft/unmapped/C_hpjdwiwu;)Ljava/lang/Float;
ARG 0 recipe
METHOD m_zsfoyray (Lnet/minecraft/unmapped/C_hpjdwiwu;)Ljava/lang/String;
ARG 0 recipe
22 changes: 22 additions & 0 deletions mappings/net/minecraft/recipe/CraftingRecipeInput.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
CLASS net/minecraft/unmapped/C_euomljmv net/minecraft/recipe/CraftingRecipeInput
FIELD f_ebgyevua stacks Ljava/util/List;
FIELD f_gempqgqe inputCount I
FIELD f_hxkvnbdm matcher Lnet/minecraft/unmapped/C_nyagoaau;
FIELD f_qapubcmu EMPTY Lnet/minecraft/unmapped/C_euomljmv;
FIELD f_tlhfbbvl width I
FIELD f_uucvrzzn height I
METHOD m_dhcnljxm getWidth ()I
METHOD m_dyulubbb of (IILjava/util/List;)Lnet/minecraft/unmapped/C_euomljmv;
METHOD m_oajnzqrl get (II)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 x
ARG 2 y
METHOD m_ogdredzm getStacks ()Ljava/util/List;
METHOD m_plfjjrel getHeight ()I
METHOD m_stcmggrk getInputCount ()I
METHOD m_uywbpkmo createPositioned (IILjava/util/List;)Lnet/minecraft/unmapped/C_euomljmv$C_yjgdhrsl;
ARG 0 width
ARG 1 height
ARG 2 stacks
METHOD m_xankaukl getMatcher ()Lnet/minecraft/unmapped/C_nyagoaau;
CLASS C_yjgdhrsl Positioned
FIELD f_azxqobux EMPTY Lnet/minecraft/unmapped/C_euomljmv$C_yjgdhrsl;
8 changes: 8 additions & 0 deletions mappings/net/minecraft/recipe/CuttingRecipe.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ CLASS net/minecraft/unmapped/C_ziizojwa net/minecraft/recipe/CuttingRecipe
FIELD f_cvxfcxtq recipeFactory Lnet/minecraft/unmapped/C_ziizojwa$C_yunnfuov;
FIELD f_oganfshl packetCodec Lnet/minecraft/unmapped/C_qsrmwluu;
FIELD f_uewnlcpg codec Lcom/mojang/serialization/MapCodec;
METHOD m_ojkkvpce (Lnet/minecraft/unmapped/C_ziizojwa;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 0 recipe
METHOD m_rpznfnko (Lnet/minecraft/unmapped/C_ziizojwa;)Ljava/lang/String;
ARG 0 recipe
METHOD m_sidsyhkb (Lnet/minecraft/unmapped/C_ziizojwa;)Ljava/lang/String;
ARG 0 recipe
METHOD m_xpchnssw (Lnet/minecraft/unmapped/C_ziizojwa;)Lnet/minecraft/unmapped/C_tcpsydrv;
ARG 0 recipe
METHOD m_ylxrzgkw (Lnet/minecraft/unmapped/C_ziizojwa;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 0 recipe
METHOD m_yxvmdgbx (Lnet/minecraft/unmapped/C_ziizojwa;)Lnet/minecraft/unmapped/C_tcpsydrv;
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/recipe/InputSlotFiller.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ CLASS net/minecraft/unmapped/C_rqdekljo net/minecraft/recipe/InputSlotFiller
FIELD f_mmlmkitf inventory Lnet/minecraft/unmapped/C_sxzqocrm;
FIELD f_mykbaanb handler Lnet/minecraft/unmapped/C_mugvwvfp;
FIELD f_qrfjlbyk matcher Lnet/minecraft/unmapped/C_nyagoaau;
FIELD f_tqmjruaz MISSING_INDEX I
METHOD <init> (Lnet/minecraft/unmapped/C_mugvwvfp;)V
ARG 1 handler
METHOD m_eludjpso returnInputs ()V
METHOD m_mnhwpoca moveToSlot (Lnet/minecraft/unmapped/C_nhvqfffd;Lnet/minecraft/unmapped/C_sddaxwyk;I)I
ARG 1 slot
ARG 3 amount
METHOD m_ohlssgdj getFreeInventorySlots ()I
METHOD m_qwrqexeh getAmountToFill (ZIZ)I
ARG 1 craftAll
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/recipe/MapExtendingRecipe.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
CLASS net/minecraft/unmapped/C_cdhgeyop net/minecraft/recipe/MapExtendingRecipe
METHOD <init> (Lnet/minecraft/unmapped/C_aodytokc;)V
ARG 1 category
METHOD m_gfiwlaty findFilledMap (Lnet/minecraft/unmapped/C_euomljmv;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 0 input
7 changes: 7 additions & 0 deletions mappings/net/minecraft/recipe/Recipe.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ CLASS net/minecraft/unmapped/C_awrmdwqd net/minecraft/recipe/Recipe
COMMENT <p>
COMMENT The returned stack should not be modified. To obtain the actual output,
COMMENT call {@link #craft(Inventory, DynamicRegistryManager)}.
ARG 1 provider
METHOD m_jjsxdttb matches (Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Z
ARG 1 input
METHOD m_njccjhdt getIngredients ()Lnet/minecraft/unmapped/C_rnrfftze;
COMMENT {@return the ingredients accepted as inputs for this recipe} Used by the recipe book
COMMENT when displaying a ghost form of this recipe on the crafting grid as well as for
Expand All @@ -37,12 +40,16 @@ CLASS net/minecraft/unmapped/C_awrmdwqd net/minecraft/recipe/Recipe
COMMENT the width of the input inventory
ARG 2 height
COMMENT the height of the input inventory
METHOD m_pyffiody getRemainder (Lnet/minecraft/unmapped/C_cxmcihwl;)Lnet/minecraft/unmapped/C_rnrfftze;
ARG 1 input
METHOD m_qqucltqj showNotification ()Z
COMMENT {@return whenever this recipe should show a toast notification on being unlocked or not}
METHOD m_qzlhmcik isEmpty ()Z
COMMENT {@return whether this recipe has no ingredient or has any empty ingredient}
COMMENT The recipe book uses this to ignore recipes for display.
METHOD m_tikgmnde craft (Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 input
ARG 2 provider
METHOD m_ttbvwfef getType ()Lnet/minecraft/unmapped/C_rhnqznys;
COMMENT {@return the type of this recipe}
COMMENT
Expand Down
12 changes: 12 additions & 0 deletions mappings/net/minecraft/recipe/RecipeCache.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@ CLASS net/minecraft/unmapped/C_edmnjlch net/minecraft/recipe/RecipeCache
FIELD f_ziakvpmc recipeManager Ljava/lang/ref/WeakReference;
METHOD <init> (I)V
ARG 1 size
METHOD m_cwdmboht getFirstMatch (Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_cdctfzbn;)Ljava/util/Optional;
ARG 1 input
METHOD m_gsxudlwe cache (Lnet/minecraft/unmapped/C_euomljmv;Lnet/minecraft/unmapped/C_dscbrwbj;)V
ARG 1 input
ARG 2 recipe
METHOD m_lxnjadgw updateRecipeManager (Lnet/minecraft/unmapped/C_cdctfzbn;)V
METHOD m_qifbizlb moveToFront (I)V
ARG 1 i
METHOD m_tipfbwpi getFirstMatch (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_euomljmv;)Ljava/util/Optional;
ARG 2 input
CLASS C_raahqxfc CachedRecipe
FIELD f_sdhpultj recipe Lnet/minecraft/unmapped/C_dscbrwbj;
METHOD m_nnriquoq recipe ()Lnet/minecraft/unmapped/C_dscbrwbj;
METHOD m_ocoodxth matches (Lnet/minecraft/unmapped/C_euomljmv;)Z
ARG 1 input
6 changes: 6 additions & 0 deletions mappings/net/minecraft/recipe/RecipeGridAligner.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,9 @@ CLASS net/minecraft/unmapped/C_wuyfqgmj net/minecraft/recipe/RecipeGridAligner
ARG 4 recipe
ARG 5 inputs
ARG 6 amount
METHOD m_vnshednj collectToInput (Ljava/lang/Object;IIII)V
ARG 1 itemId
ARG 2 slotIndex
ARG 3 amount
ARG 4 x
ARG 5 y
5 changes: 5 additions & 0 deletions mappings/net/minecraft/recipe/RecipeInput.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CLASS net/minecraft/unmapped/C_cxmcihwl net/minecraft/recipe/RecipeInput
METHOD m_gptaeput getSize ()I
METHOD m_hhjzrppb get (I)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 i
METHOD m_wuqjkela isEmpty ()Z
35 changes: 31 additions & 4 deletions mappings/net/minecraft/recipe/RecipeManager.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ CLASS net/minecraft/unmapped/C_hjseusrb net/minecraft/recipe/RecipeManager
COMMENT A recipe manager allows easier use of recipes, such as finding matches and
COMMENT remainders. It is also integrated with a recipe loader, which loads recipes
COMMENT from data packs' JSON files.
FIELD f_cfijlewf lookupProvider Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;
FIELD f_hqaaykcp LOGGER Lorg/slf4j/Logger;
FIELD f_jrpzcqji recipeFlatMap Ljava/util/Map;
FIELD f_jrpzcqji recipes Ljava/util/Map;
FIELD f_kwbdpvdv GSON Lcom/google/gson/Gson;
FIELD f_nkouqikk recipesByType Lcom/google/common/collect/Multimap;
FIELD f_yehcypye errored Z
COMMENT This isn't quite indicating an errored state; its value is only set to
COMMENT {@code false} and is never {@code true}, and isn't used anywhere.
Expand All @@ -18,6 +20,8 @@ CLASS net/minecraft/unmapped/C_hjseusrb net/minecraft/recipe/RecipeManager
COMMENT @return the created list of recipes of the given {@code type}
ARG 1 type
COMMENT the desired recipe type
METHOD m_dqmahbpp (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_dscbrwbj;)Ljava/lang/String;
ARG 1 recipe
METHOD m_dsxpcpxk get (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/Optional;
COMMENT {@return a recipe with the given {@code id}, or empty if there is no such recipe}
ARG 1 id
Expand All @@ -36,9 +40,30 @@ CLASS net/minecraft/unmapped/C_hjseusrb net/minecraft/recipe/RecipeManager
COMMENT the recipe's ID
ARG 1 json
COMMENT the recipe JSON
ARG 2 lookupProvider
METHOD m_hrukhdkd getAllMatches (Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Ljava/util/List;
ARG 2 input
METHOD m_igyegyvq getFirstMatch (Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_dscbrwbj;)Ljava/util/Optional;
ARG 1 type
METHOD m_jgeojtch get (Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_dscbrwbj;
ARG 1 type
ARG 2 id
METHOD m_jhsqhnru (Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_dscbrwbj;)Z
ARG 2 recipe
METHOD m_msetooyk (Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_dscbrwbj;)Z
ARG 2 recipe
METHOD m_mubfpsqe getSortedRecieps ()Ljava/util/Collection;
METHOD m_oegdnaun getFirstMatch (Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/Optional;
ARG 1 type
ARG 2 input
ARG 4 id
METHOD m_omtmmszf getFirstMatch (Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Ljava/util/Optional;
ARG 1 type
METHOD m_oqvxqpcm createCheck (Lnet/minecraft/unmapped/C_rhnqznys;)Lnet/minecraft/unmapped/C_hjseusrb$C_bvtkxdyi;
ARG 0 type
METHOD m_tfsmuhjx keys ()Ljava/util/stream/Stream;
METHOD m_pgjmabyy getRemainder (Lnet/minecraft/unmapped/C_rhnqznys;Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Lnet/minecraft/unmapped/C_rnrfftze;
ARG 2 input
METHOD m_tfsmuhjx streamIds ()Ljava/util/stream/Stream;
COMMENT {@return a stream of IDs of recipes in this manager}
COMMENT <p>
COMMENT The returned stream does not update after {@link #setRecipes(Iterable)}
Expand All @@ -51,16 +76,18 @@ CLASS net/minecraft/unmapped/C_hjseusrb net/minecraft/recipe/RecipeManager
COMMENT side recipes.
ARG 1 recipes
COMMENT the recipes to set
METHOD m_vrjdrstk values ()Ljava/util/Collection;
METHOD m_vrjdrstk getRecipes ()Ljava/util/Collection;
COMMENT {@return all recipes in this manager}
COMMENT
COMMENT <p>The returned set does not update with the manager. Modifications to the
COMMENT returned set does not affect this manager.
COMMENT returned set do not affect this manager.
METHOD m_xkivhqgi getAllOfType (Lnet/minecraft/unmapped/C_rhnqznys;)Ljava/util/Collection;
ARG 1 type
METHOD m_xyhfuata isErrored ()Z
COMMENT {@return the {@link #errored} field}
COMMENT This is unused in vanilla and will only return {@code false} without mods.
CLASS C_bvtkxdyi CachedCheck
METHOD m_ltqsvwgf getFirstMatch (Lnet/minecraft/unmapped/C_cxmcihwl;Lnet/minecraft/unmapped/C_cdctfzbn;)Ljava/util/Optional;
ARG 1 input
CLASS C_ioxglbpe
FIELD f_kspyemsz lastRecipe Lnet/minecraft/unmapped/C_ncpywfca;
9 changes: 9 additions & 0 deletions mappings/net/minecraft/recipe/RepairItemRecipe.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
CLASS net/minecraft/unmapped/C_oeuthbtr net/minecraft/recipe/RepairItemRecipe
METHOD m_qssibaeg (Lnet/minecraft/unmapped/C_qlclfxvn;Lnet/minecraft/unmapped/C_qlclfxvn;Lnet/minecraft/unmapped/C_qlclfxvn$C_vbojeisc;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)V
ARG 3 enchantment
METHOD m_sywqdcal canCombine (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
ARG 0 left
ARG 1 right
METHOD m_tplyzfou (Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Z
ARG 0 enchantment
METHOD m_tsxbkugn findItemsToCombine (Lnet/minecraft/unmapped/C_euomljmv;)Lcom/mojang/datafixers/util/Pair;
ARG 1 input
12 changes: 12 additions & 0 deletions mappings/net/minecraft/recipe/ShapedRecipe.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ CLASS net/minecraft/unmapped/C_svdvbdmc net/minecraft/recipe/ShapedRecipe
FIELD f_kluqlqus group Ljava/lang/String;
FIELD f_lmfiwnld showNotification Z
FIELD f_lvnwosug category Lnet/minecraft/unmapped/C_aodytokc;
FIELD f_ojflzowa pattern Lnet/minecraft/unmapped/C_vhpbjodz;
FIELD f_vgraaxco result Lnet/minecraft/unmapped/C_sddaxwyk;
METHOD <init> (Ljava/lang/String;Lnet/minecraft/unmapped/C_aodytokc;Lnet/minecraft/unmapped/C_vhpbjodz;Lnet/minecraft/unmapped/C_sddaxwyk;)V
ARG 1 group
ARG 2 category
ARG 3 pattern
ARG 4 result
METHOD <init> (Ljava/lang/String;Lnet/minecraft/unmapped/C_aodytokc;Lnet/minecraft/unmapped/C_vhpbjodz;Lnet/minecraft/unmapped/C_sddaxwyk;Z)V
ARG 1 group
Expand All @@ -22,6 +24,16 @@ CLASS net/minecraft/unmapped/C_svdvbdmc net/minecraft/recipe/ShapedRecipe
FIELD f_ejfycfvl PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
METHOD m_dasqedjj read (Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_svdvbdmc;
ARG 0 buf
METHOD m_jbkydnfi (Lnet/minecraft/unmapped/C_svdvbdmc;)Ljava/lang/String;
ARG 0 recipe
METHOD m_mlmeipth write (Lnet/minecraft/unmapped/C_bngyzsts;Lnet/minecraft/unmapped/C_svdvbdmc;)V
ARG 0 buf
ARG 1 recipe
METHOD m_ncfcuvdc (Lnet/minecraft/unmapped/C_svdvbdmc;)Lnet/minecraft/unmapped/C_vhpbjodz;
ARG 0 recipe
METHOD m_sqpfeame (Lnet/minecraft/unmapped/C_svdvbdmc;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 0 recipe
METHOD m_wgmkbqrn (Lnet/minecraft/unmapped/C_svdvbdmc;)Ljava/lang/Boolean;
ARG 0 recipe
METHOD m_yqnxzhlg (Lnet/minecraft/unmapped/C_svdvbdmc;)Lnet/minecraft/unmapped/C_aodytokc;
ARG 0 recipe
Loading

3 comments on commit 6c155ee

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

With commit 6c155ee, 493 file(s) were updated with 2114 line(s) added and 2073 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/advancement/Advancement.java namedSrc/net/minecraft/advancement/Advancement.java
--- namedTargetSrc/net/minecraft/advancement/Advancement.java	2024-06-09 03:13:55.459661352 +0000
+++ namedSrc/net/minecraft/advancement/Advancement.java	2024-06-09 03:12:40.386383707 +0000
@@ -347,7 +347,7 @@
        * @mapping {@literal named build Lnet/minecraft/advancement/Advancement$Builder;build(Ljava/util/function/Consumer;Ljava/lang/String;)Lnet/minecraft/advancement/AdvancementHolder;}
        */
       public AdvancementHolder build(Consumer<AdvancementHolder> consumer, String id) {
-         AdvancementHolder lv = this.build(Identifier.m_qfesvyds(id));
+         AdvancementHolder lv = this.build(Identifier.parse(id));
          consumer.accept(lv);
          return lv;
       }
diff -bur namedTargetSrc/net/minecraft/block/BlockRegistryKeys.java namedSrc/net/minecraft/block/BlockRegistryKeys.java
--- namedTargetSrc/net/minecraft/block/BlockRegistryKeys.java	2024-06-09 03:13:55.667664788 +0000
+++ namedSrc/net/minecraft/block/BlockRegistryKeys.java	2024-06-09 03:12:40.610387045 +0000
@@ -45,6 +45,6 @@
     * @mapping {@literal named of Lnet/minecraft/block/BlockRegistryKeys;of(Ljava/lang/String;)Lnet/minecraft/registry/RegistryKey;}
     */
    private static RegistryKey<Block> of(String path) {
-      return RegistryKey.of(RegistryKeys.BLOCK, Identifier.m_anmnhtwf(path));
+      return RegistryKey.of(RegistryKeys.BLOCK, Identifier.ofDefault(path));
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/CrafterBlock.java namedSrc/net/minecraft/block/CrafterBlock.java
--- namedTargetSrc/net/minecraft/block/CrafterBlock.java	2024-06-09 03:13:55.439661021 +0000
+++ namedSrc/net/minecraft/block/CrafterBlock.java	2024-06-09 03:12:40.358383291 +0000
@@ -16,6 +16,7 @@
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.item.ItemStack;
 import net.minecraft.recipe.CraftingRecipe;
+import net.minecraft.recipe.CraftingRecipeInput;
 import net.minecraft.recipe.RecipeCache;
 import net.minecraft.recipe.RecipeHolder;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -24,7 +25,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_euomljmv;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -238,7 +238,7 @@
     */
    protected void craft(BlockState state, ServerWorld world, BlockPos pos) {
       if (world.getBlockEntity(pos) instanceof CrafterBlockEntity lv) {
-         C_euomljmv var11 = lv.m_tegcmbjp();
+         CraftingRecipeInput var11 = lv.toInput();
          Optional<RecipeHolder<CraftingRecipe>> optional = m_jtimyngh(world, var11);
          if (optional.isEmpty()) {
             world.syncWorldEvent(WorldEvents.CRAFTER_FAIL, pos, 0);
@@ -253,13 +253,13 @@
                lv5.onCraft(world);
                this.craft(world, pos, lv, lv5, state, lv4);
 
-               for (ItemStack lv6 : lv4.value().m_pyffiody(var11)) {
+               for (ItemStack lv6 : lv4.value().getRemainder(var11)) {
                   if (!lv6.isEmpty()) {
                      this.craft(world, pos, lv, lv6, state, lv4);
                   }
                }
 
-               lv.getInvStack().forEach(stack -> {
+               lv.getStacks().forEach(stack -> {
                   if (!stack.isEmpty()) {
                      stack.decrement(1);
                   }
@@ -272,10 +272,10 @@
 
    /**
     * @mapping {@literal hashed m_jtimyngh Lnet/minecraft/unmapped/C_dmnruvyr;m_jtimyngh(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_euomljmv;)Ljava/util/Optional;}
-    * @mapping {@literal named m_jtimyngh Lnet/minecraft/block/CrafterBlock;m_jtimyngh(Lnet/minecraft/world/World;Lnet/minecraft/unmapped/C_euomljmv;)Ljava/util/Optional;}
+    * @mapping {@literal named m_jtimyngh Lnet/minecraft/block/CrafterBlock;m_jtimyngh(Lnet/minecraft/world/World;Lnet/minecraft/recipe/CraftingRecipeInput;)Ljava/util/Optional;}
     */
-   public static Optional<RecipeHolder<CraftingRecipe>> m_jtimyngh(World world, C_euomljmv arg2) {
-      return RECIPE_CACHE.m_tipfbwpi(world, arg2);
+   public static Optional<RecipeHolder<CraftingRecipe>> m_jtimyngh(World world, CraftingRecipeInput input) {
+      return RECIPE_CACHE.getFirstMatch(world, input);
    }
 
    /**
@@ -312,7 +312,7 @@
          ItemDispenserBehavior.spawnItem(world, lv3, 6, lv, lv7);
 
          for (ServerPlayerEntity lv8 : world.getNonSpectatingEntities(ServerPlayerEntity.class, Box.of(lv6, 17.0, 17.0, 17.0))) {
-            Criteria.CRAFTER_RECIPE_CRAFTED.trigger(lv8, arg6.id(), blockEntity.getInvStack());
+            Criteria.CRAFTER_RECIPE_CRAFTED.trigger(lv8, arg6.id(), blockEntity.getStacks());
          }
 
          world.syncWorldEvent(WorldEvents.CRAFTER_CRAFT, pos, 0);
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java namedSrc/net/minecraft/block/DecoratedPotBlock.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java	2024-06-09 03:13:55.399660361 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2024-06-09 03:12:40.318382694 +0000
@@ -69,7 +69,7 @@
     * @mapping {@literal hashed f_tohwohru Lnet/minecraft/unmapped/C_bnspifpc;f_tohwohru:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SHERDS Lnet/minecraft/block/DecoratedPotBlock;SHERDS:Lnet/minecraft/util/Identifier;}
     */
-   public static final Identifier SHERDS = Identifier.m_anmnhtwf("sherds");
+   public static final Identifier SHERDS = Identifier.ofDefault("sherds");
    /**
     * @mapping {@literal hashed f_xkbierxx Lnet/minecraft/unmapped/C_bnspifpc;f_xkbierxx:Lnet/minecraft/unmapped/C_zscvhwbd;}
     * @mapping {@literal named SHAPE Lnet/minecraft/block/DecoratedPotBlock;SHAPE:Lnet/minecraft/util/shape/VoxelShape;}
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotPatterns.java namedSrc/net/minecraft/block/DecoratedPotPatterns.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotPatterns.java	2024-06-09 03:13:55.523662408 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotPatterns.java	2024-06-09 03:12:40.458384781 +0000
@@ -179,7 +179,7 @@
     * @mapping {@literal named createRegistryKey Lnet/minecraft/block/DecoratedPotPatterns;createRegistryKey(Ljava/lang/String;)Lnet/minecraft/registry/RegistryKey;}
     */
    private static RegistryKey<C_xtwumkqz> createRegistryKey(String id) {
-      return RegistryKey.of(RegistryKeys.DECORATED_POT_PATTERN, Identifier.m_anmnhtwf(id));
+      return RegistryKey.of(RegistryKeys.DECORATED_POT_PATTERN, Identifier.ofDefault(id));
    }
 
    /**
@@ -218,6 +218,6 @@
     * @mapping {@literal named m_ynjeyckb Lnet/minecraft/block/DecoratedPotPatterns;m_ynjeyckb(Lnet/minecraft/registry/Registry;Lnet/minecraft/registry/RegistryKey;Ljava/lang/String;)Lnet/minecraft/unmapped/C_xtwumkqz;}
     */
    private static C_xtwumkqz m_ynjeyckb(Registry<C_xtwumkqz> registry, RegistryKey<C_xtwumkqz> registryKey, String path) {
-      return Registry.register(registry, registryKey, new C_xtwumkqz(Identifier.m_anmnhtwf(path)));
+      return Registry.register(registry, registryKey, new C_xtwumkqz(Identifier.ofDefault(path)));
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-06-09 03:13:55.439661021 +0000
+++ namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-06-09 03:12:40.358383291 +0000
@@ -26,6 +26,7 @@
 import net.minecraft.recipe.RecipeManager;
 import net.minecraft.recipe.RecipeMatcher;
 import net.minecraft.recipe.RecipeType;
+import net.minecraft.recipe.SingleRecipeInput;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.HolderLookup;
@@ -35,7 +36,6 @@
 import net.minecraft.screen.PropertyDelegate;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_hsoxiypb;
 import net.minecraft.unmapped.C_mudajugr;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -209,7 +209,7 @@
     * @mapping {@literal hashed f_rhexgeen Lnet/minecraft/unmapped/C_dlxbwxyf;f_rhexgeen:Lnet/minecraft/unmapped/C_hjseusrb$C_bvtkxdyi;}
     * @mapping {@literal named recipeCache Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;recipeCache:Lnet/minecraft/recipe/RecipeManager$CachedCheck;}
     */
-   private final RecipeManager.CachedCheck<C_hsoxiypb, ? extends AbstractCookingRecipe> recipeCache;
+   private final RecipeManager.CachedCheck<SingleRecipeInput, ? extends AbstractCookingRecipe> recipeCache;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_dlxbwxyf;<init>(Lnet/minecraft/unmapped/C_wgqvodus;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_rhnqznys;)V}
@@ -369,7 +369,7 @@
       NbtCompound lv = arg.getCompound("RecipesUsed");
 
       for (String string : lv.getKeys()) {
-         this.recipesUsed.put(Identifier.m_qfesvyds(string), lv.getInt(string));
+         this.recipesUsed.put(Identifier.parse(string), lv.getInt(string));
       }
    }
 
@@ -406,7 +406,7 @@
       if (blockEntity.isBurning() || bl4 && bl3) {
          RecipeHolder<?> lv3;
          if (bl3) {
-            lv3 = (RecipeHolder<?>)blockEntity.recipeCache.m_ltqsvwgf(new C_hsoxiypb(lv2), world).orElse(null);
+            lv3 = (RecipeHolder<?>)blockEntity.recipeCache.getFirstMatch(new SingleRecipeInput(lv2), world).orElse(null);
          } else {
             lv3 = null;
          }
@@ -527,8 +527,8 @@
     * @mapping {@literal named getCookTime Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;getCookTime(Lnet/minecraft/world/World;Lnet/minecraft/block/entity/AbstractFurnaceBlockEntity;)I}
     */
    private static int getCookTime(World world, AbstractFurnaceBlockEntity blockEntity) {
-      C_hsoxiypb lv = new C_hsoxiypb(blockEntity.getStack(0));
-      return (Integer)blockEntity.recipeCache.m_ltqsvwgf(lv, world).map(recipe -> ((AbstractCookingRecipe)recipe.value()).getCookTime()).orElse(200);
+      SingleRecipeInput lv = new SingleRecipeInput(blockEntity.getStack(0));
+      return (Integer)blockEntity.recipeCache.getFirstMatch(lv, world).map(recipe -> ((AbstractCookingRecipe)recipe.value()).getCookTime()).orElse(200);
    }
 
    /**
@@ -579,7 +579,7 @@
     * Mapping not found
     */
    @Override
-   protected DefaultedList<ItemStack> getInvStack() {
+   protected DefaultedList<ItemStack> getStacks() {
       return this.inventory;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/BarrelBlockEntity.java namedSrc/net/minecraft/block/entity/BarrelBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BarrelBlockEntity.java	2024-06-09 03:13:55.631664192 +0000
+++ namedSrc/net/minecraft/block/entity/BarrelBlockEntity.java	2024-06-09 03:12:40.570386449 +0000
@@ -119,7 +119,7 @@
     * Mapping not found
     */
    @Override
-   protected DefaultedList<ItemStack> getInvStack() {
+   protected DefaultedList<ItemStack> getStacks() {
       return this.inventory;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java namedSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java	2024-06-09 03:13:55.499662013 +0000
+++ namedSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java	2024-06-09 03:12:40.430384364 +0000
@@ -168,7 +168,7 @@
     * Mapping not found
     */
    @Override
-   protected DefaultedList<ItemStack> getInvStack() {
+   protected DefaultedList<ItemStack> getStacks() {
       return this.inventory;
    }
 
@@ -248,16 +248,16 @@
     * @mapping {@literal hashed m_zxndtyxk Lnet/minecraft/unmapped/C_sqxxaglx;m_zxndtyxk(Lnet/minecraft/unmapped/C_ilssplzn;Lnet/minecraft/unmapped/C_rnrfftze;)Z}
     * @mapping {@literal named canCraft Lnet/minecraft/block/entity/BrewingStandBlockEntity;canCraft(Lnet/minecraft/recipe/BrewingRecipeRegistry;Lnet/minecraft/util/collection/DefaultedList;)Z}
     */
-   private static boolean canCraft(BrewingRecipeRegistry arg, DefaultedList<ItemStack> slots) {
+   private static boolean canCraft(BrewingRecipeRegistry registry, DefaultedList<ItemStack> slots) {
       ItemStack lv = slots.get(3);
       if (lv.isEmpty()) {
          return false;
-      } else if (!arg.isValidIngredient(lv)) {
+      } else if (!registry.isTopIngredient(lv)) {
          return false;
       } else {
          for (int i = 0; i < 3; i++) {
             ItemStack lv2 = slots.get(i);
-            if (!lv2.isEmpty() && arg.hasRecipe(lv2, lv)) {
+            if (!lv2.isEmpty() && registry.hasRecipe(lv2, lv)) {
                return true;
             }
          }
@@ -325,8 +325,8 @@
    @Override
    public boolean isValid(int slot, ItemStack stack) {
       if (slot == 3) {
-         BrewingRecipeRegistry lv = this.world != null ? this.world.m_gbuudpbq() : BrewingRecipeRegistry.f_rhvjiasu;
-         return lv.isValidIngredient(stack);
+         BrewingRecipeRegistry lv = this.world != null ? this.world.m_gbuudpbq() : BrewingRecipeRegistry.EMPTY;
+         return lv.isTopIngredient(stack);
       } else {
          return slot == 4
             ? stack.isOf(Items.BLAZE_POWDER)
diff -bur namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-06-09 03:13:55.571663201 +0000
+++ namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-06-09 03:12:40.506385496 +0000
@@ -266,7 +266,7 @@
     */
    private boolean deserializeLootTable(NbtCompound nbt) {
       if (nbt.contains("LootTable", NbtElement.STRING_TYPE)) {
-         this.lootTableId = RegistryKey.of(RegistryKeys.LOOT_TABLE, Identifier.m_qfesvyds(nbt.getString("LootTable")));
+         this.lootTableId = RegistryKey.of(RegistryKeys.LOOT_TABLE, Identifier.parse(nbt.getString("LootTable")));
          this.lootTableSeed = nbt.getLong("LootTableSeed");
          return true;
       } else {
diff -bur namedTargetSrc/net/minecraft/block/entity/CampfireBlockEntity.java namedSrc/net/minecraft/block/entity/CampfireBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/CampfireBlockEntity.java	2024-06-09 03:13:55.351659567 +0000
+++ namedSrc/net/minecraft/block/entity/CampfireBlockEntity.java	2024-06-09 03:12:40.238381502 +0000
@@ -18,8 +18,8 @@
 import net.minecraft.recipe.RecipeHolder;
 import net.minecraft.recipe.RecipeManager;
 import net.minecraft.recipe.RecipeType;
+import net.minecraft.recipe.SingleRecipeInput;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_hsoxiypb;
 import net.minecraft.util.Clearable;
 import net.minecraft.util.ItemScatterer;
 import net.minecraft.util.collection.DefaultedList;
@@ -65,7 +65,7 @@
     * @mapping {@literal hashed f_sjgmjpuy Lnet/minecraft/unmapped/C_wmubauif;f_sjgmjpuy:Lnet/minecraft/unmapped/C_hjseusrb$C_bvtkxdyi;}
     * @mapping {@literal named recipeCache Lnet/minecraft/block/entity/CampfireBlockEntity;recipeCache:Lnet/minecraft/recipe/RecipeManager$CachedCheck;}
     */
-   private final RecipeManager.CachedCheck<C_hsoxiypb, CampfireCookingRecipe> recipeCache = RecipeManager.createCheck(RecipeType.CAMPFIRE_COOKING);
+   private final RecipeManager.CachedCheck<SingleRecipeInput, CampfireCookingRecipe> recipeCache = RecipeManager.createCheck(RecipeType.CAMPFIRE_COOKING);
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wmubauif;<init>(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
@@ -88,9 +88,9 @@
             bl = true;
             campfire.cookingTimes[i]++;
             if (campfire.cookingTimes[i] >= campfire.cookingTotalTimes[i]) {
-               C_hsoxiypb lv2 = new C_hsoxiypb(lv);
+               SingleRecipeInput lv2 = new SingleRecipeInput(lv);
                ItemStack lv3 = (ItemStack)campfire.recipeCache
-                  .m_ltqsvwgf(lv2, world)
+                  .getFirstMatch(lv2, world)
                   .map(arg3 -> ((CampfireCookingRecipe)arg3.value()).craft(lv2, world.getRegistryManager()))
                   .orElse(lv);
                if (lv3.isEnabled(world.getEnabledFlags())) {
@@ -217,7 +217,9 @@
     * @mapping {@literal named getRecipeFor Lnet/minecraft/block/entity/CampfireBlockEntity;getRecipeFor(Lnet/minecraft/item/ItemStack;)Ljava/util/Optional;}
     */
    public Optional<RecipeHolder<CampfireCookingRecipe>> getRecipeFor(ItemStack item) {
-      return this.itemsBeingCooked.stream().noneMatch(ItemStack::isEmpty) ? Optional.empty() : this.recipeCache.m_ltqsvwgf(new C_hsoxiypb(item), this.world);
+      return this.itemsBeingCooked.stream().noneMatch(ItemStack::isEmpty)
+         ? Optional.empty()
+         : this.recipeCache.getFirstMatch(new SingleRecipeInput(item), this.world);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/ChestBlockEntity.java namedSrc/net/minecraft/block/entity/ChestBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/ChestBlockEntity.java	2024-06-09 03:13:55.551662871 +0000
+++ namedSrc/net/minecraft/block/entity/ChestBlockEntity.java	2024-06-09 03:12:40.490385258 +0000
@@ -208,7 +208,7 @@
     * Mapping not found
     */
    @Override
-   protected DefaultedList<ItemStack> getInvStack() {
+   protected DefaultedList<ItemStack> getStacks() {
       return this.inventory;
    }
 
@@ -249,8 +249,8 @@
     * @mapping {@literal named copyInventory Lnet/minecraft/block/entity/ChestBlockEntity;copyInventory(Lnet/minecraft/block/entity/ChestBlockEntity;Lnet/minecraft/block/entity/ChestBlockEntity;)V}
     */
    public static void copyInventory(ChestBlockEntity from, ChestBlockEntity to) {
-      DefaultedList<ItemStack> lv = from.getInvStack();
-      from.m_nnlaacjo(to.getInvStack());
+      DefaultedList<ItemStack> lv = from.getStacks();
+      from.m_nnlaacjo(to.getStacks());
       to.m_nnlaacjo(lv);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/CrafterBlockEntity.java namedSrc/net/minecraft/block/entity/CrafterBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/CrafterBlockEntity.java	2024-06-09 03:13:55.639664324 +0000
+++ namedSrc/net/minecraft/block/entity/CrafterBlockEntity.java	2024-06-09 03:12:40.578386568 +0000
@@ -290,10 +290,10 @@
 
    /**
     * @mapping {@literal hashed m_drxlwzcv Lnet/minecraft/unmapped/C_lamqkfie;m_drxlwzcv()Lnet/minecraft/unmapped/C_rnrfftze;}
-    * @mapping {@literal named getInvStack Lnet/minecraft/block/entity/CrafterBlockEntity;getInvStack()Lnet/minecraft/util/collection/DefaultedList;}
+    * @mapping {@literal named getStacks Lnet/minecraft/block/entity/CrafterBlockEntity;getStacks()Lnet/minecraft/util/collection/DefaultedList;}
     */
    @Override
-   public DefaultedList<ItemStack> getInvStack() {
+   public DefaultedList<ItemStack> getStacks() {
       return this.inputStacks;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/DispenserBlockEntity.java namedSrc/net/minecraft/block/entity/DispenserBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/DispenserBlockEntity.java	2024-06-09 03:13:55.535662607 +0000
+++ namedSrc/net/minecraft/block/entity/DispenserBlockEntity.java	2024-06-09 03:12:40.474385019 +0000
@@ -135,7 +135,7 @@
     * Mapping not found
     */
    @Override
-   protected DefaultedList<ItemStack> getInvStack() {
+   protected DefaultedList<ItemStack> getStacks() {
       return this.inventory;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/HopperBlockEntity.java namedSrc/net/minecraft/block/entity/HopperBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/HopperBlockEntity.java	2024-06-09 03:13:55.399660361 +0000
+++ namedSrc/net/minecraft/block/entity/HopperBlockEntity.java	2024-06-09 03:12:40.318382694 +0000
@@ -118,7 +118,7 @@
    @Override
    public ItemStack removeStack(int slot, int amount) {
       this.setupLoot(null);
-      return Inventories.splitStack(this.getInvStack(), slot, amount);
+      return Inventories.splitStack(this.getStacks(), slot, amount);
    }
 
    /**
@@ -127,7 +127,7 @@
    @Override
    public void setStack(int slot, ItemStack stack) {
       this.setupLoot(null);
-      this.getInvStack().set(slot, stack);
+      this.getStacks().set(slot, stack);
       stack.m_uzwjgkgy(this.getMaxCount(stack));
    }
 
@@ -612,7 +612,7 @@
     * Mapping not found
     */
    @Override
-   protected DefaultedList<ItemStack> getInvStack() {
+   protected DefaultedList<ItemStack> getStacks() {
       return this.inventory;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/JigsawBlockEntity.java namedSrc/net/minecraft/block/entity/JigsawBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/JigsawBlockEntity.java	2024-06-09 03:13:55.431660888 +0000
+++ namedSrc/net/minecraft/block/entity/JigsawBlockEntity.java	2024-06-09 03:12:40.350383172 +0000
@@ -64,17 +64,17 @@
     * @mapping {@literal hashed f_xdvjxegm Lnet/minecraft/unmapped/C_epwegwuj;f_xdvjxegm:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named name Lnet/minecraft/block/entity/JigsawBlockEntity;name:Lnet/minecraft/util/Identifier;}
     */
-   private Identifier name = Identifier.m_anmnhtwf("empty");
+   private Identifier name = Identifier.ofDefault("empty");
    /**
     * @mapping {@literal hashed f_qayxtlva Lnet/minecraft/unmapped/C_epwegwuj;f_qayxtlva:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named target Lnet/minecraft/block/entity/JigsawBlockEntity;target:Lnet/minecraft/util/Identifier;}
     */
-   private Identifier target = Identifier.m_anmnhtwf("empty");
+   private Identifier target = Identifier.ofDefault("empty");
    /**
     * @mapping {@literal hashed f_lcpiixct Lnet/minecraft/unmapped/C_epwegwuj;f_lcpiixct:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named pool Lnet/minecraft/block/entity/JigsawBlockEntity;pool:Lnet/minecraft/registry/RegistryKey;}
     */
-   private RegistryKey<StructurePool> pool = RegistryKey.of(RegistryKeys.STRUCTURE_POOL, Identifier.m_anmnhtwf("empty"));
+   private RegistryKey<StructurePool> pool = RegistryKey.of(RegistryKeys.STRUCTURE_POOL, Identifier.ofDefault("empty"));
    /**
     * @mapping {@literal hashed f_rflqmaju Lnet/minecraft/unmapped/C_epwegwuj;f_rflqmaju:Lnet/minecraft/unmapped/C_epwegwuj$C_exgsbpfq;}
     * @mapping {@literal named joint Lnet/minecraft/block/entity/JigsawBlockEntity;joint:Lnet/minecraft/block/entity/JigsawBlockEntity$Joint;}
@@ -237,9 +237,9 @@
    @Override
    protected void m_trzmaydr(NbtCompound arg, HolderLookup.Provider arg2) {
       super.m_trzmaydr(arg, arg2);
-      this.name = Identifier.m_qfesvyds(arg.getString("name"));
-      this.target = Identifier.m_qfesvyds(arg.getString("target"));
-      this.pool = RegistryKey.of(RegistryKeys.STRUCTURE_POOL, Identifier.m_qfesvyds(arg.getString("pool")));
+      this.name = Identifier.parse(arg.getString("name"));
+      this.target = Identifier.parse(arg.getString("target"));
+      this.pool = RegistryKey.of(RegistryKeys.STRUCTURE_POOL, Identifier.parse(arg.getString("pool")));
       this.finalState = arg.getString("final_state");
       this.joint = (JigsawBlockEntity.Joint)JigsawBlockEntity.Joint.byName(arg.getString("joint"))
          .orElseGet(
diff -bur namedTargetSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java namedSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java	2024-06-09 03:13:55.575663268 +0000
+++ namedSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java	2024-06-09 03:12:40.510385555 +0000
@@ -128,7 +128,7 @@
    /**
     * Mapping not found
     */
-   protected abstract DefaultedList<ItemStack> getInvStack();
+   protected abstract DefaultedList<ItemStack> getStacks();
 
    /**
     * Mapping not found
@@ -140,7 +140,7 @@
     */
    @Override
    public boolean isEmpty() {
-      for (ItemStack lv : this.getInvStack()) {
+      for (ItemStack lv : this.getStacks()) {
          if (!lv.isEmpty()) {
             return false;
          }
@@ -154,7 +154,7 @@
     */
    @Override
    public ItemStack getStack(int slot) {
-      return this.getInvStack().get(slot);
+      return this.getStacks().get(slot);
    }
 
    /**
@@ -162,7 +162,7 @@
     */
    @Override
    public ItemStack removeStack(int slot, int amount) {
-      ItemStack lv = Inventories.splitStack(this.getInvStack(), slot, amount);
+      ItemStack lv = Inventories.splitStack(this.getStacks(), slot, amount);
       if (!lv.isEmpty()) {
          this.markDirty();
       }
@@ -175,7 +175,7 @@
     */
    @Override
    public ItemStack removeStack(int slot) {
-      return Inventories.removeStack(this.getInvStack(), slot);
+      return Inventories.removeStack(this.getStacks(), slot);
    }
 
    /**
@@ -183,7 +183,7 @@
     */
    @Override
    public void setStack(int slot, ItemStack stack) {
-      this.getInvStack().set(slot, stack);
+      this.getStacks().set(slot, stack);
       stack.m_uzwjgkgy(this.getMaxCount(stack));
       this.markDirty();
    }
@@ -201,7 +201,7 @@
     */
    @Override
    public void clear() {
-      this.getInvStack().clear();
+      this.getStacks().clear();
    }
 
    /**
@@ -228,7 +228,7 @@
       super.m_cckjpvhm(arg);
       this.customName = arg.m_gotgrppy(DataComponentTypes.CUSTOM_NAME);
       this.lock = arg.m_uwrxlczq(DataComponentTypes.LOCK, ContainerLock.EMPTY);
-      arg.m_uwrxlczq(DataComponentTypes.CONTAINER, ContainerContentsComponent.DEFAULT).copyTo(this.getInvStack());
+      arg.m_uwrxlczq(DataComponentTypes.CONTAINER, ContainerContentsComponent.DEFAULT).copyTo(this.getStacks());
    }
 
    /**
@@ -242,7 +242,7 @@
          arg.put(DataComponentTypes.LOCK, this.lock);
       }
 
-      arg.put(DataComponentTypes.CONTAINER, ContainerContentsComponent.fromStacks(this.getInvStack()));
+      arg.put(DataComponentTypes.CONTAINER, ContainerContentsComponent.fromStacks(this.getStacks()));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java namedSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java	2024-06-09 03:13:55.519662343 +0000
+++ namedSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java	2024-06-09 03:12:40.454384720 +0000
@@ -334,7 +334,7 @@
     * Mapping not found
     */
    @Override
-   protected DefaultedList<ItemStack> getInvStack() {
+   protected DefaultedList<ItemStack> getStacks() {
       return this.inventory;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java namedSrc/net/minecraft/block/ShulkerBoxBlock.java
--- namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java	2024-06-09 03:13:55.539662673 +0000
+++ namedSrc/net/minecraft/block/ShulkerBoxBlock.java	2024-06-09 03:12:40.478385078 +0000
@@ -118,7 +118,7 @@
     * @mapping {@literal hashed f_apudlvny Lnet/minecraft/unmapped/C_buvdtidq;f_apudlvny:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named CONTENTS_DYNAMIC_DROP_ID Lnet/minecraft/block/ShulkerBoxBlock;CONTENTS_DYNAMIC_DROP_ID:Lnet/minecraft/util/Identifier;}
     */
-   public static final Identifier CONTENTS_DYNAMIC_DROP_ID = Identifier.m_anmnhtwf("contents");
+   public static final Identifier CONTENTS_DYNAMIC_DROP_ID = Identifier.ofDefault("contents");
    /**
     * @mapping {@literal hashed f_tdgqhkue Lnet/minecraft/unmapped/C_buvdtidq;f_tdgqhkue:Lnet/minecraft/unmapped/C_arllgqae;}
     * @mapping {@literal named color Lnet/minecraft/block/ShulkerBoxBlock;color:Lnet/minecraft/util/DyeColor;}
diff -bur namedTargetSrc/net/minecraft/client/font/EmptyGlyphRenderer.java namedSrc/net/minecraft/client/font/EmptyGlyphRenderer.java
--- namedTargetSrc/net/minecraft/client/font/EmptyGlyphRenderer.java	2024-06-09 03:13:55.367659832 +0000
+++ namedSrc/net/minecraft/client/font/EmptyGlyphRenderer.java	2024-06-09 03:12:40.278382098 +0000
@@ -22,7 +22,7 @@
     * Mapping not found
     */
    public EmptyGlyphRenderer() {
-      super(FontRenderType.get(Identifier.m_anmnhtwf("")), 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F);
+      super(FontRenderType.get(Identifier.ofDefault("")), 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	2024-06-09 03:13:55.587663466 +0000
+++ namedSrc/net/minecraft/client/font/FontManager.java	2024-06-09 03:12:40.522385734 +0000
@@ -67,7 +67,7 @@
     * @mapping {@literal hashed f_lytdbewf Lnet/minecraft/unmapped/C_hoztwset;f_lytdbewf:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named MISSING_STORAGE_ID Lnet/minecraft/client/font/FontManager;MISSING_STORAGE_ID:Lnet/minecraft/util/Identifier;}
     */
-   public static final Identifier MISSING_STORAGE_ID = Identifier.m_anmnhtwf("missing");
+   public static final Identifier MISSING_STORAGE_ID = Identifier.ofDefault("missing");
    /**
     * @mapping {@literal hashed f_rezugjcx Lnet/minecraft/unmapped/C_hoztwset;f_rezugjcx:Lnet/minecraft/unmapped/C_iiomeaxy;}
     * @mapping {@literal named NAMESPACE Lnet/minecraft/client/font/FontManager;NAMESPACE:Lnet/minecraft/registry/ResourceFileNamespace;}
diff -bur namedTargetSrc/net/minecraft/client/gl/JsonEffectGlShader.java namedSrc/net/minecraft/client/gl/JsonEffectGlShader.java
--- namedTargetSrc/net/minecraft/client/gl/JsonEffectGlShader.java	2024-06-09 03:13:55.591663532 +0000
+++ namedSrc/net/minecraft/client/gl/JsonEffectGlShader.java	2024-06-09 03:12:40.526385793 +0000
@@ -145,7 +145,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/gl/JsonEffectGlShader;<init>(Lnet/minecraft/resource/ResourceFactory;Ljava/lang/String;)V}
     */
    public JsonEffectGlShader(ResourceFactory arg, String name) throws IOException {
-      Identifier lv = Identifier.m_anmnhtwf("shaders/program/" + name + ".json");
+      Identifier lv = Identifier.ofDefault("shaders/program/" + name + ".json");
       this.name = name;
       Resource lv2 = arg.getResourceOrThrow(lv);
 
@@ -259,7 +259,7 @@
       } else {
          EffectShader lv4;
          if (lv == null) {
-            Identifier lv2 = Identifier.m_anmnhtwf("shaders/program/" + name + type.getFileExtension());
+            Identifier lv2 = Identifier.ofDefault("shaders/program/" + name + type.getFileExtension());
             Resource lv3 = arg.getResourceOrThrow(lv2);
             InputStream inputStream = lv3.open();
 
diff -bur namedTargetSrc/net/minecraft/client/gl/ShaderEffect.java namedSrc/net/minecraft/client/gl/ShaderEffect.java
--- namedTargetSrc/net/minecraft/client/gl/ShaderEffect.java	2024-06-09 03:13:55.507662145 +0000
+++ namedSrc/net/minecraft/client/gl/ShaderEffect.java	2024-06-09 03:12:40.442384542 +0000
@@ -238,7 +238,7 @@
                         throw new ShaderParseException("Render target '" + string6 + "' can't be used as depth buffer");
                      }
 
-                     Identifier lv5 = Identifier.m_anmnhtwf("textures/effect/" + string6 + ".png");
+                     Identifier lv5 = Identifier.ofDefault("textures/effect/" + string6 + ".png");
                      this.f_hapvbpqs.getResource(lv5).orElseThrow(() -> new ShaderParseException("Render target or texture '" + string6 + "' does not exist"));
                      RenderSystem.setShaderTexture(0, lv5);
                      textureManager.bindTexture(lv5);
diff -bur namedTargetSrc/net/minecraft/client/gui/GuiAtlasManager.java namedSrc/net/minecraft/client/gui/GuiAtlasManager.java
--- namedTargetSrc/net/minecraft/client/gui/GuiAtlasManager.java	2024-06-09 03:13:55.659664655 +0000
+++ namedSrc/net/minecraft/client/gui/GuiAtlasManager.java	2024-06-09 03:12:40.602386925 +0000
@@ -29,7 +29,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/GuiAtlasManager;<init>(Lnet/minecraft/client/texture/TextureManager;)V}
     */
    public GuiAtlasManager(TextureManager manager) {
-      super(manager, Identifier.m_anmnhtwf("textures/atlas/gui.png"), Identifier.m_anmnhtwf("gui"), METADATA_READERS);
+      super(manager, Identifier.ofDefault("textures/atlas/gui.png"), Identifier.ofDefault("gui"), METADATA_READERS);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/boss_bar/BossBarHud.java namedSrc/net/minecraft/client/gui/hud/boss_bar/BossBarHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/boss_bar/BossBarHud.java	2024-06-09 03:13:55.563663069 +0000
+++ namedSrc/net/minecraft/client/gui/hud/boss_bar/BossBarHud.java	2024-06-09 03:12:40.498385377 +0000
@@ -35,46 +35,46 @@
     * @mapping {@literal named BACKGROUND_TEXTURES Lnet/minecraft/client/gui/hud/boss_bar/BossBarHud;BACKGROUND_TEXTURES:[Lnet/minecraft/util/Identifier;}
     */
    private static final Identifier[] BACKGROUND_TEXTURES = new Identifier[]{
-      Identifier.m_anmnhtwf("boss_bar/pink_background"),
-      Identifier.m_anmnhtwf("boss_bar/blue_background"),
-      Identifier.m_anmnhtwf("boss_bar/red_background"),
-      Identifier.m_anmnhtwf("boss_bar/green_background"),
-      Identifier.m_anmnhtwf("boss_bar/yellow_background"),
-      Identifier.m_anmnhtwf("boss_bar/purple_background"),
-      Identifier.m_anmnhtwf("boss_bar/white_background")
+      Identifier.ofDefault("boss_bar/pink_background"),
+      Identifier.ofDefault("boss_bar/blue_background"),
+      Identifier.ofDefault("boss_bar/red_background"),
+      Identifier.ofDefault("boss_bar/green_background"),
+      Identifier.ofDefault("boss_bar/yellow_background"),
+      Identifier.ofDefault("boss_bar/purple_background"),
+      Identifier.ofDefault("boss_bar/white_background")
    };
    /**
     * @mapping {@literal hashed f_jkegmpgp Lnet/minecraft/unmapped/C_vpkfuxkl;f_jkegmpgp:[Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named PROGRESS_TEXTURES Lnet/minecraft/client/gui/hud/boss_bar/BossBarHud;PROGRESS_TEXTURES:[Lnet/minecraft/util/Identifier;}
     */
    private static final Identifier[] PROGRESS_TEXTURES = new Identifier[]{
-      Identifier.m_anmnhtwf("boss_bar/pink_progress"),
-      Identifier.m_anmnhtwf("boss_bar/blue_progress"),
-      Identifier.m_anmnhtwf("boss_bar/red_progress"),
-      Identifier.m_anmnhtwf("boss_bar/green_progress"),
-      Identifier.m_anmnhtwf("boss_bar/yellow_progress"),
-      Identifier.m_anmnhtwf("boss_bar/purple_progress"),
-      Identifier.m_anmnhtwf("boss_bar/white_progress")
+      Identifier.ofDefault("boss_bar/pink_progress"),
+      Identifier.ofDefault("boss_bar/blue_progress"),
+      Identifier.ofDefault("boss_bar/red_progress"),
+      Identifier.ofDefault("boss_bar/green_progress"),
+      Identifier.ofDefault("boss_bar/yellow_progress"),
+      Identifier.ofDefault("boss_bar/purple_progress"),
+      Identifier.ofDefault("boss_bar/white_progress")
    };
    /**
     * @mapping {@literal hashed f_hfdnqqyv Lnet/minecraft/unmapped/C_vpkfuxkl;f_hfdnqqyv:[Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named NOTCHED_BACKGROUND_TEXTURES Lnet/minecraft/client/gui/hud/boss_bar/BossBarHud;NOTCHED_BACKGROUND_TEXTURES:[Lnet/minecraft/util/Identifier;}
     */
    private static final Identifier[] NOTCHED_BACKGROUND_TEXTURES = new Identifier[]{
-      Identifier.m_anmnhtwf("boss_bar/notched_6_background"),
-      Identifier.m_anmnhtwf("boss_bar/notched_10_background"),
-      Identifier.m_anmnhtwf("boss_bar/notched_12_background"),
-      Identifier.m_anmnhtwf("boss_bar/notched_20_background")
+      Identifier.ofDefault("boss_bar/notched_6_background"),
+      Identifier.ofDefault("boss_bar/notched_10_background"),
+      Identifier.ofDefault("boss_bar/notched_12_background"),
+      Identifier.ofDefault("boss_bar/notched_20_background")
    };
    /**
     * @mapping {@literal hashed f_hsclpqlo Lnet/minecraft/unmapped/C_vpkfuxkl;f_hsclpqlo:[Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named NOTCHED_PROGRESS_TEXTURES Lnet/minecraft/client/gui/hud/boss_bar/BossBarHud;NOTCHED_PROGRESS_TEXTURES:[Lnet/minecraft/util/Identifier;}
     */
    private static final Identifier[] NOTCHED_PROGRESS_TEXTURES = new Identifier[]{
-      Identifier.m_anmnhtwf("boss_bar/notched_6_progress"),
-      Identifier.m_anmnhtwf("boss_bar/notched_10_progress"),
-      Identifier.m_anmnhtwf("boss_bar/notched_12_progress"),
-      Identifier.m_anmnhtwf("boss_bar/notched_20_progress")
+      Identifier.ofDefault("boss_bar/notched_6_progress"),
+      Identifier.ofDefault("boss_bar/notched_10_progress"),
+      Identifier.ofDefault("boss_bar/notched_12_progress"),
+      Identifier.ofDefault("boss_bar/notched_20_progress")
    };
    /**
     * @mapping {@literal hashed f_lwyplyii Lnet/minecraft/unmapped/C_vpkfuxkl;f_lwyplyii:Lnet/minecraft/unmapped/C_ayfeobid;}
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/chat/ChatMessageTag.java namedSrc/net/minecraft/client/gui/hud/chat/ChatMessageTag.java
--- namedTargetSrc/net/minecraft/client/gui/hud/chat/ChatMessageTag.java	2024-06-09 03:13:55.639664324 +0000
+++ namedSrc/net/minecraft/client/gui/hud/chat/ChatMessageTag.java	2024-06-09 03:12:40.578386568 +0000
@@ -123,7 +123,7 @@
        * @mapping {@literal hashed f_eljrqkfx Lnet/minecraft/unmapped/C_bzcwstys$C_owixgtsg;f_eljrqkfx:Lnet/minecraft/unmapped/C_bzcwstys$C_owixgtsg;}
        * @mapping {@literal named CHAT_MODIFIED Lnet/minecraft/client/gui/hud/chat/ChatMessageTag$Icon;CHAT_MODIFIED:Lnet/minecraft/client/gui/hud/chat/ChatMessageTag$Icon;}
        */
-      CHAT_MODIFIED(Identifier.m_anmnhtwf("icon/chat_modified"), 9, 9);
+      CHAT_MODIFIED(Identifier.ofDefault("icon/chat_modified"), 9, 9);
 
       /**
        * @mapping {@literal hashed f_ngelpmwg Lnet/minecraft/unmapped/C_bzcwstys$C_owixgtsg;f_ngelpmwg:Lnet/minecraft/unmapped/C_ncpywfca;}

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-06-09 03:13:55.479661682 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-06-09 03:12:40.406384006 +0000
@@ -87,177 +87,177 @@
     * @mapping {@literal hashed f_yorzlrbh Lnet/minecraft/unmapped/C_nepwsmgw;f_yorzlrbh:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named CROSSHAIR Lnet/minecraft/client/gui/hud/in_game/InGameHud;CROSSHAIR:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier CROSSHAIR = Identifier.m_anmnhtwf("hud/crosshair");
+   private static final Identifier CROSSHAIR = Identifier.ofDefault("hud/crosshair");
    /**
     * @mapping {@literal hashed f_ismzrsgq Lnet/minecraft/unmapped/C_nepwsmgw;f_ismzrsgq:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named CROSSHAIR_ATTACK_INDICATOR_FULL Lnet/minecraft/client/gui/hud/in_game/InGameHud;CROSSHAIR_ATTACK_INDICATOR_FULL:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier CROSSHAIR_ATTACK_INDICATOR_FULL = Identifier.m_anmnhtwf("hud/crosshair_attack_indicator_full");
+   private static final Identifier CROSSHAIR_ATTACK_INDICATOR_FULL = Identifier.ofDefault("hud/crosshair_attack_indicator_full");
    /**
     * @mapping {@literal hashed f_jwjdbxak Lnet/minecraft/unmapped/C_nepwsmgw;f_jwjdbxak:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named CROSSHAIR_ATTACK_INDICATOR_BACKGROUND Lnet/minecraft/client/gui/hud/in_game/InGameHud;CROSSHAIR_ATTACK_INDICATOR_BACKGROUND:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier CROSSHAIR_ATTACK_INDICATOR_BACKGROUND = Identifier.m_anmnhtwf("hud/crosshair_attack_indicator_background");
+   private static final Identifier CROSSHAIR_ATTACK_INDICATOR_BACKGROUND = Identifier.ofDefault("hud/crosshair_attack_indicator_background");
    /**
     * @mapping {@literal hashed f_xaxyfvom Lnet/minecraft/unmapped/C_nepwsmgw;f_xaxyfvom:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named CROSSHAIR_ATTACK_INDICATOR_PROGRESS Lnet/minecraft/client/gui/hud/in_game/InGameHud;CROSSHAIR_ATTACK_INDICATOR_PROGRESS:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier CROSSHAIR_ATTACK_INDICATOR_PROGRESS = Identifier.m_anmnhtwf("hud/crosshair_attack_indicator_progress");
+   private static final Identifier CROSSHAIR_ATTACK_INDICATOR_PROGRESS = Identifier.ofDefault("hud/crosshair_attack_indicator_progress");
    /**
     * @mapping {@literal hashed f_xwzjlhlv Lnet/minecraft/unmapped/C_nepwsmgw;f_xwzjlhlv:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named EFFECT_BACKGROUND_AMBIENT Lnet/minecraft/client/gui/hud/in_game/InGameHud;EFFECT_BACKGROUND_AMBIENT:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier EFFECT_BACKGROUND_AMBIENT = Identifier.m_anmnhtwf("hud/effect_background_ambient");
+   private static final Identifier EFFECT_BACKGROUND_AMBIENT = Identifier.ofDefault("hud/effect_background_ambient");
    /**
     * @mapping {@literal hashed f_xrlzwbek Lnet/minecraft/unmapped/C_nepwsmgw;f_xrlzwbek:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named EFFECT_BACKGROUND Lnet/minecraft/client/gui/hud/in_game/InGameHud;EFFECT_BACKGROUND:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier EFFECT_BACKGROUND = Identifier.m_anmnhtwf("hud/effect_background");
+   private static final Identifier EFFECT_BACKGROUND = Identifier.ofDefault("hud/effect_background");
    /**
     * @mapping {@literal hashed f_xhnbgrbh Lnet/minecraft/unmapped/C_nepwsmgw;f_xhnbgrbh:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HOTBAR Lnet/minecraft/client/gui/hud/in_game/InGameHud;HOTBAR:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HOTBAR = Identifier.m_anmnhtwf("hud/hotbar");
+   private static final Identifier HOTBAR = Identifier.ofDefault("hud/hotbar");
    /**
     * @mapping {@literal hashed f_ivttzeka Lnet/minecraft/unmapped/C_nepwsmgw;f_ivttzeka:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HOTBAR_SELECTION Lnet/minecraft/client/gui/hud/in_game/InGameHud;HOTBAR_SELECTION:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HOTBAR_SELECTION = Identifier.m_anmnhtwf("hud/hotbar_selection");
+   private static final Identifier HOTBAR_SELECTION = Identifier.ofDefault("hud/hotbar_selection");
    /**
     * @mapping {@literal hashed f_zcsyhyls Lnet/minecraft/unmapped/C_nepwsmgw;f_zcsyhyls:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HOTBAR_OFFHAND_LEFT Lnet/minecraft/client/gui/hud/in_game/InGameHud;HOTBAR_OFFHAND_LEFT:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HOTBAR_OFFHAND_LEFT = Identifier.m_anmnhtwf("hud/hotbar_offhand_left");
+   private static final Identifier HOTBAR_OFFHAND_LEFT = Identifier.ofDefault("hud/hotbar_offhand_left");
    /**
     * @mapping {@literal hashed f_owbnqhay Lnet/minecraft/unmapped/C_nepwsmgw;f_owbnqhay:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HOTBAR_OFFHAND_RIGHT Lnet/minecraft/client/gui/hud/in_game/InGameHud;HOTBAR_OFFHAND_RIGHT:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HOTBAR_OFFHAND_RIGHT = Identifier.m_anmnhtwf("hud/hotbar_offhand_right");
+   private static final Identifier HOTBAR_OFFHAND_RIGHT = Identifier.ofDefault("hud/hotbar_offhand_right");
    /**
     * @mapping {@literal hashed f_cbldahxt Lnet/minecraft/unmapped/C_nepwsmgw;f_cbldahxt:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HOTBAR_ATTACK_INDICATOR_BACKGROUND Lnet/minecraft/client/gui/hud/in_game/InGameHud;HOTBAR_ATTACK_INDICATOR_BACKGROUND:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HOTBAR_ATTACK_INDICATOR_BACKGROUND = Identifier.m_anmnhtwf("hud/hotbar_attack_indicator_background");
+   private static final Identifier HOTBAR_ATTACK_INDICATOR_BACKGROUND = Identifier.ofDefault("hud/hotbar_attack_indicator_background");
    /**
     * @mapping {@literal hashed f_kwmfnuqz Lnet/minecraft/unmapped/C_nepwsmgw;f_kwmfnuqz:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HOTBAR_ATTACK_INDICATOR_PROGRESS Lnet/minecraft/client/gui/hud/in_game/InGameHud;HOTBAR_ATTACK_INDICATOR_PROGRESS:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HOTBAR_ATTACK_INDICATOR_PROGRESS = Identifier.m_anmnhtwf("hud/hotbar_attack_indicator_progress");
+   private static final Identifier HOTBAR_ATTACK_INDICATOR_PROGRESS = Identifier.ofDefault("hud/hotbar_attack_indicator_progress");
    /**
     * @mapping {@literal hashed f_xtbenypu Lnet/minecraft/unmapped/C_nepwsmgw;f_xtbenypu:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named JUMP_BAR_BACKGROUND Lnet/minecraft/client/gui/hud/in_game/InGameHud;JUMP_BAR_BACKGROUND:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier JUMP_BAR_BACKGROUND = Identifier.m_anmnhtwf("hud/jump_bar_background");
+   private static final Identifier JUMP_BAR_BACKGROUND = Identifier.ofDefault("hud/jump_bar_background");
    /**
     * @mapping {@literal hashed f_yxxcqdip Lnet/minecraft/unmapped/C_nepwsmgw;f_yxxcqdip:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named JUMP_BAR_COOLDOWN Lnet/minecraft/client/gui/hud/in_game/InGameHud;JUMP_BAR_COOLDOWN:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier JUMP_BAR_COOLDOWN = Identifier.m_anmnhtwf("hud/jump_bar_cooldown");
+   private static final Identifier JUMP_BAR_COOLDOWN = Identifier.ofDefault("hud/jump_bar_cooldown");
    /**
     * @mapping {@literal hashed f_rwhujnyh Lnet/minecraft/unmapped/C_nepwsmgw;f_rwhujnyh:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named JUMP_BAR_PROGRESS Lnet/minecraft/client/gui/hud/in_game/InGameHud;JUMP_BAR_PROGRESS:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier JUMP_BAR_PROGRESS = Identifier.m_anmnhtwf("hud/jump_bar_progress");
+   private static final Identifier JUMP_BAR_PROGRESS = Identifier.ofDefault("hud/jump_bar_progress");
    /**
     * @mapping {@literal hashed f_yhumvrht Lnet/minecraft/unmapped/C_nepwsmgw;f_yhumvrht:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named EXPERIENCE_BAR_BACKGROUND Lnet/minecraft/client/gui/hud/in_game/InGameHud;EXPERIENCE_BAR_BACKGROUND:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier EXPERIENCE_BAR_BACKGROUND = Identifier.m_anmnhtwf("hud/experience_bar_background");
+   private static final Identifier EXPERIENCE_BAR_BACKGROUND = Identifier.ofDefault("hud/experience_bar_background");
    /**
     * @mapping {@literal hashed f_wbaqdnkr Lnet/minecraft/unmapped/C_nepwsmgw;f_wbaqdnkr:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named EXPERIENCE_BAR_PROGRESS Lnet/minecraft/client/gui/hud/in_game/InGameHud;EXPERIENCE_BAR_PROGRESS:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier EXPERIENCE_BAR_PROGRESS = Identifier.m_anmnhtwf("hud/experience_bar_progress");
+   private static final Identifier EXPERIENCE_BAR_PROGRESS = Identifier.ofDefault("hud/experience_bar_progress");
    /**
     * @mapping {@literal hashed f_zmeylqar Lnet/minecraft/unmapped/C_nepwsmgw;f_zmeylqar:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named ARMOR_EMPTY Lnet/minecraft/client/gui/hud/in_game/InGameHud;ARMOR_EMPTY:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier ARMOR_EMPTY = Identifier.m_anmnhtwf("hud/armor_empty");
+   private static final Identifier ARMOR_EMPTY = Identifier.ofDefault("hud/armor_empty");
    /**
     * @mapping {@literal hashed f_euyhizod Lnet/minecraft/unmapped/C_nepwsmgw;f_euyhizod:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named ARMOR_HALF Lnet/minecraft/client/gui/hud/in_game/InGameHud;ARMOR_HALF:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier ARMOR_HALF = Identifier.m_anmnhtwf("hud/armor_half");
+   private static final Identifier ARMOR_HALF = Identifier.ofDefault("hud/armor_half");
    /**
     * @mapping {@literal hashed f_markpmsv Lnet/minecraft/unmapped/C_nepwsmgw;f_markpmsv:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named ARMOR_FULL Lnet/minecraft/client/gui/hud/in_game/InGameHud;ARMOR_FULL:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier ARMOR_FULL = Identifier.m_anmnhtwf("hud/armor_full");
+   private static final Identifier ARMOR_FULL = Identifier.ofDefault("hud/armor_full");
    /**
     * @mapping {@literal hashed f_pfbvleya Lnet/minecraft/unmapped/C_nepwsmgw;f_pfbvleya:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named FOOD_EMPTY_HUNGER Lnet/minecraft/client/gui/hud/in_game/InGameHud;FOOD_EMPTY_HUNGER:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier FOOD_EMPTY_HUNGER = Identifier.m_anmnhtwf("hud/food_empty_hunger");
+   private static final Identifier FOOD_EMPTY_HUNGER = Identifier.ofDefault("hud/food_empty_hunger");
    /**
     * @mapping {@literal hashed f_ggvlbrjt Lnet/minecraft/unmapped/C_nepwsmgw;f_ggvlbrjt:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named FOOD_HALF_HUNGER Lnet/minecraft/client/gui/hud/in_game/InGameHud;FOOD_HALF_HUNGER:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier FOOD_HALF_HUNGER = Identifier.m_anmnhtwf("hud/food_half_hunger");
+   private static final Identifier FOOD_HALF_HUNGER = Identifier.ofDefault("hud/food_half_hunger");
    /**
     * @mapping {@literal hashed f_vrirzdji Lnet/minecraft/unmapped/C_nepwsmgw;f_vrirzdji:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named FOOD_FULL_HUNGER Lnet/minecraft/client/gui/hud/in_game/InGameHud;FOOD_FULL_HUNGER:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier FOOD_FULL_HUNGER = Identifier.m_anmnhtwf("hud/food_full_hunger");
+   private static final Identifier FOOD_FULL_HUNGER = Identifier.ofDefault("hud/food_full_hunger");
    /**
     * @mapping {@literal hashed f_cpoztqzn Lnet/minecraft/unmapped/C_nepwsmgw;f_cpoztqzn:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named FOOD_EMPTY Lnet/minecraft/client/gui/hud/in_game/InGameHud;FOOD_EMPTY:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier FOOD_EMPTY = Identifier.m_anmnhtwf("hud/food_empty");
+   private static final Identifier FOOD_EMPTY = Identifier.ofDefault("hud/food_empty");
    /**
     * @mapping {@literal hashed f_bqalvjiv Lnet/minecraft/unmapped/C_nepwsmgw;f_bqalvjiv:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named FOOD_HALF Lnet/minecraft/client/gui/hud/in_game/InGameHud;FOOD_HALF:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier FOOD_HALF = Identifier.m_anmnhtwf("hud/food_half");
+   private static final Identifier FOOD_HALF = Identifier.ofDefault("hud/food_half");
    /**
     * @mapping {@literal hashed f_gzurlpam Lnet/minecraft/unmapped/C_nepwsmgw;f_gzurlpam:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named FOOD_FULL Lnet/minecraft/client/gui/hud/in_game/InGameHud;FOOD_FULL:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier FOOD_FULL = Identifier.m_anmnhtwf("hud/food_full");
+   private static final Identifier FOOD_FULL = Identifier.ofDefault("hud/food_full");
    /**
     * @mapping {@literal hashed f_toqeljpj Lnet/minecraft/unmapped/C_nepwsmgw;f_toqeljpj:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named AIR Lnet/minecraft/client/gui/hud/in_game/InGameHud;AIR:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier AIR = Identifier.m_anmnhtwf("hud/air");
+   private static final Identifier AIR = Identifier.ofDefault("hud/air");
    /**
     * @mapping {@literal hashed f_zejvkkxd Lnet/minecraft/unmapped/C_nepwsmgw;f_zejvkkxd:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named AIR_BURSTING Lnet/minecraft/client/gui/hud/in_game/InGameHud;AIR_BURSTING:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier AIR_BURSTING = Identifier.m_anmnhtwf("hud/air_bursting");
+   private static final Identifier AIR_BURSTING = Identifier.ofDefault("hud/air_bursting");
    /**
     * @mapping {@literal hashed f_pptoyijx Lnet/minecraft/unmapped/C_nepwsmgw;f_pptoyijx:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HEART_VEHICLE_CONTAINER Lnet/minecraft/client/gui/hud/in_game/InGameHud;HEART_VEHICLE_CONTAINER:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HEART_VEHICLE_CONTAINER = Identifier.m_anmnhtwf("hud/heart/vehicle_container");
+   private static final Identifier HEART_VEHICLE_CONTAINER = Identifier.ofDefault("hud/heart/vehicle_container");
    /**
     * @mapping {@literal hashed f_wafytgbv Lnet/minecraft/unmapped/C_nepwsmgw;f_wafytgbv:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HEART_VEHICLE_FULL Lnet/minecraft/client/gui/hud/in_game/InGameHud;HEART_VEHICLE_FULL:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HEART_VEHICLE_FULL = Identifier.m_anmnhtwf("hud/heart/vehicle_full");
+   private static final Identifier HEART_VEHICLE_FULL = Identifier.ofDefault("hud/heart/vehicle_full");
    /**
     * @mapping {@literal hashed f_loishnny Lnet/minecraft/unmapped/C_nepwsmgw;f_loishnny:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HEART_VEHICLE_HALF Lnet/minecraft/client/gui/hud/in_game/InGameHud;HEART_VEHICLE_HALF:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HEART_VEHICLE_HALF = Identifier.m_anmnhtwf("hud/heart/vehicle_half");
+   private static final Identifier HEART_VEHICLE_HALF = Identifier.ofDefault("hud/heart/vehicle_half");
    /**
     * @mapping {@literal hashed f_guvlyblo Lnet/minecraft/unmapped/C_nepwsmgw;f_guvlyblo:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named VIGNETTE_TEXTURE Lnet/minecraft/client/gui/hud/in_game/InGameHud;VIGNETTE_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier VIGNETTE_TEXTURE = Identifier.m_anmnhtwf("textures/misc/vignette.png");
+   private static final Identifier VIGNETTE_TEXTURE = Identifier.ofDefault("textures/misc/vignette.png");
    /**
     * @mapping {@literal hashed f_jrrqixcj Lnet/minecraft/unmapped/C_nepwsmgw;f_jrrqixcj:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named PUMPKIN_BLUR_TEXTURE Lnet/minecraft/client/gui/hud/in_game/InGameHud;PUMPKIN_BLUR_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier PUMPKIN_BLUR_TEXTURE = Identifier.m_anmnhtwf("textures/misc/pumpkinblur.png");
+   private static final Identifier PUMPKIN_BLUR_TEXTURE = Identifier.ofDefault("textures/misc/pumpkinblur.png");
    /**
     * @mapping {@literal hashed f_molrisjm Lnet/minecraft/unmapped/C_nepwsmgw;f_molrisjm:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SPYGLASS_SCOPE_TEXTURE Lnet/minecraft/client/gui/hud/in_game/InGameHud;SPYGLASS_SCOPE_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier SPYGLASS_SCOPE_TEXTURE = Identifier.m_anmnhtwf("textures/misc/spyglass_scope.png");
+   private static final Identifier SPYGLASS_SCOPE_TEXTURE = Identifier.ofDefault("textures/misc/spyglass_scope.png");
    /**
     * @mapping {@literal hashed f_orrhdflv Lnet/minecraft/unmapped/C_nepwsmgw;f_orrhdflv:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named POWDER_SNOW_OUTLINE_TEXTURE Lnet/minecraft/client/gui/hud/in_game/InGameHud;POWDER_SNOW_OUTLINE_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier POWDER_SNOW_OUTLINE_TEXTURE = Identifier.m_anmnhtwf("textures/misc/powder_snow_outline.png");
+   private static final Identifier POWDER_SNOW_OUTLINE_TEXTURE = Identifier.ofDefault("textures/misc/powder_snow_outline.png");
    /**
     * @mapping {@literal hashed f_xxxihcuk Lnet/minecraft/unmapped/C_nepwsmgw;f_xxxihcuk:Ljava/util/Comparator;}
     * @mapping {@literal named SCOREBOARD_COMPARATOR Lnet/minecraft/client/gui/hud/in_game/InGameHud;SCOREBOARD_COMPARATOR:Ljava/util/Comparator;}
@@ -1860,84 +1860,84 @@
        * @mapping {@literal named CONTAINER Lnet/minecraft/client/gui/hud/in_game/InGameHud$HeartType;CONTAINER:Lnet/minecraft/client/gui/hud/in_game/InGameHud$HeartType;}
        */
       CONTAINER(
-         Identifier.m_anmnhtwf("hud/heart/container"),
-         Identifier.m_anmnhtwf("hud/heart/container_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/container"),
-         Identifier.m_anmnhtwf("hud/heart/container_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/container_hardcore"),
-         Identifier.m_anmnhtwf("hud/heart/container_hardcore_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/container_hardcore"),
-         Identifier.m_anmnhtwf("hud/heart/container_hardcore_blinking")
+         Identifier.ofDefault("hud/heart/container"),
+         Identifier.ofDefault("hud/heart/container_blinking"),
+         Identifier.ofDefault("hud/heart/container"),
+         Identifier.ofDefault("hud/heart/container_blinking"),
+         Identifier.ofDefault("hud/heart/container_hardcore"),
+         Identifier.ofDefault("hud/heart/container_hardcore_blinking"),
+         Identifier.ofDefault("hud/heart/container_hardcore"),
+         Identifier.ofDefault("hud/heart/container_hardcore_blinking")
       ),
       /**
        * @mapping {@literal hashed f_xplswhqk Lnet/minecraft/unmapped/C_nepwsmgw$C_mdshohhj;f_xplswhqk:Lnet/minecraft/unmapped/C_nepwsmgw$C_mdshohhj;}
        * @mapping {@literal named NORMAL Lnet/minecraft/client/gui/hud/in_game/InGameHud$HeartType;NORMAL:Lnet/minecraft/client/gui/hud/in_game/InGameHud$HeartType;}
        */
       NORMAL(
-         Identifier.m_anmnhtwf("hud/heart/full"),
-         Identifier.m_anmnhtwf("hud/heart/full_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/half"),
-         Identifier.m_anmnhtwf("hud/heart/half_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/hardcore_full"),
-         Identifier.m_anmnhtwf("hud/heart/hardcore_full_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/hardcore_half"),
-         Identifier.m_anmnhtwf("hud/heart/hardcore_half_blinking")
+         Identifier.ofDefault("hud/heart/full"),
+         Identifier.ofDefault("hud/heart/full_blinking"),
+         Identifier.ofDefault("hud/heart/half"),
+         Identifier.ofDefault("hud/heart/half_blinking"),
+         Identifier.ofDefault("hud/heart/hardcore_full"),
+         Identifier.ofDefault("hud/heart/hardcore_full_blinking"),
+         Identifier.ofDefault("hud/heart/hardcore_half"),
+         Identifier.ofDefault("hud/heart/hardcore_half_blinking")
       ),
       /**
        * @mapping {@literal hashed f_hiezhhcb Lnet/minecraft/unmapped/C_nepwsmgw$C_mdshohhj;f_hiezhhcb:Lnet/minecraft/unmapped/C_nepwsmgw$C_mdshohhj;}
        * @mapping {@literal named POISONED Lnet/minecraft/client/gui/hud/in_game/InGameHud$HeartType;POISONED:Lnet/minecraft/client/gui/hud/in_game/InGameHud$HeartType;}
        */
       POISONED(
-         Identifier.m_anmnhtwf("hud/heart/poisoned_full"),
-         Identifier.m_anmnhtwf("hud/heart/poisoned_full_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/poisoned_half"),
-         Identifier.m_anmnhtwf("hud/heart/poisoned_half_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/poisoned_hardcore_full"),
-         Identifier.m_anmnhtwf("hud/heart/poisoned_hardcore_full_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/poisoned_hardcore_half"),
-         Identifier.m_anmnhtwf("hud/heart/poisoned_hardcore_half_blinking")
+         Identifier.ofDefault("hud/heart/poisoned_full"),
+         Identifier.ofDefault("hud/heart/poisoned_full_blinking"),
+         Identifier.ofDefault("hud/heart/poisoned_half"),
+         Identifier.ofDefault("hud/heart/poisoned_half_blinking"),
+         Identifier.ofDefault("hud/heart/poisoned_hardcore_full"),
+         Identifier.ofDefault("hud/heart/poisoned_hardcore_full_blinking"),
+         Identifier.ofDefault("hud/heart/poisoned_hardcore_half"),
+         Identifier.ofDefault("hud/heart/poisoned_hardcore_half_blinking")
       ),
       /**
        * @mapping {@literal hashed f_ighdmjlw Lnet/minecraft/unmapped/C_nepwsmgw$C_mdshohhj;f_ighdmjlw:Lnet/minecraft/unmapped/C_nepwsmgw$C_mdshohhj;}
        * @mapping {@literal named WITHERED Lnet/minecraft/client/gui/hud/in_game/InGameHud$HeartType;WITHERED:Lnet/minecraft/client/gui/hud/in_game/InGameHud$HeartType;}
        */
       WITHERED(
-         Identifier.m_anmnhtwf("hud/heart/withered_full"),
-         Identifier.m_anmnhtwf("hud/heart/withered_full_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/withered_half"),
-         Identifier.m_anmnhtwf("hud/heart/withered_half_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/withered_hardcore_full"),
-         Identifier.m_anmnhtwf("hud/heart/withered_hardcore_full_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/withered_hardcore_half"),
-         Identifier.m_anmnhtwf("hud/heart/withered_hardcore_half_blinking")
+         Identifier.ofDefault("hud/heart/withered_full"),
+         Identifier.ofDefault("hud/heart/withered_full_blinking"),
+         Identifier.ofDefault("hud/heart/withered_half"),
+         Identifier.ofDefault("hud/heart/withered_half_blinking"),
+         Identifier.ofDefault("hud/heart/withered_hardcore_full"),
+         Identifier.ofDefault("hud/heart/withered_hardcore_full_blinking"),
+         Identifier.ofDefault("hud/heart/withered_hardcore_half"),
+         Identifier.ofDefault("hud/heart/withered_hardcore_half_blinking")
       ),
       /**
        * @mapping {@literal hashed f_pmrvungy Lnet/minecraft/unmapped/C_nepwsmgw$C_mdshohhj;f_pmrvungy:Lnet/minecraft/unmapped/C_nepwsmgw$C_mdshohhj;}
        * @mapping {@literal named ABSORBING Lnet/minecraft/client/gui/hud/in_game/InGameHud$HeartType;ABSORBING:Lnet/minecraft/client/gui/hud/in_game/InGameHud$HeartType;}
        */
       ABSORBING(
-         Identifier.m_anmnhtwf("hud/heart/absorbing_full"),
-         Identifier.m_anmnhtwf("hud/heart/absorbing_full_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/absorbing_half"),
-         Identifier.m_anmnhtwf("hud/heart/absorbing_half_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/absorbing_hardcore_full"),
-         Identifier.m_anmnhtwf("hud/heart/absorbing_hardcore_full_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/absorbing_hardcore_half"),
-         Identifier.m_anmnhtwf("hud/heart/absorbing_hardcore_half_blinking")
+         Identifier.ofDefault("hud/heart/absorbing_full"),
+         Identifier.ofDefault("hud/heart/absorbing_full_blinking"),
+         Identifier.ofDefault("hud/heart/absorbing_half"),
+         Identifier.ofDefault("hud/heart/absorbing_half_blinking"),
+         Identifier.ofDefault("hud/heart/absorbing_hardcore_full"),
+         Identifier.ofDefault("hud/heart/absorbing_hardcore_full_blinking"),
+         Identifier.ofDefault("hud/heart/absorbing_hardcore_half"),
+         Identifier.ofDefault("hud/heart/absorbing_hardcore_half_blinking")
       ),
       /**
        * @mapping {@literal hashed f_gemzjjbl Lnet/minecraft/unmapped/C_nepwsmgw$C_mdshohhj;f_gemzjjbl:Lnet/minecraft/unmapped/C_nepwsmgw$C_mdshohhj;}
        * @mapping {@literal named FROZEN Lnet/minecraft/client/gui/hud/in_game/InGameHud$HeartType;FROZEN:Lnet/minecraft/client/gui/hud/in_game/InGameHud$HeartType;}
        */
       FROZEN(
-         Identifier.m_anmnhtwf("hud/heart/frozen_full"),
-         Identifier.m_anmnhtwf("hud/heart/frozen_full_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/frozen_half"),
-         Identifier.m_anmnhtwf("hud/heart/frozen_half_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/frozen_hardcore_full"),
-         Identifier.m_anmnhtwf("hud/heart/frozen_hardcore_full_blinking"),
-         Identifier.m_anmnhtwf("hud/heart/frozen_hardcore_half"),
-         Identifier.m_anmnhtwf("hud/heart/frozen_hardcore_half_blinking")
+         Identifier.ofDefault("hud/heart/frozen_full"),
+         Identifier.ofDefault("hud/heart/frozen_full_blinking"),
+         Identifier.ofDefault("hud/heart/frozen_half"),
+         Identifier.ofDefault("hud/heart/frozen_half_blinking"),
+         Identifier.ofDefault("hud/heart/frozen_hardcore_full"),
+         Identifier.ofDefault("hud/heart/frozen_hardcore_full_blinking"),
+         Identifier.ofDefault("hud/heart/frozen_hardcore_half"),
+         Identifier.ofDefault("hud/heart/frozen_hardcore_half_blinking")
       );
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameOverlayRenderer.java namedSrc/net/minecraft/client/gui/hud/in_game/InGameOverlayRenderer.java
--- namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameOverlayRenderer.java	2024-06-09 03:13:55.503662078 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameOverlayRenderer.java	2024-06-09 03:12:40.434384423 +0000
@@ -35,7 +35,7 @@
     * @mapping {@literal hashed f_tieevwnl Lnet/minecraft/unmapped/C_htopfuab;f_tieevwnl:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named UNDERWATER_TEXTURE Lnet/minecraft/client/gui/hud/in_game/InGameOverlayRenderer;UNDERWATER_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier UNDERWATER_TEXTURE = Identifier.m_anmnhtwf("textures/misc/underwater.png");
+   private static final Identifier UNDERWATER_TEXTURE = Identifier.ofDefault("textures/misc/underwater.png");
 
    /**
     * @mapping {@literal hashed m_rjqqxdkq Lnet/minecraft/unmapped/C_htopfuab;m_rjqqxdkq(Lnet/minecraft/unmapped/C_ayfeobid;Lnet/minecraft/unmapped/C_cnszsxvd;)V}
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	2024-06-09 03:13:55.363659765 +0000
+++ namedSrc/net/minecraft/client/gui/hud/PlayerListHud.java	2024-06-09 03:12:40.270381979 +0000
@@ -56,72 +56,72 @@
     * @mapping {@literal hashed f_ktwaykkh Lnet/minecraft/unmapped/C_lybmfibg;f_ktwaykkh:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named PING_UNKNOWN Lnet/minecraft/client/gui/hud/PlayerListHud;PING_UNKNOWN:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier PING_UNKNOWN = Identifier.m_anmnhtwf("icon/ping_unknown");
+   private static final Identifier PING_UNKNOWN = Identifier.ofDefault("icon/ping_unknown");
    /**
     * @mapping {@literal hashed f_jiamjiev Lnet/minecraft/unmapped/C_lybmfibg;f_jiamjiev:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named PING_1 Lnet/minecraft/client/gui/hud/PlayerListHud;PING_1:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier PING_1 = Identifier.m_anmnhtwf("icon/ping_1");
+   private static final Identifier PING_1 = Identifier.ofDefault("icon/ping_1");
    /**
     * @mapping {@literal hashed f_symsmfej Lnet/minecraft/unmapped/C_lybmfibg;f_symsmfej:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named PING_2 Lnet/minecraft/client/gui/hud/PlayerListHud;PING_2:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier PING_2 = Identifier.m_anmnhtwf("icon/ping_2");
+   private static final Identifier PING_2 = Identifier.ofDefault("icon/ping_2");
    /**
     * @mapping {@literal hashed f_olfjtuba Lnet/minecraft/unmapped/C_lybmfibg;f_olfjtuba:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named PING_3 Lnet/minecraft/client/gui/hud/PlayerListHud;PING_3:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier PING_3 = Identifier.m_anmnhtwf("icon/ping_3");
+   private static final Identifier PING_3 = Identifier.ofDefault("icon/ping_3");
    /**
     * @mapping {@literal hashed f_qjlfisaf Lnet/minecraft/unmapped/C_lybmfibg;f_qjlfisaf:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named PING_4 Lnet/minecraft/client/gui/hud/PlayerListHud;PING_4:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier PING_4 = Identifier.m_anmnhtwf("icon/ping_4");
+   private static final Identifier PING_4 = Identifier.ofDefault("icon/ping_4");
    /**
     * @mapping {@literal hashed f_oqvfncry Lnet/minecraft/unmapped/C_lybmfibg;f_oqvfncry:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named PING_5 Lnet/minecraft/client/gui/hud/PlayerListHud;PING_5:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier PING_5 = Identifier.m_anmnhtwf("icon/ping_5");
+   private static final Identifier PING_5 = Identifier.ofDefault("icon/ping_5");
    /**
     * @mapping {@literal hashed f_jhcnkfav Lnet/minecraft/unmapped/C_lybmfibg;f_jhcnkfav:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HEART_CONTAINER_BLINKING Lnet/minecraft/client/gui/hud/PlayerListHud;HEART_CONTAINER_BLINKING:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HEART_CONTAINER_BLINKING = Identifier.m_anmnhtwf("hud/heart/container_blinking");
+   private static final Identifier HEART_CONTAINER_BLINKING = Identifier.ofDefault("hud/heart/container_blinking");
    /**
     * @mapping {@literal hashed f_emedoizb Lnet/minecraft/unmapped/C_lybmfibg;f_emedoizb:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HEART_CONTAINER Lnet/minecraft/client/gui/hud/PlayerListHud;HEART_CONTAINER:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HEART_CONTAINER = Identifier.m_anmnhtwf("hud/heart/container");
+   private static final Identifier HEART_CONTAINER = Identifier.ofDefault("hud/heart/container");
    /**
     * @mapping {@literal hashed f_jkcanugf Lnet/minecraft/unmapped/C_lybmfibg;f_jkcanugf:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HEART_FULL_BLINKING Lnet/minecraft/client/gui/hud/PlayerListHud;HEART_FULL_BLINKING:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HEART_FULL_BLINKING = Identifier.m_anmnhtwf("hud/heart/full_blinking");
+   private static final Identifier HEART_FULL_BLINKING = Identifier.ofDefault("hud/heart/full_blinking");
    /**
     * @mapping {@literal hashed f_wclourtf Lnet/minecraft/unmapped/C_lybmfibg;f_wclourtf:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HEART_HALF_BLINKING Lnet/minecraft/client/gui/hud/PlayerListHud;HEART_HALF_BLINKING:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HEART_HALF_BLINKING = Identifier.m_anmnhtwf("hud/heart/half_blinking");
+   private static final Identifier HEART_HALF_BLINKING = Identifier.ofDefault("hud/heart/half_blinking");
    /**
     * @mapping {@literal hashed f_tdjdpgrs Lnet/minecraft/unmapped/C_lybmfibg;f_tdjdpgrs:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HEART_ABSORBING_FULL_BLINKING Lnet/minecraft/client/gui/hud/PlayerListHud;HEART_ABSORBING_FULL_BLINKING:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HEART_ABSORBING_FULL_BLINKING = Identifier.m_anmnhtwf("hud/heart/absorbing_full_blinking");
+   private static final Identifier HEART_ABSORBING_FULL_BLINKING = Identifier.ofDefault("hud/heart/absorbing_full_blinking");
    /**
     * @mapping {@literal hashed f_umakqjuj Lnet/minecraft/unmapped/C_lybmfibg;f_umakqjuj:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HEART_FULL Lnet/minecraft/client/gui/hud/PlayerListHud;HEART_FULL:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HEART_FULL = Identifier.m_anmnhtwf("hud/heart/full");
+   private static final Identifier HEART_FULL = Identifier.ofDefault("hud/heart/full");
    /**
     * @mapping {@literal hashed f_arjiwzge Lnet/minecraft/unmapped/C_lybmfibg;f_arjiwzge:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HEART_ABSORBING_HALF_BLINKING Lnet/minecraft/client/gui/hud/PlayerListHud;HEART_ABSORBING_HALF_BLINKING:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HEART_ABSORBING_HALF_BLINKING = Identifier.m_anmnhtwf("hud/heart/absorbing_half_blinking");
+   private static final Identifier HEART_ABSORBING_HALF_BLINKING = Identifier.ofDefault("hud/heart/absorbing_half_blinking");
    /**
     * @mapping {@literal hashed f_vkoeybdy Lnet/minecraft/unmapped/C_lybmfibg;f_vkoeybdy:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HEART_HALF Lnet/minecraft/client/gui/hud/PlayerListHud;HEART_HALF:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HEART_HALF = Identifier.m_anmnhtwf("hud/heart/half");
+   private static final Identifier HEART_HALF = Identifier.ofDefault("hud/heart/half");
    /**
     * @mapping {@literal hashed f_plvwhbqq Lnet/minecraft/unmapped/C_lybmfibg;f_plvwhbqq:Ljava/util/Comparator;}
     * @mapping {@literal named SORTING_COMPARATOR Lnet/minecraft/client/gui/hud/PlayerListHud;SORTING_COMPARATOR:Ljava/util/Comparator;}
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/spectator/SpectatorHud.java namedSrc/net/minecraft/client/gui/hud/spectator/SpectatorHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/spectator/SpectatorHud.java	2024-06-09 03:13:55.407660493 +0000
+++ namedSrc/net/minecraft/client/gui/hud/spectator/SpectatorHud.java	2024-06-09 03:12:40.322382755 +0000
@@ -22,12 +22,12 @@
     * @mapping {@literal hashed f_trziepdz Lnet/minecraft/unmapped/C_ybztcyiy;f_trziepdz:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HOTBAR Lnet/minecraft/client/gui/hud/spectator/SpectatorHud;HOTBAR:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HOTBAR = Identifier.m_anmnhtwf("hud/hotbar");
+   private static final Identifier HOTBAR = Identifier.ofDefault("hud/hotbar");
    /**
     * @mapping {@literal hashed f_cdjeafxi Lnet/minecraft/unmapped/C_ybztcyiy;f_cdjeafxi:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named HOTBAR_SELECTION Lnet/minecraft/client/gui/hud/spectator/SpectatorHud;HOTBAR_SELECTION:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier HOTBAR_SELECTION = Identifier.m_anmnhtwf("hud/hotbar_selection");
+   private static final Identifier HOTBAR_SELECTION = Identifier.ofDefault("hud/hotbar_selection");
    /**
     * @mapping {@literal hashed f_wbjzviez Lnet/minecraft/unmapped/C_ybztcyiy;f_wbjzviez:J}
     * @mapping {@literal named FADE_OUT_DELAY Lnet/minecraft/client/gui/hud/spectator/SpectatorHud;FADE_OUT_DELAY:J}
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	2024-06-09 03:13:55.371659897 +0000
+++ namedSrc/net/minecraft/client/gui/hud/spectator/SpectatorMenu.java	2024-06-09 03:12:40.282382159 +0000
@@ -20,17 +20,17 @@
     * @mapping {@literal hashed f_cnrnubhr Lnet/minecraft/unmapped/C_zbppnqly;f_cnrnubhr:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named CLOSE_TEXTURE Lnet/minecraft/client/gui/hud/spectator/SpectatorMenu;CLOSE_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   static final Identifier CLOSE_TEXTURE = Identifier.m_anmnhtwf("spectator/close");
+   static final Identifier CLOSE_TEXTURE = Identifier.ofDefault("spectator/close");
    /**
     * @mapping {@literal hashed f_hvyokmgg Lnet/minecraft/unmapped/C_zbppnqly;f_hvyokmgg:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SCROLL_LEFT_TEXTURE Lnet/minecraft/client/gui/hud/spectator/SpectatorMenu;SCROLL_LEFT_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   static final Identifier SCROLL_LEFT_TEXTURE = Identifier.m_anmnhtwf("spectator/scroll_left");
+   static final Identifier SCROLL_LEFT_TEXTURE = Identifier.ofDefault("spectator/scroll_left");
    /**
     * @mapping {@literal hashed f_ijgmqnit Lnet/minecraft/unmapped/C_zbppnqly;f_ijgmqnit:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SCROLL_RIGHT_TEXTURE Lnet/minecraft/client/gui/hud/spectator/SpectatorMenu;SCROLL_RIGHT_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   static final Identifier SCROLL_RIGHT_TEXTURE = Identifier.m_anmnhtwf("spectator/scroll_right");
+   static final Identifier SCROLL_RIGHT_TEXTURE = Identifier.ofDefault("spectator/scroll_right");
    /**
     * @mapping {@literal hashed f_mjquzrot Lnet/minecraft/unmapped/C_zbppnqly;f_mjquzrot:Lnet/minecraft/unmapped/C_gwvsqmde;}
     * @mapping {@literal named CLOSE_COMMAND Lnet/minecraft/client/gui/hud/spectator/SpectatorMenu;CLOSE_COMMAND:Lnet/minecraft/client/gui/hud/spectator/SpectatorMenuCommand;}
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	2024-06-09 03:13:55.463661417 +0000
+++ namedSrc/net/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu.java	2024-06-09 03:12:40.390383768 +0000
@@ -30,7 +30,7 @@
     * @mapping {@literal hashed f_jceldyls Lnet/minecraft/unmapped/C_oocustim;f_jceldyls:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TELEPORT_TEXTURE Lnet/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu;TELEPORT_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TELEPORT_TEXTURE = Identifier.m_anmnhtwf("spectator/teleport_to_team");
+   private static final Identifier TELEPORT_TEXTURE = Identifier.ofDefault("spectator/teleport_to_team");
    /**
     * @mapping {@literal hashed f_pcnyirer Lnet/minecraft/unmapped/C_oocustim;f_pcnyirer:Lnet/minecraft/unmapped/C_rdaqiwdt;}
     * @mapping {@literal named TEAM_TELEPORT Lnet/minecraft/client/gui/hud/spectator/TeamTeleportSpectatorMenu;TEAM_TELEPORT:Lnet/minecraft/text/Text;}
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	2024-06-09 03:13:55.567663136 +0000
+++ namedSrc/net/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu.java	2024-06-09 03:12:40.506385496 +0000
@@ -22,7 +22,7 @@
     * @mapping {@literal hashed f_ajxcvery Lnet/minecraft/unmapped/C_nhxcfbkg;f_ajxcvery:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TELEPORT_TEXTURE Lnet/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu;TELEPORT_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TELEPORT_TEXTURE = Identifier.m_anmnhtwf("spectator/teleport_to_player");
+   private static final Identifier TELEPORT_TEXTURE = Identifier.ofDefault("spectator/teleport_to_player");
    /**
     * @mapping {@literal hashed f_mfrdbcoi Lnet/minecraft/unmapped/C_nhxcfbkg;f_mfrdbcoi:Ljava/util/Comparator;}
     * @mapping {@literal named ORDERING Lnet/minecraft/client/gui/hud/spectator/TeleportSpectatorMenu;ORDERING:Ljava/util/Comparator;}
diff -bur namedTargetSrc/net/minecraft/client/gui/LogoRenderer.java namedSrc/net/minecraft/client/gui/LogoRenderer.java
--- namedTargetSrc/net/minecraft/client/gui/LogoRenderer.java	2024-06-09 03:13:55.515662276 +0000
+++ namedSrc/net/minecraft/client/gui/LogoRenderer.java	2024-06-09 03:12:40.450384662 +0000
@@ -16,17 +16,17 @@
     * @mapping {@literal hashed f_setlzjyz Lnet/minecraft/unmapped/C_siglwpps;f_setlzjyz:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named LOGO_TEXTURE Lnet/minecraft/client/gui/LogoRenderer;LOGO_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   public static final Identifier LOGO_TEXTURE = Identifier.m_anmnhtwf("textures/gui/title/minecraft.png");
+   public static final Identifier LOGO_TEXTURE = Identifier.ofDefault("textures/gui/title/minecraft.png");
    /**
     * @mapping {@literal hashed f_ohciufah Lnet/minecraft/unmapped/C_siglwpps;f_ohciufah:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named MINCERAFT_LOGO_TEXTURE Lnet/minecraft/client/gui/LogoRenderer;MINCERAFT_LOGO_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   public static final Identifier MINCERAFT_LOGO_TEXTURE = Identifier.m_anmnhtwf("textures/gui/title/minceraft.png");
+   public static final Identifier MINCERAFT_LOGO_TEXTURE = Identifier.ofDefault("textures/gui/title/minceraft.png");
    /**
     * @mapping {@literal hashed f_eyssglwg Lnet/minecraft/unmapped/C_siglwpps;f_eyssglwg:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named EDITION_TEXTURE Lnet/minecraft/client/gui/LogoRenderer;EDITION_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   public static final Identifier EDITION_TEXTURE = Identifier.m_anmnhtwf("textures/gui/title/edition.png");
+   public static final Identifier EDITION_TEXTURE = Identifier.ofDefault("textures/gui/title/edition.png");
    /**
     * @mapping {@literal hashed f_fqclctpe Lnet/minecraft/unmapped/C_siglwpps;f_fqclctpe:I}
     * @mapping {@literal named LOGO_WIDTH Lnet/minecraft/client/gui/LogoRenderer;LOGO_WIDTH:I}
diff -bur namedTargetSrc/net/minecraft/client/gui/RotatingCubeMapRenderer.java namedSrc/net/minecraft/client/gui/RotatingCubeMapRenderer.java
--- namedTargetSrc/net/minecraft/client/gui/RotatingCubeMapRenderer.java	2024-06-09 03:13:55.487661814 +0000
+++ namedSrc/net/minecraft/client/gui/RotatingCubeMapRenderer.java	2024-06-09 03:12:40.418384184 +0000
@@ -16,7 +16,7 @@
     * @mapping {@literal hashed f_osoztqqz Lnet/minecraft/unmapped/C_dmftscsi;f_osoztqqz:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named PANORAMA_OVERLAY Lnet/minecraft/client/gui/RotatingCubeMapRenderer;PANORAMA_OVERLAY:Lnet/minecraft/util/Identifier;}
     */
-   public static final Identifier PANORAMA_OVERLAY = Identifier.m_anmnhtwf("textures/gui/title/background/panorama_overlay.png");
+   public static final Identifier PANORAMA_OVERLAY = Identifier.ofDefault("textures/gui/title/background/panorama_overlay.png");
    /**
     * @mapping {@literal hashed f_inbshiyx Lnet/minecraft/unmapped/C_dmftscsi;f_inbshiyx:Lnet/minecraft/unmapped/C_ayfeobid;}
     * @mapping {@literal named client Lnet/minecraft/client/gui/RotatingCubeMapRenderer;client:Lnet/minecraft/client/MinecraftClient;}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus.java namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus.java
--- namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus.java	2024-06-09 03:13:55.555662937 +0000
+++ namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus.java	2024-06-09 03:12:40.490385258 +0000
@@ -16,20 +16,20 @@
     * @mapping {@literal named OBTAINED Lnet/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus;OBTAINED:Lnet/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus;}
     */
    OBTAINED(
-      Identifier.m_anmnhtwf("advancements/box_obtained"),
-      Identifier.m_anmnhtwf("advancements/task_frame_obtained"),
-      Identifier.m_anmnhtwf("advancements/challenge_frame_obtained"),
-      Identifier.m_anmnhtwf("advancements/goal_frame_obtained")
+      Identifier.ofDefault("advancements/box_obtained"),
+      Identifier.ofDefault("advancements/task_frame_obtained"),
+      Identifier.ofDefault("advancements/challenge_frame_obtained"),
+      Identifier.ofDefault("advancements/goal_frame_obtained")
    ),
    /**
     * @mapping {@literal hashed f_wfehhjmu Lnet/minecraft/unmapped/C_wdtguqlw;f_wfehhjmu:Lnet/minecraft/unmapped/C_wdtguqlw;}
     * @mapping {@literal named UNOBTAINED Lnet/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus;UNOBTAINED:Lnet/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus;}
     */
    UNOBTAINED(
-      Identifier.m_anmnhtwf("advancements/box_unobtained"),
-      Identifier.m_anmnhtwf("advancements/task_frame_unobtained"),
-      Identifier.m_anmnhtwf("advancements/challenge_frame_unobtained"),
-      Identifier.m_anmnhtwf("advancements/goal_frame_unobtained")
+      Identifier.ofDefault("advancements/box_unobtained"),
+      Identifier.ofDefault("advancements/task_frame_unobtained"),
+      Identifier.ofDefault("advancements/challenge_frame_unobtained"),
+      Identifier.ofDefault("advancements/goal_frame_unobtained")
    );
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.java namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.java	2024-06-09 03:13:55.639664324 +0000
+++ namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementsScreen.java	2024-06-09 03:12:40.578386568 +0000
@@ -31,7 +31,7 @@
     * @mapping {@literal hashed f_qilyqfeh Lnet/minecraft/unmapped/C_hejpktqu;f_qilyqfeh:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named WINDOW_TEXTURE Lnet/minecraft/client/gui/screen/advancement/AdvancementsScreen;WINDOW_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier WINDOW_TEXTURE = Identifier.m_anmnhtwf("textures/gui/advancements/window.png");
+   private static final Identifier WINDOW_TEXTURE = Identifier.ofDefault("textures/gui/advancements/window.png");
    /**
     * @mapping {@literal hashed f_hvwlvxua Lnet/minecraft/unmapped/C_hejpktqu;f_hvwlvxua:I}
     * @mapping {@literal named WINDOW_WIDTH Lnet/minecraft/client/gui/screen/advancement/AdvancementsScreen;WINDOW_WIDTH:I}
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	2024-06-09 03:13:55.615663929 +0000
+++ namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementTabType.java	2024-06-09 03:12:40.546386092 +0000
@@ -18,14 +18,14 @@
     */
    ABOVE(
       new AdvancementTabType.Textures(
-         Identifier.m_anmnhtwf("advancements/tab_above_left_selected"),
-         Identifier.m_anmnhtwf("advancements/tab_above_middle_selected"),
-         Identifier.m_anmnhtwf("advancements/tab_above_right_selected")
+         Identifier.ofDefault("advancements/tab_above_left_selected"),
+         Identifier.ofDefault("advancements/tab_above_middle_selected"),
+         Identifier.ofDefault("advancements/tab_above_right_selected")
       ),
       new AdvancementTabType.Textures(
-         Identifier.m_anmnhtwf("advancements/tab_above_left"),
-         Identifier.m_anmnhtwf("advancements/tab_above_middle"),
-         Identifier.m_anmnhtwf("advancements/tab_above_right")
+         Identifier.ofDefault("advancements/tab_above_left"),
+         Identifier.ofDefault("advancements/tab_above_middle"),
+         Identifier.ofDefault("advancements/tab_above_right")
       ),
       28,
       32,
@@ -37,14 +37,14 @@
     */
    BELOW(
       new AdvancementTabType.Textures(
-         Identifier.m_anmnhtwf("advancements/tab_below_left_selected"),
-         Identifier.m_anmnhtwf("advancements/tab_below_middle_selected"),
-         Identifier.m_anmnhtwf("advancements/tab_below_right_selected")
+         Identifier.ofDefault("advancements/tab_below_left_selected"),
+         Identifier.ofDefault("advancements/tab_below_middle_selected"),
+         Identifier.ofDefault("advancements/tab_below_right_selected")
       ),
       new AdvancementTabType.Textures(
-         Identifier.m_anmnhtwf("advancements/tab_below_left"),
-         Identifier.m_anmnhtwf("advancements/tab_below_middle"),
-         Identifier.m_anmnhtwf("advancements/tab_below_right")
+         Identifier.ofDefault("advancements/tab_below_left"),
+         Identifier.ofDefault("advancements/tab_below_middle"),
+         Identifier.ofDefault("advancements/tab_below_right")
       ),
       28,
       32,
@@ -56,14 +56,14 @@
     */
    LEFT(
       new AdvancementTabType.Textures(
-         Identifier.m_anmnhtwf("advancements/tab_left_top_selected"),
-         Identifier.m_anmnhtwf("advancements/tab_left_middle_selected"),
-         Identifier.m_anmnhtwf("advancements/tab_left_bottom_selected")
+         Identifier.ofDefault("advancements/tab_left_top_selected"),
+         Identifier.ofDefault("advancements/tab_left_middle_selected"),
+         Identifier.ofDefault("advancements/tab_left_bottom_selected")
       ),
       new AdvancementTabType.Textures(
-         Identifier.m_anmnhtwf("advancements/tab_left_top"),
-         Identifier.m_anmnhtwf("advancements/tab_left_middle"),
-         Identifier.m_anmnhtwf("advancements/tab_left_bottom")
+         Identifier.ofDefault("advancements/tab_left_top"),
+         Identifier.ofDefault("advancements/tab_left_middle"),
+         Identifier.ofDefault("advancements/tab_left_bottom")
       ),
       32,
       28,
@@ -75,14 +75,14 @@
     */
    RIGHT(
       new AdvancementTabType.Textures(
-         Identifier.m_anmnhtwf("advancements/tab_right_top_selected"),
-         Identifier.m_anmnhtwf("advancements/tab_right_middle_selected"),
-         Identifier.m_anmnhtwf("advancements/tab_right_bottom_selected")
+         Identifier.ofDefault("advancements/tab_right_top_selected"),
+         Identifier.ofDefault("advancements/tab_right_middle_selected"),
+         Identifier.ofDefault("advancements/tab_right_bottom_selected")
       ),
       new AdvancementTabType.Textures(
-         Identifier.m_anmnhtwf("advancements/tab_right_top"),
-         Identifier.m_anmnhtwf("advancements/tab_right_middle"),
-         Identifier.m_anmnhtwf("advancements/tab_right_bottom")
+         Identifier.ofDefault("advancements/tab_right_top"),
+         Identifier.ofDefault("advancements/tab_right_middle"),
+         Identifier.ofDefault("advancements/tab_right_bottom")
       ),
       32,
       28,
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	2024-06-09 03:13:55.367659832 +0000
+++ namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java	2024-06-09 03:12:40.274382039 +0000
@@ -31,7 +31,7 @@
     * @mapping {@literal hashed f_gcsnmqoj Lnet/minecraft/unmapped/C_lmrhoxpe;f_gcsnmqoj:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TITLE_BOX Lnet/minecraft/client/gui/screen/advancement/AdvancementWidget;TITLE_BOX:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TITLE_BOX = Identifier.m_anmnhtwf("advancements/title_box");
+   private static final Identifier TITLE_BOX = Identifier.ofDefault("advancements/title_box");
    /**
     * @mapping {@literal hashed f_ehbdeigs Lnet/minecraft/unmapped/C_lmrhoxpe;f_ehbdeigs:I}
     * @mapping {@literal named HEIGHT Lnet/minecraft/client/gui/screen/advancement/AdvancementWidget;HEIGHT:I}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/CreditsScreen.java namedSrc/net/minecraft/client/gui/screen/CreditsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/CreditsScreen.java	2024-06-09 03:13:55.655664589 +0000
+++ namedSrc/net/minecraft/client/gui/screen/CreditsScreen.java	2024-06-09 03:12:40.594386806 +0000
@@ -46,7 +46,7 @@
     * @mapping {@literal hashed f_qrlyhsdt Lnet/minecraft/unmapped/C_emwfaans;f_qrlyhsdt:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named VIGNETTE_TEXTURE Lnet/minecraft/client/gui/screen/CreditsScreen;VIGNETTE_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier VIGNETTE_TEXTURE = Identifier.m_anmnhtwf("textures/misc/credits_vignette.png");
+   private static final Identifier VIGNETTE_TEXTURE = Identifier.ofDefault("textures/misc/credits_vignette.png");
    /**
     * @mapping {@literal hashed f_cuxehlzw Lnet/minecraft/unmapped/C_emwfaans;f_cuxehlzw:Lnet/minecraft/unmapped/C_rdaqiwdt;}
     * @mapping {@literal named SEPARATOR_LINE Lnet/minecraft/client/gui/screen/CreditsScreen;SEPARATOR_LINE:Lnet/minecraft/text/Text;}
@@ -75,15 +75,15 @@
    /**
     * Mapping not found
     */
-   private static final Identifier f_hefuvaro = Identifier.m_anmnhtwf("texts/end.txt");
+   private static final Identifier f_hefuvaro = Identifier.ofDefault("texts/end.txt");
    /**
     * Mapping not found
     */
-   private static final Identifier f_rczltnub = Identifier.m_anmnhtwf("texts/credits.json");
+   private static final Identifier f_rczltnub = Identifier.ofDefault("texts/credits.json");
    /**
     * Mapping not found
     */
-   private static final Identifier f_ewbhrgtm = Identifier.m_anmnhtwf("texts/postcredits.txt");
+   private static final Identifier f_ewbhrgtm = Identifier.ofDefault("texts/postcredits.txt");
    /**
     * @mapping {@literal hashed f_lolqpxvp Lnet/minecraft/unmapped/C_emwfaans;f_lolqpxvp:Z}
     * @mapping {@literal named endCredits Lnet/minecraft/client/gui/screen/CreditsScreen;endCredits:Z}
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	2024-06-09 03:13:55.479661682 +0000
+++ namedSrc/net/minecraft/client/gui/screen/CustomizeFlatWorldScreen.java	2024-06-09 03:12:40.414384125 +0000
@@ -30,7 +30,7 @@
     * @mapping {@literal hashed f_alguvrba Lnet/minecraft/unmapped/C_czonpkpc;f_alguvrba:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SLOT Lnet/minecraft/client/gui/screen/CustomizeFlatWorldScreen;SLOT:Lnet/minecraft/util/Identifier;}
     */
-   static final Identifier SLOT = Identifier.m_anmnhtwf("container/slot");
+   static final Identifier SLOT = Identifier.ofDefault("container/slot");
    /**
     * @mapping {@literal hashed f_liwkhndm Lnet/minecraft/unmapped/C_czonpkpc;f_liwkhndm:I}
     * @mapping {@literal named ICON_BACKGROUND_SIZE Lnet/minecraft/client/gui/screen/CustomizeFlatWorldScreen;ICON_BACKGROUND_SIZE:I}
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	2024-06-09 03:13:55.619663994 +0000
+++ namedSrc/net/minecraft/client/gui/screen/DeathScreen.java	2024-06-09 03:12:40.554386211 +0000
@@ -26,7 +26,7 @@
     * @mapping {@literal hashed f_ndmtqjyt Lnet/minecraft/unmapped/C_wjjzysjg;f_ndmtqjyt:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named DRAFT_REPORT_ICON_TEXTURE Lnet/minecraft/client/gui/screen/DeathScreen;DRAFT_REPORT_ICON_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier DRAFT_REPORT_ICON_TEXTURE = Identifier.m_anmnhtwf("icon/draft_report");
+   private static final Identifier DRAFT_REPORT_ICON_TEXTURE = Identifier.ofDefault("icon/draft_report");
    /**
     * @mapping {@literal hashed f_rtbuspis Lnet/minecraft/unmapped/C_wjjzysjg;f_rtbuspis:I}
     * @mapping {@literal named ticksSinceDeath Lnet/minecraft/client/gui/screen/DeathScreen;ticksSinceDeath:I}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/DemoScreen.java namedSrc/net/minecraft/client/gui/screen/DemoScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/DemoScreen.java	2024-06-09 03:13:55.407660493 +0000
+++ namedSrc/net/minecraft/client/gui/screen/DemoScreen.java	2024-06-09 03:12:40.326382814 +0000
@@ -21,7 +21,7 @@
     * @mapping {@literal hashed f_zahlarrr Lnet/minecraft/unmapped/C_gssfrlwc;f_zahlarrr:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named DEMO_BG Lnet/minecraft/client/gui/screen/DemoScreen;DEMO_BG:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier DEMO_BG = Identifier.m_anmnhtwf("textures/gui/demo_background.png");
+   private static final Identifier DEMO_BG = Identifier.ofDefault("textures/gui/demo_background.png");
    /**
     * @mapping {@literal hashed f_qrbhrirv Lnet/minecraft/unmapped/C_gssfrlwc;f_qrbhrirv:Lnet/minecraft/unmapped/C_ogfbkizf;}
     * @mapping {@literal named movementText Lnet/minecraft/client/gui/screen/DemoScreen;movementText:Lnet/minecraft/client/font/MultilineText;}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/DialogScreen.java namedSrc/net/minecraft/client/gui/screen/DialogScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/DialogScreen.java	2024-06-09 03:13:55.491661880 +0000
+++ namedSrc/net/minecraft/client/gui/screen/DialogScreen.java	2024-06-09 03:12:40.422384245 +0000
@@ -30,7 +30,7 @@
     * @mapping {@literal hashed f_yclrhpug Lnet/minecraft/unmapped/C_pzklyvtm;f_yclrhpug:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BACKGROUND Lnet/minecraft/client/gui/screen/DialogScreen;BACKGROUND:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier BACKGROUND = Identifier.m_anmnhtwf("popup/background");
+   private static final Identifier BACKGROUND = Identifier.ofDefault("popup/background");
    /**
     * @mapping {@literal hashed f_oexmzuqu Lnet/minecraft/unmapped/C_pzklyvtm;f_oexmzuqu:I}
     * @mapping {@literal named VERTICAL_SPACING Lnet/minecraft/client/gui/screen/DialogScreen;VERTICAL_SPACING:I}
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	2024-06-09 03:13:55.495661946 +0000
+++ namedSrc/net/minecraft/client/gui/screen/GameMenuScreen.java	2024-06-09 03:12:40.426384303 +0000
@@ -36,7 +36,7 @@
     * @mapping {@literal hashed f_igrcbiod Lnet/minecraft/unmapped/C_gxawvqxt;f_igrcbiod:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named DRAFT_REPORT Lnet/minecraft/client/gui/screen/GameMenuScreen;DRAFT_REPORT:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier DRAFT_REPORT = Identifier.m_anmnhtwf("icon/draft_report");
+   private static final Identifier DRAFT_REPORT = Identifier.ofDefault("icon/draft_report");
    /**
     * @mapping {@literal hashed f_oxukqovl Lnet/minecraft/unmapped/C_gxawvqxt;f_oxukqovl:I}
     * @mapping {@literal named COLUMNS Lnet/minecraft/client/gui/screen/GameMenuScreen;COLUMNS:I}
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	2024-06-09 03:13:55.483661748 +0000
+++ namedSrc/net/minecraft/client/gui/screen/GameModeSelectionScreen.java	2024-06-09 03:12:40.414384125 +0000
@@ -30,17 +30,17 @@
     * @mapping {@literal hashed f_cfyxaade Lnet/minecraft/unmapped/C_ghsibibk;f_cfyxaade:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SLOT Lnet/minecraft/client/gui/screen/GameModeSelectionScreen;SLOT:Lnet/minecraft/util/Identifier;}
     */
-   static final Identifier SLOT = Identifier.m_anmnhtwf("gamemode_switcher/slot");
+   static final Identifier SLOT = Identifier.ofDefault("gamemode_switcher/slot");
    /**
     * @mapping {@literal hashed f_fsjyqabz Lnet/minecraft/unmapped/C_ghsibibk;f_fsjyqabz:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SELECTION Lnet/minecraft/client/gui/screen/GameModeSelectionScreen;SELECTION:Lnet/minecraft/util/Identifier;}
     */
-   static final Identifier SELECTION = Identifier.m_anmnhtwf("gamemode_switcher/selection");
+   static final Identifier SELECTION = Identifier.ofDefault("gamemode_switcher/selection");
    /**
     * @mapping {@literal hashed f_uhopmgrd Lnet/minecraft/unmapped/C_ghsibibk;f_uhopmgrd:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/GameModeSelectionScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/gamemode_switcher.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/gamemode_switcher.png");
    /**
     * @mapping {@literal hashed f_mkxmaboy Lnet/minecraft/unmapped/C_ghsibibk;f_mkxmaboy:I}
     * @mapping {@literal named TEXTURE_WIDTH Lnet/minecraft/client/gui/screen/GameModeSelectionScreen;TEXTURE_WIDTH:I}

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

View the diff here (3/3): 
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	2024-06-09 03:13:55.547662805 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/AbstractInventoryScreen.java	2024-06-09 03:12:40.482385138 +0000
@@ -30,12 +30,12 @@
     * @mapping {@literal hashed f_acjatqul Lnet/minecraft/unmapped/C_nxhcuhvr;f_acjatqul:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named EFFECT_BACKGROUND_LARGE Lnet/minecraft/client/gui/screen/ingame/AbstractInventoryScreen;EFFECT_BACKGROUND_LARGE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier EFFECT_BACKGROUND_LARGE = Identifier.m_anmnhtwf("container/inventory/effect_background_large");
+   private static final Identifier EFFECT_BACKGROUND_LARGE = Identifier.ofDefault("container/inventory/effect_background_large");
    /**
     * @mapping {@literal hashed f_gofjfrqt Lnet/minecraft/unmapped/C_nxhcuhvr;f_gofjfrqt:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named EFFECT_BACKGROUND_SMALL Lnet/minecraft/client/gui/screen/ingame/AbstractInventoryScreen;EFFECT_BACKGROUND_SMALL:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier EFFECT_BACKGROUND_SMALL = Identifier.m_anmnhtwf("container/inventory/effect_background_small");
+   private static final Identifier EFFECT_BACKGROUND_SMALL = Identifier.ofDefault("container/inventory/effect_background_small");
 
    /**
     * Mapping not found
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	2024-06-09 03:13:55.623664060 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/AnvilScreen.java	2024-06-09 03:12:40.558386271 +0000
@@ -27,22 +27,22 @@
     * @mapping {@literal hashed f_ukpkgwte Lnet/minecraft/unmapped/C_tyaycwhf;f_ukpkgwte:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXT_FIELD Lnet/minecraft/client/gui/screen/ingame/AnvilScreen;TEXT_FIELD:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXT_FIELD = Identifier.m_anmnhtwf("container/anvil/text_field");
+   private static final Identifier TEXT_FIELD = Identifier.ofDefault("container/anvil/text_field");
    /**
     * @mapping {@literal hashed f_ggwfhxke Lnet/minecraft/unmapped/C_tyaycwhf;f_ggwfhxke:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXT_FIELD_DISABLED Lnet/minecraft/client/gui/screen/ingame/AnvilScreen;TEXT_FIELD_DISABLED:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXT_FIELD_DISABLED = Identifier.m_anmnhtwf("container/anvil/text_field_disabled");
+   private static final Identifier TEXT_FIELD_DISABLED = Identifier.ofDefault("container/anvil/text_field_disabled");
    /**
     * @mapping {@literal hashed f_ilyhrskz Lnet/minecraft/unmapped/C_tyaycwhf;f_ilyhrskz:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named ERROR Lnet/minecraft/client/gui/screen/ingame/AnvilScreen;ERROR:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier ERROR = Identifier.m_anmnhtwf("container/anvil/error");
+   private static final Identifier ERROR = Identifier.ofDefault("container/anvil/error");
    /**
     * @mapping {@literal hashed f_unocrljz Lnet/minecraft/unmapped/C_tyaycwhf;f_unocrljz:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/AnvilScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/anvil.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/anvil.png");
    /**
     * @mapping {@literal hashed f_tqvdehce Lnet/minecraft/unmapped/C_tyaycwhf;f_tqvdehce:Lnet/minecraft/unmapped/C_rdaqiwdt;}
     * @mapping {@literal named TOO_EXPENSIVE Lnet/minecraft/client/gui/screen/ingame/AnvilScreen;TOO_EXPENSIVE:Lnet/minecraft/text/Text;}
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	2024-06-09 03:13:55.411660558 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BeaconScreen.java	2024-06-09 03:12:40.330382874 +0000
@@ -38,37 +38,37 @@
     * @mapping {@literal hashed f_lwddriio Lnet/minecraft/unmapped/C_askpskli;f_lwddriio:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/BeaconScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/beacon.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/beacon.png");
    /**
     * @mapping {@literal hashed f_jxtdpzyj Lnet/minecraft/unmapped/C_askpskli;f_jxtdpzyj:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BUTTON_DISABLED Lnet/minecraft/client/gui/screen/ingame/BeaconScreen;BUTTON_DISABLED:Lnet/minecraft/util/Identifier;}
     */
-   static final Identifier BUTTON_DISABLED = Identifier.m_anmnhtwf("container/beacon/button_disabled");
+   static final Identifier BUTTON_DISABLED = Identifier.ofDefault("container/beacon/button_disabled");
    /**
     * @mapping {@literal hashed f_xtdhanfg Lnet/minecraft/unmapped/C_askpskli;f_xtdhanfg:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BUTTON_SELECTED Lnet/minecraft/client/gui/screen/ingame/BeaconScreen;BUTTON_SELECTED:Lnet/minecraft/util/Identifier;}
     */
-   static final Identifier BUTTON_SELECTED = Identifier.m_anmnhtwf("container/beacon/button_selected");
+   static final Identifier BUTTON_SELECTED = Identifier.ofDefault("container/beacon/button_selected");
    /**
     * @mapping {@literal hashed f_mrmqjcjv Lnet/minecraft/unmapped/C_askpskli;f_mrmqjcjv:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BUTTON_HIGHLIGHTED Lnet/minecraft/client/gui/screen/ingame/BeaconScreen;BUTTON_HIGHLIGHTED:Lnet/minecraft/util/Identifier;}
     */
-   static final Identifier BUTTON_HIGHLIGHTED = Identifier.m_anmnhtwf("container/beacon/button_highlighted");
+   static final Identifier BUTTON_HIGHLIGHTED = Identifier.ofDefault("container/beacon/button_highlighted");
    /**
     * @mapping {@literal hashed f_sutgxpqf Lnet/minecraft/unmapped/C_askpskli;f_sutgxpqf:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BUTTON Lnet/minecraft/client/gui/screen/ingame/BeaconScreen;BUTTON:Lnet/minecraft/util/Identifier;}
     */
-   static final Identifier BUTTON = Identifier.m_anmnhtwf("container/beacon/button");
+   static final Identifier BUTTON = Identifier.ofDefault("container/beacon/button");
    /**
     * @mapping {@literal hashed f_kgjjwyed Lnet/minecraft/unmapped/C_askpskli;f_kgjjwyed:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named CONFIRM Lnet/minecraft/client/gui/screen/ingame/BeaconScreen;CONFIRM:Lnet/minecraft/util/Identifier;}
     */
-   static final Identifier CONFIRM = Identifier.m_anmnhtwf("container/beacon/confirm");
+   static final Identifier CONFIRM = Identifier.ofDefault("container/beacon/confirm");
    /**
     * @mapping {@literal hashed f_sdlgjiyv Lnet/minecraft/unmapped/C_askpskli;f_sdlgjiyv:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named CANCEL Lnet/minecraft/client/gui/screen/ingame/BeaconScreen;CANCEL:Lnet/minecraft/util/Identifier;}
     */
-   static final Identifier CANCEL = Identifier.m_anmnhtwf("container/beacon/cancel");
+   static final Identifier CANCEL = Identifier.ofDefault("container/beacon/cancel");
    /**
     * @mapping {@literal hashed f_fntfzmlz Lnet/minecraft/unmapped/C_askpskli;f_fntfzmlz:Lnet/minecraft/unmapped/C_rdaqiwdt;}
     * @mapping {@literal named PRIMARY_POWER Lnet/minecraft/client/gui/screen/ingame/BeaconScreen;PRIMARY_POWER:Lnet/minecraft/text/Text;}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.java	2024-06-09 03:13:55.603663730 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BlastFurnaceScreen.java	2024-06-09 03:12:40.538385973 +0000
@@ -18,17 +18,17 @@
     * @mapping {@literal hashed f_gipijauw Lnet/minecraft/unmapped/C_ebnbiapj;f_gipijauw:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named LIT_PROGRESS Lnet/minecraft/client/gui/screen/ingame/BlastFurnaceScreen;LIT_PROGRESS:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier LIT_PROGRESS = Identifier.m_anmnhtwf("container/blast_furnace/lit_progress");
+   private static final Identifier LIT_PROGRESS = Identifier.ofDefault("container/blast_furnace/lit_progress");
    /**
     * @mapping {@literal hashed f_itgzhvsp Lnet/minecraft/unmapped/C_ebnbiapj;f_itgzhvsp:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BURN_PROGRESS Lnet/minecraft/client/gui/screen/ingame/BlastFurnaceScreen;BURN_PROGRESS:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier BURN_PROGRESS = Identifier.m_anmnhtwf("container/blast_furnace/burn_progress");
+   private static final Identifier BURN_PROGRESS = Identifier.ofDefault("container/blast_furnace/burn_progress");
    /**
     * @mapping {@literal hashed f_roqourog Lnet/minecraft/unmapped/C_ebnbiapj;f_roqourog:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/BlastFurnaceScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/blast_furnace.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/blast_furnace.png");
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ebnbiapj;<init>(Lnet/minecraft/unmapped/C_zolktige;Lnet/minecraft/unmapped/C_sxzqocrm;Lnet/minecraft/unmapped/C_rdaqiwdt;)V}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/BookScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/BookScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/BookScreen.java	2024-06-09 03:13:55.471661549 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BookScreen.java	2024-06-09 03:12:40.402383946 +0000
@@ -54,7 +54,7 @@
     * @mapping {@literal hashed f_nheasbit Lnet/minecraft/unmapped/C_riknfhrm;f_nheasbit:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BOOK_TEXTURE Lnet/minecraft/client/gui/screen/ingame/BookScreen;BOOK_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   public static final Identifier BOOK_TEXTURE = Identifier.m_anmnhtwf("textures/gui/book.png");
+   public static final Identifier BOOK_TEXTURE = Identifier.ofDefault("textures/gui/book.png");
    /**
     * @mapping {@literal hashed f_wcinkmsu Lnet/minecraft/unmapped/C_riknfhrm;f_wcinkmsu:I}
     * @mapping {@literal named MAX_TEXT_WIDTH Lnet/minecraft/client/gui/screen/ingame/BookScreen;MAX_TEXT_WIDTH:I}
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	2024-06-09 03:13:55.591663532 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BrewingStandScreen.java	2024-06-09 03:12:40.526385793 +0000
@@ -19,22 +19,22 @@
     * @mapping {@literal hashed f_qmjmxtvi Lnet/minecraft/unmapped/C_mfvdzxlj;f_qmjmxtvi:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named FUEL_LENGTH Lnet/minecraft/client/gui/screen/ingame/BrewingStandScreen;FUEL_LENGTH:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier FUEL_LENGTH = Identifier.m_anmnhtwf("container/brewing_stand/fuel_length");
+   private static final Identifier FUEL_LENGTH = Identifier.ofDefault("container/brewing_stand/fuel_length");
    /**
     * @mapping {@literal hashed f_tgpitlwz Lnet/minecraft/unmapped/C_mfvdzxlj;f_tgpitlwz:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BREW_PROGRESS Lnet/minecraft/client/gui/screen/ingame/BrewingStandScreen;BREW_PROGRESS:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier BREW_PROGRESS = Identifier.m_anmnhtwf("container/brewing_stand/brew_progress");
+   private static final Identifier BREW_PROGRESS = Identifier.ofDefault("container/brewing_stand/brew_progress");
    /**
     * @mapping {@literal hashed f_tsmrkuqr Lnet/minecraft/unmapped/C_mfvdzxlj;f_tsmrkuqr:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BUBBLES Lnet/minecraft/client/gui/screen/ingame/BrewingStandScreen;BUBBLES:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier BUBBLES = Identifier.m_anmnhtwf("container/brewing_stand/bubbles");
+   private static final Identifier BUBBLES = Identifier.ofDefault("container/brewing_stand/bubbles");
    /**
     * @mapping {@literal hashed f_vzzjontm Lnet/minecraft/unmapped/C_mfvdzxlj;f_vzzjontm:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/BrewingStandScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/brewing_stand.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/brewing_stand.png");
    /**
     * @mapping {@literal hashed f_adxztjbv Lnet/minecraft/unmapped/C_mfvdzxlj;f_adxztjbv:[I}
     * @mapping {@literal named BUBBLE_PROGRESS Lnet/minecraft/client/gui/screen/ingame/BrewingStandScreen;BUBBLE_PROGRESS:[I}
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	2024-06-09 03:13:55.395660294 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java	2024-06-09 03:12:40.314382636 +0000
@@ -25,32 +25,32 @@
     * @mapping {@literal hashed f_yhrlneie Lnet/minecraft/unmapped/C_hqccoyeq;f_yhrlneie:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named ERROR Lnet/minecraft/client/gui/screen/ingame/CartographyTableScreen;ERROR:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier ERROR = Identifier.m_anmnhtwf("container/cartography_table/error");
+   private static final Identifier ERROR = Identifier.ofDefault("container/cartography_table/error");
    /**
     * @mapping {@literal hashed f_xdlypaxp Lnet/minecraft/unmapped/C_hqccoyeq;f_xdlypaxp:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SCALED_MAP Lnet/minecraft/client/gui/screen/ingame/CartographyTableScreen;SCALED_MAP:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier SCALED_MAP = Identifier.m_anmnhtwf("container/cartography_table/scaled_map");
+   private static final Identifier SCALED_MAP = Identifier.ofDefault("container/cartography_table/scaled_map");
    /**
     * @mapping {@literal hashed f_ugqbcczl Lnet/minecraft/unmapped/C_hqccoyeq;f_ugqbcczl:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named DUPLICATED_MAP Lnet/minecraft/client/gui/screen/ingame/CartographyTableScreen;DUPLICATED_MAP:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier DUPLICATED_MAP = Identifier.m_anmnhtwf("container/cartography_table/duplicated_map");
+   private static final Identifier DUPLICATED_MAP = Identifier.ofDefault("container/cartography_table/duplicated_map");
    /**
     * @mapping {@literal hashed f_sfkketuy Lnet/minecraft/unmapped/C_hqccoyeq;f_sfkketuy:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named MAP Lnet/minecraft/client/gui/screen/ingame/CartographyTableScreen;MAP:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier MAP = Identifier.m_anmnhtwf("container/cartography_table/map");
+   private static final Identifier MAP = Identifier.ofDefault("container/cartography_table/map");
    /**
     * @mapping {@literal hashed f_ybhadfiz Lnet/minecraft/unmapped/C_hqccoyeq;f_ybhadfiz:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named LOCKED Lnet/minecraft/client/gui/screen/ingame/CartographyTableScreen;LOCKED:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier LOCKED = Identifier.m_anmnhtwf("container/cartography_table/locked");
+   private static final Identifier LOCKED = Identifier.ofDefault("container/cartography_table/locked");
    /**
     * @mapping {@literal hashed f_mcatknht Lnet/minecraft/unmapped/C_hqccoyeq;f_mcatknht:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/CartographyTableScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/cartography_table.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/cartography_table.png");
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hqccoyeq;<init>(Lnet/minecraft/unmapped/C_petqnsgn;Lnet/minecraft/unmapped/C_sxzqocrm;Lnet/minecraft/unmapped/C_rdaqiwdt;)V}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java	2024-06-09 03:13:55.447661153 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CrafterScreen.java	2024-06-09 03:12:40.370383469 +0000
@@ -24,22 +24,22 @@
     * @mapping {@literal hashed f_kqjpnlzo Lnet/minecraft/unmapped/C_ffdwiayx;f_kqjpnlzo:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named DISABLED_SLOT_TEXTURE Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;DISABLED_SLOT_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier DISABLED_SLOT_TEXTURE = Identifier.m_anmnhtwf("container/crafter/disabled_slot");
+   private static final Identifier DISABLED_SLOT_TEXTURE = Identifier.ofDefault("container/crafter/disabled_slot");
    /**
     * @mapping {@literal hashed f_klgzdzze Lnet/minecraft/unmapped/C_ffdwiayx;f_klgzdzze:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named POWERED_ARROW_TEXTURE Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;POWERED_ARROW_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier POWERED_ARROW_TEXTURE = Identifier.m_anmnhtwf("container/crafter/powered_redstone");
+   private static final Identifier POWERED_ARROW_TEXTURE = Identifier.ofDefault("container/crafter/powered_redstone");
    /**
     * @mapping {@literal hashed f_fbkkgpfx Lnet/minecraft/unmapped/C_ffdwiayx;f_fbkkgpfx:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named UNPOWERED_ARROW_TEXTURE Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;UNPOWERED_ARROW_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier UNPOWERED_ARROW_TEXTURE = Identifier.m_anmnhtwf("container/crafter/unpowered_redstone");
+   private static final Identifier UNPOWERED_ARROW_TEXTURE = Identifier.ofDefault("container/crafter/unpowered_redstone");
    /**
     * @mapping {@literal hashed f_dolcfkge Lnet/minecraft/unmapped/C_ffdwiayx;f_dolcfkge:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/crafter.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/crafter.png");
    /**
     * @mapping {@literal hashed f_gffwbkyz Lnet/minecraft/unmapped/C_ffdwiayx;f_gffwbkyz:Lnet/minecraft/unmapped/C_rdaqiwdt;}
     * @mapping {@literal named TOGGLEABLE_SLOT_TOOLTIP Lnet/minecraft/client/gui/screen/ingame/CrafterScreen;TOGGLEABLE_SLOT_TOOLTIP:Lnet/minecraft/text/Text;}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CraftingScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CraftingScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CraftingScreen.java	2024-06-09 03:13:55.675664920 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CraftingScreen.java	2024-06-09 03:12:40.622387224 +0000
@@ -23,7 +23,7 @@
     * @mapping {@literal hashed f_pqgwcgdw Lnet/minecraft/unmapped/C_pesddzsm;f_pqgwcgdw:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/CraftingScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/crafting_table.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/crafting_table.png");
    /**
     * @mapping {@literal hashed f_ocjnovqq Lnet/minecraft/unmapped/C_pesddzsm;f_ocjnovqq:Lnet/minecraft/unmapped/C_xaybmvwz;}
     * @mapping {@literal named recipeBook Lnet/minecraft/client/gui/screen/ingame/CraftingScreen;recipeBook:Lnet/minecraft/client/gui/widget/recipe_book/RecipeBookWidget;}
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	2024-06-09 03:13:55.411660558 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2024-06-09 03:12:40.330382874 +0000
@@ -61,63 +61,63 @@
     * @mapping {@literal hashed f_gghfeqtx Lnet/minecraft/unmapped/C_hvozqtyu;f_gghfeqtx:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SCROLLER Lnet/minecraft/client/gui/screen/ingame/CreativeInventoryScreen;SCROLLER:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier SCROLLER = Identifier.m_anmnhtwf("container/creative_inventory/scroller");
+   private static final Identifier SCROLLER = Identifier.ofDefault("container/creative_inventory/scroller");
    /**
     * @mapping {@literal hashed f_ftbqkbjy Lnet/minecraft/unmapped/C_hvozqtyu;f_ftbqkbjy:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SCROLLER_DISABLED Lnet/minecraft/client/gui/screen/ingame/CreativeInventoryScreen;SCROLLER_DISABLED:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier SCROLLER_DISABLED = Identifier.m_anmnhtwf("container/creative_inventory/scroller_disabled");
+   private static final Identifier SCROLLER_DISABLED = Identifier.ofDefault("container/creative_inventory/scroller_disabled");
    /**
     * @mapping {@literal hashed f_cdvpvbvy Lnet/minecraft/unmapped/C_hvozqtyu;f_cdvpvbvy:[Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TOP_UNSELECTED Lnet/minecraft/client/gui/screen/ingame/CreativeInventoryScreen;TOP_UNSELECTED:[Lnet/minecraft/util/Identifier;}
     */
    private static final Identifier[] TOP_UNSELECTED = new Identifier[]{
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_top_unselected_1"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_top_unselected_2"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_top_unselected_3"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_top_unselected_4"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_top_unselected_5"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_top_unselected_6"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_top_unselected_7")
+      Identifier.ofDefault("container/creative_inventory/tab_top_unselected_1"),
+      Identifier.ofDefault("container/creative_inventory/tab_top_unselected_2"),
+      Identifier.ofDefault("container/creative_inventory/tab_top_unselected_3"),
+      Identifier.ofDefault("container/creative_inventory/tab_top_unselected_4"),
+      Identifier.ofDefault("container/creative_inventory/tab_top_unselected_5"),
+      Identifier.ofDefault("container/creative_inventory/tab_top_unselected_6"),
+      Identifier.ofDefault("container/creative_inventory/tab_top_unselected_7")
    };
    /**
     * @mapping {@literal hashed f_kcwakzzl Lnet/minecraft/unmapped/C_hvozqtyu;f_kcwakzzl:[Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TOP_SELECTED Lnet/minecraft/client/gui/screen/ingame/CreativeInventoryScreen;TOP_SELECTED:[Lnet/minecraft/util/Identifier;}
     */
    private static final Identifier[] TOP_SELECTED = new Identifier[]{
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_top_selected_1"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_top_selected_2"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_top_selected_3"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_top_selected_4"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_top_selected_5"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_top_selected_6"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_top_selected_7")
+      Identifier.ofDefault("container/creative_inventory/tab_top_selected_1"),
+      Identifier.ofDefault("container/creative_inventory/tab_top_selected_2"),
+      Identifier.ofDefault("container/creative_inventory/tab_top_selected_3"),
+      Identifier.ofDefault("container/creative_inventory/tab_top_selected_4"),
+      Identifier.ofDefault("container/creative_inventory/tab_top_selected_5"),
+      Identifier.ofDefault("container/creative_inventory/tab_top_selected_6"),
+      Identifier.ofDefault("container/creative_inventory/tab_top_selected_7")
    };
    /**
     * @mapping {@literal hashed f_hgnyxfmt Lnet/minecraft/unmapped/C_hvozqtyu;f_hgnyxfmt:[Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BOTTOM_UNSELECTED Lnet/minecraft/client/gui/screen/ingame/CreativeInventoryScreen;BOTTOM_UNSELECTED:[Lnet/minecraft/util/Identifier;}
     */
    private static final Identifier[] BOTTOM_UNSELECTED = new Identifier[]{
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_bottom_unselected_1"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_bottom_unselected_2"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_bottom_unselected_3"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_bottom_unselected_4"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_bottom_unselected_5"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_bottom_unselected_6"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_bottom_unselected_7")
+      Identifier.ofDefault("container/creative_inventory/tab_bottom_unselected_1"),
+      Identifier.ofDefault("container/creative_inventory/tab_bottom_unselected_2"),
+      Identifier.ofDefault("container/creative_inventory/tab_bottom_unselected_3"),
+      Identifier.ofDefault("container/creative_inventory/tab_bottom_unselected_4"),
+      Identifier.ofDefault("container/creative_inventory/tab_bottom_unselected_5"),
+      Identifier.ofDefault("container/creative_inventory/tab_bottom_unselected_6"),
+      Identifier.ofDefault("container/creative_inventory/tab_bottom_unselected_7")
    };
    /**
     * @mapping {@literal hashed f_jpwzikiu Lnet/minecraft/unmapped/C_hvozqtyu;f_jpwzikiu:[Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BOTTOM_SELECTED Lnet/minecraft/client/gui/screen/ingame/CreativeInventoryScreen;BOTTOM_SELECTED:[Lnet/minecraft/util/Identifier;}
     */
    private static final Identifier[] BOTTOM_SELECTED = new Identifier[]{
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_bottom_selected_1"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_bottom_selected_2"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_bottom_selected_3"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_bottom_selected_4"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_bottom_selected_5"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_bottom_selected_6"),
-      Identifier.m_anmnhtwf("container/creative_inventory/tab_bottom_selected_7")
+      Identifier.ofDefault("container/creative_inventory/tab_bottom_selected_1"),
+      Identifier.ofDefault("container/creative_inventory/tab_bottom_selected_2"),
+      Identifier.ofDefault("container/creative_inventory/tab_bottom_selected_3"),
+      Identifier.ofDefault("container/creative_inventory/tab_bottom_selected_4"),
+      Identifier.ofDefault("container/creative_inventory/tab_bottom_selected_5"),
+      Identifier.ofDefault("container/creative_inventory/tab_bottom_selected_6"),
+      Identifier.ofDefault("container/creative_inventory/tab_bottom_selected_7")
    };
    /**
     * @mapping {@literal hashed f_dedjljjs Lnet/minecraft/unmapped/C_hvozqtyu;f_dedjljjs:I}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.java namedSrc/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.java	2024-06-09 03:13:55.523662408 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.java	2024-06-09 03:12:40.458384781 +0000
@@ -20,7 +20,7 @@
     * @mapping {@literal hashed f_tdjogybc Lnet/minecraft/unmapped/C_wetwfuza;f_tdjogybc:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named FONT_ID Lnet/minecraft/client/gui/screen/ingame/EnchantingPhrases;FONT_ID:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier FONT_ID = Identifier.m_anmnhtwf("alt");
+   private static final Identifier FONT_ID = Identifier.ofDefault("alt");
    /**
     * @mapping {@literal hashed f_wzdoryfl Lnet/minecraft/unmapped/C_wetwfuza;f_wzdoryfl:Lnet/minecraft/unmapped/C_cpwnhism;}
     * @mapping {@literal named STYLE Lnet/minecraft/client/gui/screen/ingame/EnchantingPhrases;STYLE:Lnet/minecraft/text/Style;}
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	2024-06-09 03:13:55.451661219 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java	2024-06-09 03:12:40.370383469 +0000
@@ -39,44 +39,44 @@
     * @mapping {@literal named LEVEL Lnet/minecraft/client/gui/screen/ingame/EnchantmentScreen;LEVEL:[Lnet/minecraft/util/Identifier;}
     */
    private static final Identifier[] LEVEL = new Identifier[]{
-      Identifier.m_anmnhtwf("container/enchanting_table/level_1"),
-      Identifier.m_anmnhtwf("container/enchanting_table/level_2"),
-      Identifier.m_anmnhtwf("container/enchanting_table/level_3")
+      Identifier.ofDefault("container/enchanting_table/level_1"),
+      Identifier.ofDefault("container/enchanting_table/level_2"),
+      Identifier.ofDefault("container/enchanting_table/level_3")
    };
    /**
     * @mapping {@literal hashed f_lbjhibdo Lnet/minecraft/unmapped/C_qznktrjs;f_lbjhibdo:[Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named LEVEL_DISABLED Lnet/minecraft/client/gui/screen/ingame/EnchantmentScreen;LEVEL_DISABLED:[Lnet/minecraft/util/Identifier;}
     */
    private static final Identifier[] LEVEL_DISABLED = new Identifier[]{
-      Identifier.m_anmnhtwf("container/enchanting_table/level_1_disabled"),
-      Identifier.m_anmnhtwf("container/enchanting_table/level_2_disabled"),
-      Identifier.m_anmnhtwf("container/enchanting_table/level_3_disabled")
+      Identifier.ofDefault("container/enchanting_table/level_1_disabled"),
+      Identifier.ofDefault("container/enchanting_table/level_2_disabled"),
+      Identifier.ofDefault("container/enchanting_table/level_3_disabled")
    };
    /**
     * @mapping {@literal hashed f_jgfgisgp Lnet/minecraft/unmapped/C_qznktrjs;f_jgfgisgp:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SLOT_DISABLED Lnet/minecraft/client/gui/screen/ingame/EnchantmentScreen;SLOT_DISABLED:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier SLOT_DISABLED = Identifier.m_anmnhtwf("container/enchanting_table/enchantment_slot_disabled");
+   private static final Identifier SLOT_DISABLED = Identifier.ofDefault("container/enchanting_table/enchantment_slot_disabled");
    /**
     * @mapping {@literal hashed f_zzrxagqq Lnet/minecraft/unmapped/C_qznktrjs;f_zzrxagqq:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SLOT_HIGHLIGHTED Lnet/minecraft/client/gui/screen/ingame/EnchantmentScreen;SLOT_HIGHLIGHTED:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier SLOT_HIGHLIGHTED = Identifier.m_anmnhtwf("container/enchanting_table/enchantment_slot_highlighted");
+   private static final Identifier SLOT_HIGHLIGHTED = Identifier.ofDefault("container/enchanting_table/enchantment_slot_highlighted");
    /**
     * @mapping {@literal hashed f_clsuxbnv Lnet/minecraft/unmapped/C_qznktrjs;f_clsuxbnv:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SLOT Lnet/minecraft/client/gui/screen/ingame/EnchantmentScreen;SLOT:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier SLOT = Identifier.m_anmnhtwf("container/enchanting_table/enchantment_slot");
+   private static final Identifier SLOT = Identifier.ofDefault("container/enchanting_table/enchantment_slot");
    /**
     * @mapping {@literal hashed f_beqgbetc Lnet/minecraft/unmapped/C_qznktrjs;f_beqgbetc:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/EnchantmentScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/enchanting_table.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/enchanting_table.png");
    /**
     * @mapping {@literal hashed f_zvhhhyck Lnet/minecraft/unmapped/C_qznktrjs;f_zvhhhyck:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BOOK_TEXTURE Lnet/minecraft/client/gui/screen/ingame/EnchantmentScreen;BOOK_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier BOOK_TEXTURE = Identifier.m_anmnhtwf("textures/entity/enchanting_table_book.png");
+   private static final Identifier BOOK_TEXTURE = Identifier.ofDefault("textures/entity/enchanting_table_book.png");
    /**
     * @mapping {@literal hashed f_clqxoqhn Lnet/minecraft/unmapped/C_qznktrjs;f_clqxoqhn:Lnet/minecraft/unmapped/C_rlomrsco;}
     * @mapping {@literal named random Lnet/minecraft/client/gui/screen/ingame/EnchantmentScreen;random:Lnet/minecraft/util/random/RandomGenerator;}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/FurnaceScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/FurnaceScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/FurnaceScreen.java	2024-06-09 03:13:55.535662607 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/FurnaceScreen.java	2024-06-09 03:12:40.474385019 +0000
@@ -18,17 +18,17 @@
     * @mapping {@literal hashed f_fhgfiocf Lnet/minecraft/unmapped/C_dpjzhlym;f_fhgfiocf:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named LIT_PROGRESS Lnet/minecraft/client/gui/screen/ingame/FurnaceScreen;LIT_PROGRESS:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier LIT_PROGRESS = Identifier.m_anmnhtwf("container/furnace/lit_progress");
+   private static final Identifier LIT_PROGRESS = Identifier.ofDefault("container/furnace/lit_progress");
    /**
     * @mapping {@literal hashed f_wgkpaajz Lnet/minecraft/unmapped/C_dpjzhlym;f_wgkpaajz:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BURN_PROGRESS Lnet/minecraft/client/gui/screen/ingame/FurnaceScreen;BURN_PROGRESS:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier BURN_PROGRESS = Identifier.m_anmnhtwf("container/furnace/burn_progress");
+   private static final Identifier BURN_PROGRESS = Identifier.ofDefault("container/furnace/burn_progress");
    /**
     * @mapping {@literal hashed f_ebyhqyvk Lnet/minecraft/unmapped/C_dpjzhlym;f_ebyhqyvk:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/FurnaceScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/furnace.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/furnace.png");
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_dpjzhlym;<init>(Lnet/minecraft/unmapped/C_kymtwcds;Lnet/minecraft/unmapped/C_sxzqocrm;Lnet/minecraft/unmapped/C_rdaqiwdt;)V}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen.java	2024-06-09 03:13:55.647664457 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen.java	2024-06-09 03:12:40.582386628 +0000
@@ -18,7 +18,7 @@
     * @mapping {@literal hashed f_xllqndiv Lnet/minecraft/unmapped/C_rpozyyyf;f_xllqndiv:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/Generic3x3ContainerScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/dispenser.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/dispenser.png");
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_rpozyyyf;<init>(Lnet/minecraft/unmapped/C_lwaresgj;Lnet/minecraft/unmapped/C_sxzqocrm;Lnet/minecraft/unmapped/C_rdaqiwdt;)V}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/GenericContainerScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/GenericContainerScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/GenericContainerScreen.java	2024-06-09 03:13:55.507662145 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/GenericContainerScreen.java	2024-06-09 03:12:40.438384483 +0000
@@ -18,7 +18,7 @@
     * @mapping {@literal hashed f_wpzuklzd Lnet/minecraft/unmapped/C_eovbrgqd;f_wpzuklzd:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/GenericContainerScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/generic_54.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/generic_54.png");
    /**
     * @mapping {@literal hashed f_zpuddmhh Lnet/minecraft/unmapped/C_eovbrgqd;f_zpuddmhh:I}
     * @mapping {@literal named rows Lnet/minecraft/client/gui/screen/ingame/GenericContainerScreen;rows:I}
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	2024-06-09 03:13:55.467661484 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/GrindstoneScreen.java	2024-06-09 03:12:40.394383827 +0000
@@ -18,12 +18,12 @@
     * @mapping {@literal hashed f_eusrygwf Lnet/minecraft/unmapped/C_toqldvke;f_eusrygwf:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named ERROR Lnet/minecraft/client/gui/screen/ingame/GrindstoneScreen;ERROR:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier ERROR = Identifier.m_anmnhtwf("container/grindstone/error");
+   private static final Identifier ERROR = Identifier.ofDefault("container/grindstone/error");
    /**
     * @mapping {@literal hashed f_fxhekawg Lnet/minecraft/unmapped/C_toqldvke;f_fxhekawg:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/GrindstoneScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/grindstone.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/grindstone.png");
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_toqldvke;<init>(Lnet/minecraft/unmapped/C_kgqyoyeh;Lnet/minecraft/unmapped/C_sxzqocrm;Lnet/minecraft/unmapped/C_rdaqiwdt;)V}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/HandledScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/HandledScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/HandledScreen.java	2024-06-09 03:13:55.427660823 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/HandledScreen.java	2024-06-09 03:12:40.346383111 +0000
@@ -36,7 +36,7 @@
     * @mapping {@literal hashed f_fevmuhfe Lnet/minecraft/unmapped/C_gwivrcyr;f_fevmuhfe:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BACKGROUND_TEXTURE Lnet/minecraft/client/gui/screen/ingame/HandledScreen;BACKGROUND_TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   public static final Identifier BACKGROUND_TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/inventory.png");
+   public static final Identifier BACKGROUND_TEXTURE = Identifier.ofDefault("textures/gui/container/inventory.png");
    /**
     * @mapping {@literal hashed f_ywkpujrm Lnet/minecraft/unmapped/C_gwivrcyr;f_ywkpujrm:F}
     * @mapping {@literal named TOUCH_DROP_SPEED Lnet/minecraft/client/gui/screen/ingame/HandledScreen;TOUCH_DROP_SPEED:F}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/HangingSignEditScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/HangingSignEditScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/HangingSignEditScreen.java	2024-06-09 03:13:55.571663201 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/HangingSignEditScreen.java	2024-06-09 03:12:40.506385496 +0000
@@ -39,7 +39,7 @@
     * @mapping {@literal hashed f_koujywif Lnet/minecraft/unmapped/C_wmnezkuf;f_koujywif:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named signTexture Lnet/minecraft/client/gui/screen/ingame/HangingSignEditScreen;signTexture:Lnet/minecraft/util/Identifier;}
     */
-   private final Identifier signTexture = Identifier.m_anmnhtwf("textures/gui/hanging_signs/" + this.signType.getName() + ".png");
+   private final Identifier signTexture = Identifier.ofDefault("textures/gui/hanging_signs/" + this.signType.getName() + ".png");
 
    /**
     * Mapping not found
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/HopperScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/HopperScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/HopperScreen.java	2024-06-09 03:13:55.535662607 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/HopperScreen.java	2024-06-09 03:12:40.474385019 +0000
@@ -18,7 +18,7 @@
     * @mapping {@literal hashed f_ksjhlhqi Lnet/minecraft/unmapped/C_qnucsggu;f_ksjhlhqi:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/HopperScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/hopper.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/hopper.png");
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_qnucsggu;<init>(Lnet/minecraft/unmapped/C_ehecrewr;Lnet/minecraft/unmapped/C_sxzqocrm;Lnet/minecraft/unmapped/C_rdaqiwdt;)V}
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	2024-06-09 03:13:55.599663664 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/HorseScreen.java	2024-06-09 03:12:40.530385854 +0000
@@ -20,27 +20,27 @@
     * @mapping {@literal hashed f_fsjkvqgx Lnet/minecraft/unmapped/C_ghofnnir;f_fsjkvqgx:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named CHEST_SLOTS Lnet/minecraft/client/gui/screen/ingame/HorseScreen;CHEST_SLOTS:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier CHEST_SLOTS = Identifier.m_anmnhtwf("container/horse/chest_slots");
+   private static final Identifier CHEST_SLOTS = Identifier.ofDefault("container/horse/chest_slots");
    /**
     * @mapping {@literal hashed f_chessimq Lnet/minecraft/unmapped/C_ghofnnir;f_chessimq:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SADDLE_SLOT Lnet/minecraft/client/gui/screen/ingame/HorseScreen;SADDLE_SLOT:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier SADDLE_SLOT = Identifier.m_anmnhtwf("container/horse/saddle_slot");
+   private static final Identifier SADDLE_SLOT = Identifier.ofDefault("container/horse/saddle_slot");
    /**
     * @mapping {@literal hashed f_xmamuaod Lnet/minecraft/unmapped/C_ghofnnir;f_xmamuaod:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named LLAMA_ARMOR_SLOT Lnet/minecraft/client/gui/screen/ingame/HorseScreen;LLAMA_ARMOR_SLOT:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier LLAMA_ARMOR_SLOT = Identifier.m_anmnhtwf("container/horse/llama_armor_slot");
+   private static final Identifier LLAMA_ARMOR_SLOT = Identifier.ofDefault("container/horse/llama_armor_slot");
    /**
     * @mapping {@literal hashed f_cygpwhbl Lnet/minecraft/unmapped/C_ghofnnir;f_cygpwhbl:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named ARMOR_SLOT Lnet/minecraft/client/gui/screen/ingame/HorseScreen;ARMOR_SLOT:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier ARMOR_SLOT = Identifier.m_anmnhtwf("container/horse/armor_slot");
+   private static final Identifier ARMOR_SLOT = Identifier.ofDefault("container/horse/armor_slot");
    /**
     * @mapping {@literal hashed f_odcvttgl Lnet/minecraft/unmapped/C_ghofnnir;f_odcvttgl:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/HorseScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/horse.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/horse.png");
    /**
     * @mapping {@literal hashed f_ngiqspdm Lnet/minecraft/unmapped/C_ghofnnir;f_ngiqspdm:Lnet/minecraft/unmapped/C_ktznyhaj;}
     * @mapping {@literal named entity Lnet/minecraft/client/gui/screen/ingame/HorseScreen;entity:Lnet/minecraft/entity/passive/AbstractHorseEntity;}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.java	2024-06-09 03:13:55.491661880 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.java	2024-06-09 03:12:40.422384245 +0000
@@ -174,9 +174,9 @@
          .send(
             new JigsawUpdateC2SPacket(
                this.jigsaw.getPos(),
-               Identifier.m_qfesvyds(this.nameField.getText()),
-               Identifier.m_qfesvyds(this.targetField.getText()),
-               Identifier.m_qfesvyds(this.poolField.getText()),
+               Identifier.parse(this.nameField.getText()),
+               Identifier.parse(this.targetField.getText()),
+               Identifier.parse(this.poolField.getText()),
                this.finalStateField.getText(),
                this.joint,
                this.parseInt(this.selectionPriorityField.getText()),
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	2024-06-09 03:13:55.575663268 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/LoomScreen.java	2024-06-09 03:12:40.510385555 +0000
@@ -39,52 +39,52 @@
     * @mapping {@literal hashed f_qrbxxeam Lnet/minecraft/unmapped/C_sdfeaszq;f_qrbxxeam:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named BANNER_SLOT Lnet/minecraft/client/gui/screen/ingame/LoomScreen;BANNER_SLOT:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier BANNER_SLOT = Identifier.m_anmnhtwf("container/loom/banner_slot");
+   private static final Identifier BANNER_SLOT = Identifier.ofDefault("container/loom/banner_slot");
    /**
     * @mapping {@literal hashed f_mwmypzji Lnet/minecraft/unmapped/C_sdfeaszq;f_mwmypzji:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named DYE_SLOT Lnet/minecraft/client/gui/screen/ingame/LoomScreen;DYE_SLOT:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier DYE_SLOT = Identifier.m_anmnhtwf("container/loom/dye_slot");
+   private static final Identifier DYE_SLOT = Identifier.ofDefault("container/loom/dye_slot");
    /**
     * @mapping {@literal hashed f_srhbhagj Lnet/minecraft/unmapped/C_sdfeaszq;f_srhbhagj:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named PATTERN_SLOT Lnet/minecraft/client/gui/screen/ingame/LoomScreen;PATTERN_SLOT:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier PATTERN_SLOT = Identifier.m_anmnhtwf("container/loom/pattern_slot");
+   private static final Identifier PATTERN_SLOT = Identifier.ofDefault("container/loom/pattern_slot");
    /**
     * @mapping {@literal hashed f_rawpajmx Lnet/minecraft/unmapped/C_sdfeaszq;f_rawpajmx:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SCROLLER Lnet/minecraft/client/gui/screen/ingame/LoomScreen;SCROLLER:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier SCROLLER = Identifier.m_anmnhtwf("container/loom/scroller");
+   private static final Identifier SCROLLER = Identifier.ofDefault("container/loom/scroller");
    /**
     * @mapping {@literal hashed f_wqbgivcn Lnet/minecraft/unmapped/C_sdfeaszq;f_wqbgivcn:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SCROLLER_DISABLED Lnet/minecraft/client/gui/screen/ingame/LoomScreen;SCROLLER_DISABLED:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier SCROLLER_DISABLED = Identifier.m_anmnhtwf("container/loom/scroller_disabled");
+   private static final Identifier SCROLLER_DISABLED = Identifier.ofDefault("container/loom/scroller_disabled");
    /**
     * @mapping {@literal hashed f_papjjphn Lnet/minecraft/unmapped/C_sdfeaszq;f_papjjphn:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named PATTERN_SELECTED Lnet/minecraft/client/gui/screen/ingame/LoomScreen;PATTERN_SELECTED:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier PATTERN_SELECTED = Identifier.m_anmnhtwf("container/loom/pattern_selected");
+   private static final Identifier PATTERN_SELECTED = Identifier.ofDefault("container/loom/pattern_selected");
    /**
     * @mapping {@literal hashed f_lwnewizx Lnet/minecraft/unmapped/C_sdfeaszq;f_lwnewizx:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named PATTERN_HIGHLIGHTED Lnet/minecraft/client/gui/screen/ingame/LoomScreen;PATTERN_HIGHLIGHTED:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier PATTERN_HIGHLIGHTED = Identifier.m_anmnhtwf("container/loom/pattern_highlighted");
+   private static final Identifier PATTERN_HIGHLIGHTED = Identifier.ofDefault("container/loom/pattern_highlighted");
    /**
     * @mapping {@literal hashed f_olbvepik Lnet/minecraft/unmapped/C_sdfeaszq;f_olbvepik:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named PATTERN Lnet/minecraft/client/gui/screen/ingame/LoomScreen;PATTERN:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier PATTERN = Identifier.m_anmnhtwf("container/loom/pattern");
+   private static final Identifier PATTERN = Identifier.ofDefault("container/loom/pattern");
    /**
     * @mapping {@literal hashed f_kuurfmya Lnet/minecraft/unmapped/C_sdfeaszq;f_kuurfmya:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named ERROR Lnet/minecraft/client/gui/screen/ingame/LoomScreen;ERROR:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier ERROR = Identifier.m_anmnhtwf("container/loom/error");
+   private static final Identifier ERROR = Identifier.ofDefault("container/loom/error");
    /**
     * @mapping {@literal hashed f_zjsahxfk Lnet/minecraft/unmapped/C_sdfeaszq;f_zjsahxfk:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/LoomScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/loom.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/loom.png");
    /**
     * @mapping {@literal hashed f_hnrtnptz Lnet/minecraft/unmapped/C_sdfeaszq;f_hnrtnptz:I}
     * @mapping {@literal named PATTERN_LIST_COLUMNS Lnet/minecraft/client/gui/screen/ingame/LoomScreen;PATTERN_LIST_COLUMNS:I}
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	2024-06-09 03:13:55.575663268 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/MerchantScreen.java	2024-06-09 03:12:40.514385615 +0000
@@ -27,52 +27,52 @@
     * @mapping {@literal hashed f_aetjxctp Lnet/minecraft/unmapped/C_ymlucuqe;f_aetjxctp:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named OUT_OF_STOCK Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;OUT_OF_STOCK:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier OUT_OF_STOCK = Identifier.m_anmnhtwf("container/villager/out_of_stock");
+   private static final Identifier OUT_OF_STOCK = Identifier.ofDefault("container/villager/out_of_stock");
    /**
     * @mapping {@literal hashed f_ailpuxlr Lnet/minecraft/unmapped/C_ymlucuqe;f_ailpuxlr:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named EXPERIENCE_BAR_BACKGROUND Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;EXPERIENCE_BAR_BACKGROUND:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier EXPERIENCE_BAR_BACKGROUND = Identifier.m_anmnhtwf("container/villager/experience_bar_background");
+   private static final Identifier EXPERIENCE_BAR_BACKGROUND = Identifier.ofDefault("container/villager/experience_bar_background");
    /**
     * @mapping {@literal hashed f_njkukxiz Lnet/minecraft/unmapped/C_ymlucuqe;f_njkukxiz:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named EXPERIENCE_BAR_CURRENT Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;EXPERIENCE_BAR_CURRENT:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier EXPERIENCE_BAR_CURRENT = Identifier.m_anmnhtwf("container/villager/experience_bar_current");
+   private static final Identifier EXPERIENCE_BAR_CURRENT = Identifier.ofDefault("container/villager/experience_bar_current");
    /**
     * @mapping {@literal hashed f_ecsnqact Lnet/minecraft/unmapped/C_ymlucuqe;f_ecsnqact:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named EXPERIENCE_BAR_RESULT Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;EXPERIENCE_BAR_RESULT:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier EXPERIENCE_BAR_RESULT = Identifier.m_anmnhtwf("container/villager/experience_bar_result");
+   private static final Identifier EXPERIENCE_BAR_RESULT = Identifier.ofDefault("container/villager/experience_bar_result");
    /**
     * @mapping {@literal hashed f_kpwxonuc Lnet/minecraft/unmapped/C_ymlucuqe;f_kpwxonuc:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SCROLLER Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;SCROLLER:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier SCROLLER = Identifier.m_anmnhtwf("container/villager/scroller");
+   private static final Identifier SCROLLER = Identifier.ofDefault("container/villager/scroller");
    /**
     * @mapping {@literal hashed f_lrtwadxh Lnet/minecraft/unmapped/C_ymlucuqe;f_lrtwadxh:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named SCROLLER_DISABLED Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;SCROLLER_DISABLED:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier SCROLLER_DISABLED = Identifier.m_anmnhtwf("container/villager/scroller_disabled");
+   private static final Identifier SCROLLER_DISABLED = Identifier.ofDefault("container/villager/scroller_disabled");
    /**
     * @mapping {@literal hashed f_ijrzmxjo Lnet/minecraft/unmapped/C_ymlucuqe;f_ijrzmxjo:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TRADE_ARROW_OUT_OF_STOCK Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;TRADE_ARROW_OUT_OF_STOCK:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TRADE_ARROW_OUT_OF_STOCK = Identifier.m_anmnhtwf("container/villager/trade_arrow_out_of_stock");
+   private static final Identifier TRADE_ARROW_OUT_OF_STOCK = Identifier.ofDefault("container/villager/trade_arrow_out_of_stock");
    /**
     * @mapping {@literal hashed f_tjxbjbvb Lnet/minecraft/unmapped/C_ymlucuqe;f_tjxbjbvb:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TRADE_ARROW Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;TRADE_ARROW:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TRADE_ARROW = Identifier.m_anmnhtwf("container/villager/trade_arrow");
+   private static final Identifier TRADE_ARROW = Identifier.ofDefault("container/villager/trade_arrow");
    /**
     * @mapping {@literal hashed f_cwhnqqng Lnet/minecraft/unmapped/C_ymlucuqe;f_cwhnqqng:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named DISCOUNT_STRIKETHROUGH Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;DISCOUNT_STRIKETHROUGH:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier DISCOUNT_STRIKETHROUGH = Identifier.m_anmnhtwf("container/villager/discount_strikethrough");
+   private static final Identifier DISCOUNT_STRIKETHROUGH = Identifier.ofDefault("container/villager/discount_strikethrough");
    /**
     * @mapping {@literal hashed f_viwhwhwn Lnet/minecraft/unmapped/C_ymlucuqe;f_viwhwhwn:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/villager.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/villager.png");
    /**
     * @mapping {@literal hashed f_jhbstmth Lnet/minecraft/unmapped/C_ymlucuqe;f_jhbstmth:I}
     * @mapping {@literal named TEXTURE_WIDTH Lnet/minecraft/client/gui/screen/ingame/MerchantScreen;TEXTURE_WIDTH:I}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.java	2024-06-09 03:13:55.475661616 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/ShulkerBoxScreen.java	2024-06-09 03:12:40.406384006 +0000
@@ -18,7 +18,7 @@
     * @mapping {@literal hashed f_njnpwiut Lnet/minecraft/unmapped/C_pehwnhrn;f_njnpwiut:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/gui/screen/ingame/ShulkerBoxScreen;TEXTURE:Lnet/minecraft/util/Identifier;}
     */
-   private static final Identifier TEXTURE = Identifier.m_anmnhtwf("textures/gui/container/shulker_box.png");
+   private static final Identifier TEXTURE = Identifier.ofDefault("textures/gui/container/shulker_box.png");
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_pehwnhrn;<init>(Lnet/minecraft/unmapped/C_ajcqgzcv;Lnet/minecraft/unmapped/C_sxzqocrm;Lnet/minecraft/unmapped/C_rdaqiwdt;)V}


The remaining diff is too long!

Please sign in to comment.