Skip to content

Commit

Permalink
texture nonsense
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Oct 27, 2023
1 parent a077d73 commit f43775f
Show file tree
Hide file tree
Showing 6 changed files with 225 additions and 2 deletions.
1 change: 1 addition & 0 deletions mappings/net/minecraft/block/Crafter.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/unmapped/C_dmnruvyr net/minecraft/block/Crafter
187 changes: 185 additions & 2 deletions mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping
View file

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions mappings/net/minecraft/data/client/model/Model.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@ CLASS net/minecraft/unmapped/C_zppcsbsk net/minecraft/data/client/model/Model
ARG 2 suffix
ARG 3 texture
ARG 4 modelCollector
METHOD m_ijcfulih (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_pixosdqo;Lnet/minecraft/unmapped/C_ncpywfca;)V
ARG 1 key
ARG 2 textureId
METHOD m_izvaynaq getDefaultModelId (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ncpywfca;
METHOD m_mjmunmmv createJson (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Map;)Lcom/google/gson/JsonObject;
ARG 1 id
ARG 2 textureMap
METHOD m_oyjlnybm upload (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_pgmmajlq;Ljava/util/function/BiConsumer;Lnet/minecraft/unmapped/C_zppcsbsk$C_sbdlbkmi;)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 1 id
ARG 2 texture
ARG 3 modelCollector
ARG 4 jsonFactory
METHOD m_qvwwtehp createTextureMap (Lnet/minecraft/unmapped/C_pgmmajlq;)Ljava/util/Map;
ARG 1 texture
METHOD m_rhrakaxu (Lnet/minecraft/unmapped/C_zppcsbsk$C_sbdlbkmi;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Map;)Lcom/google/gson/JsonElement;
Expand All @@ -28,3 +40,9 @@ CLASS net/minecraft/unmapped/C_zppcsbsk net/minecraft/data/client/model/Model
ARG 1 block
ARG 2 texture
ARG 3 modelCollector
METHOD m_uyappnlr (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ncpywfca;)V
ARG 1 parent
CLASS C_sbdlbkmi JsonFactory
METHOD create (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Map;)Lcom/google/gson/JsonObject;
ARG 1 id
ARG 2 textureMap
5 changes: 5 additions & 0 deletions mappings/net/minecraft/data/client/model/Models.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
CLASS net/minecraft/unmapped/C_vcuykfgc net/minecraft/data/client/model/Models
FIELD f_cvgdtrqx TEMPLATE_POTTED_FLOWERING_AZALEA_BUSH Lnet/minecraft/unmapped/C_zppcsbsk;
FIELD f_jnhwdvre SINGLE_LAYER_ITEM Lnet/minecraft/unmapped/C_zppcsbsk;
FIELD f_mjgpepuz TRIPLE_LAYER_ITEM Lnet/minecraft/unmapped/C_zppcsbsk;
FIELD f_sfgphltd PARTICLE Lnet/minecraft/unmapped/C_zppcsbsk;
FIELD f_tbelvgcf STEM_GROWTH_STAGES [Lnet/minecraft/unmapped/C_zppcsbsk;
FIELD f_xyfoirmr DOUBLE_LAYER_ITEM Lnet/minecraft/unmapped/C_zppcsbsk;
METHOD m_faubrqhn (I)[Lnet/minecraft/unmapped/C_zppcsbsk;
ARG 0 length
METHOD m_gipgtqqj item (Ljava/lang/String;[Lnet/minecraft/unmapped/C_pixosdqo;)Lnet/minecraft/unmapped/C_zppcsbsk;
ARG 0 parent
ARG 1 requiredTextures
Expand All @@ -16,3 +19,5 @@ CLASS net/minecraft/unmapped/C_vcuykfgc net/minecraft/data/client/model/Models
METHOD m_vwekgahp block (Ljava/lang/String;[Lnet/minecraft/unmapped/C_pixosdqo;)Lnet/minecraft/unmapped/C_zppcsbsk;
ARG 0 parent
ARG 1 requiredTextures
METHOD m_xdeesekp (I)Lnet/minecraft/unmapped/C_zppcsbsk;
ARG 0 stage
12 changes: 12 additions & 0 deletions mappings/net/minecraft/data/client/model/Texture.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CLASS net/minecraft/unmapped/C_pgmmajlq net/minecraft/data/client/model/Texture
FIELD f_ecvpqhia inherited Ljava/util/Set;
FIELD f_usjeywzw entries Ljava/util/Map;
METHOD m_amvqbqnh customParticle (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq;
METHOD m_arkhwwuh crop (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq;
ARG 0 id
METHOD m_aunduefd sideFrontTopBottom (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq;
Expand All @@ -15,6 +16,8 @@ CLASS net/minecraft/unmapped/C_pgmmajlq net/minecraft/data/client/model/Texture
ARG 0 block
METHOD m_cjnfpwwn cauldron (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq;
ARG 0 content
METHOD m_cmvcqyye (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
ARG 1 path
METHOD m_cqmdvtff plant (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq;
ARG 0 id
METHOD m_czrngiaz stem (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq;
Expand All @@ -37,16 +40,21 @@ CLASS net/minecraft/unmapped/C_pgmmajlq net/minecraft/data/client/model/Texture
ARG 0 block
METHOD m_eiubtszo sideAndTop (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq;
ARG 0 block
METHOD m_esmayivc sculkShrieker (Z)Lnet/minecraft/unmapped/C_pgmmajlq;
ARG 0 canSummon
METHOD m_fhaielou pattern (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq;
ARG 0 block
METHOD m_fmlhtlxq put (Lnet/minecraft/unmapped/C_pixosdqo;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq;
ARG 1 key
ARG 2 id
METHOD m_fyonuiyk (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
ARG 1 path
METHOD m_gfwoxucf getInherited ()Ljava/util/stream/Stream;
METHOD m_ghhvhutp rail (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq;
ARG 0 block
METHOD m_ghqwlvpx all (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq;
ARG 0 id
METHOD m_gnvgpjsu flowerbed (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq;
METHOD m_hsolgsih getSubId (Lnet/minecraft/unmapped/C_vorddnax;Ljava/lang/String;)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 0 item
ARG 1 suffix
Expand All @@ -73,6 +81,7 @@ CLASS net/minecraft/unmapped/C_pgmmajlq net/minecraft/data/client/model/Texture
ARG 1 end
METHOD m_nmpkoera wallSideEnd (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq;
ARG 0 block
METHOD m_nzbyyqjx pottedAzalea (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq;
METHOD m_ovvossma of (Lnet/minecraft/unmapped/C_pixosdqo;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq;
ARG 0 key
ARG 1 id
Expand Down Expand Up @@ -118,6 +127,9 @@ CLASS net/minecraft/unmapped/C_pgmmajlq net/minecraft/data/client/model/Texture
ARG 2 layer2
METHOD m_wkqhkdip top (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq;
ARG 0 top
METHOD m_wmodlmje snifferEgg (Ljava/lang/String;)Lnet/minecraft/unmapped/C_pgmmajlq;
ARG 0 type
METHOD m_wnenptud fence (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq;
METHOD m_xfveurtl topBottom (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_pgmmajlq;
ARG 0 top
ARG 1 bottom
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/data/client/model/TexturedModel.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
CLASS net/minecraft/unmapped/C_tkkixdtc net/minecraft/data/client/model/TexturedModel
COMMENT Represents a model with texture variables defined.
FIELD f_blaugkpd FLOWERBED_2 Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_boubovoo ORIENTABLE Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_bppfnamf TEMPLATE_HANGING_LANTERN Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_cmqnydiq TEMPLATE_SEAGRASS Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_eivnenam CUBE_COLUMN_HORIZONTAL Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_fjiipfwk FLOWERBED_3 Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_gaatijqr CUBE_ALL Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_gixfznvg TEMPLATE_ANVIL Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_gpasebzp CUBE_TOP Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
Expand All @@ -19,7 +21,9 @@ CLASS net/minecraft/unmapped/C_tkkixdtc net/minecraft/data/client/model/Textured
FIELD f_smumziqg END_FOR_TOP_CUBE_COLUMN Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_srvqqeoc CUBE_COLUMN Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_svomqred PARTICLE Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_ulvknsfo FLOWERBED_4 Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_uotyduaa CUBE_BOTTOM_TOP Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_wkllyois FLOWERBED_1 Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_wnbaisnc LEAVES Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_xdqlljao TEMPLATE_GLAZED_TERRACOTTA Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
FIELD f_zyqjsxcw SIDE_END_WALL Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;
Expand Down

3 comments on commit f43775f

@github-actions
Copy link

Choose a reason for hiding this comment

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

With commit f43775f, 33 file(s) were updated with 534 line(s) added and 468 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2023-10-27 02:07:00.556689415 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2023-10-27 02:05:25.708735377 +0000
@@ -41,7 +41,6 @@
 import net.minecraft.unmapped.C_bnsqivrz;
 import net.minecraft.unmapped.C_cibvoqed;
 import net.minecraft.unmapped.C_dfahqqqb;
-import net.minecraft.unmapped.C_dmnruvyr;
 import net.minecraft.unmapped.C_evvhndgg;
 import net.minecraft.unmapped.C_hupbiznx;
 import net.minecraft.unmapped.C_itgkwhcl;
@@ -11487,7 +11486,7 @@
     * @mapping {@literal named CRAFTER Lnet/minecraft/block/Blocks;CRAFTER:Lnet/minecraft/block/Block;}
     */
    public static final Block CRAFTER = m_mjiljkwg(
-      "crafter", new C_dmnruvyr(AbstractBlock.Settings.create().mapColor(MapColor.STONE).strength(1.5F, 3.5F).requiredFlags(FeatureFlags.f_dmxgtmcy))
+      "crafter", new Crafter(AbstractBlock.Settings.create().mapColor(MapColor.STONE).strength(1.5F, 3.5F).requiredFlags(FeatureFlags.f_dmxgtmcy))
    );
 
    /**
Only in namedSrc/net/minecraft/block: Crafter.java
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe_book/RecipeResultCollection.java namedSrc/net/minecraft/client/gui/screen/recipe_book/RecipeResultCollection.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe_book/RecipeResultCollection.java	2023-10-27 02:07:00.648689369 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe_book/RecipeResultCollection.java	2023-10-27 02:05:25.804735323 +0000
@@ -104,7 +104,7 @@
     */
    public void initialize(RecipeBook recipeBook) {
       for (RecipeHolder<?> lv : this.recipes) {
-         if (recipeBook.m_dcnyuasn(lv)) {
+         if (recipeBook.contains(lv)) {
             this.unlockedRecipes.add(lv);
          }
       }
@@ -116,7 +116,7 @@
     */
    public void computeCraftables(RecipeMatcher recipeFinder, int gridWidth, int gridHeight, RecipeBook recipeBook) {
       for (RecipeHolder<?> lv : this.recipes) {
-         boolean bl = lv.value().fits(gridWidth, gridHeight) && recipeBook.m_dcnyuasn(lv);
+         boolean bl = lv.value().fits(gridWidth, gridHeight) && recipeBook.contains(lv);
          if (bl) {
             this.fittingRecipes.add(lv);
          } else {
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2023-10-27 02:07:00.648689369 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2023-10-27 02:05:25.808735321 +0000
@@ -1805,23 +1805,23 @@
       switch (lv2) {
          case REMOVE:
             for (Identifier lv3 : packet.getRecipeIdsToChange()) {
-               this.recipeManager.get(lv3).ifPresent(lv::m_dllnexer);
+               this.recipeManager.get(lv3).ifPresent(lv::remove);
             }
             break;
          case INIT:
             for (Identifier lv4 : packet.getRecipeIdsToChange()) {
-               this.recipeManager.get(lv4).ifPresent(lv::m_ijxqozuf);
+               this.recipeManager.get(lv4).ifPresent(lv::add);
             }
 
             for (Identifier lv5 : packet.getRecipeIdsToInit()) {
-               this.recipeManager.get(lv5).ifPresent(lv::m_drzdihac);
+               this.recipeManager.get(lv5).ifPresent(lv::queueForHighlight);
             }
             break;
          case ADD:
             for (Identifier lv6 : packet.getRecipeIdsToChange()) {
                this.recipeManager.get(lv6).ifPresent(arg2 -> {
-                  lv.m_ijxqozuf(arg2);
-                  lv.m_drzdihac(arg2);
+                  lv.add(arg2);
+                  lv.queueForHighlight(arg2);
                   if (arg2.value().showNotification()) {
                      RecipeToast.show(this.client.getToastManager(), arg2);
                   }
diff -bur namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java namedSrc/net/minecraft/data/client/ItemModelGenerator.java
--- namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java	2023-10-27 02:07:00.652689367 +0000
+++ namedSrc/net/minecraft/data/client/ItemModelGenerator.java	2023-10-27 02:05:25.812735318 +0000
@@ -129,7 +129,7 @@
     * Mapping not found
     */
    private JsonObject m_llpeiyoc(Identifier arg, Map<TextureKey, Identifier> map, ArmorMaterial arg2) {
-      JsonObject jsonObject = Models.DOUBLE_LAYER_ITEM.m_mjmunmmv(arg, map);
+      JsonObject jsonObject = Models.DOUBLE_LAYER_ITEM.createJson(arg, map);
       JsonArray jsonArray = new JsonArray();
 
       for (ItemModelGenerator.C_cutcputf lv : f_ccmpywsi) {
@@ -153,9 +153,9 @@
       Identifier lv2 = Texture.getId(arg);
       Identifier lv3 = Texture.getSubId(arg, "_overlay");
       if (arg.getMaterial() == ArmorMaterials.LEATHER) {
-         Models.DOUBLE_LAYER_ITEM.m_oyjlnybm(lv, Texture.doubleLayer(lv2, lv3), this.writer, (arg2, map) -> this.m_llpeiyoc(arg2, map, arg.getMaterial()));
+         Models.DOUBLE_LAYER_ITEM.upload(lv, Texture.doubleLayer(lv2, lv3), this.writer, (arg2, map) -> this.m_llpeiyoc(arg2, map, arg.getMaterial()));
       } else {
-         Models.SINGLE_LAYER_ITEM.m_oyjlnybm(lv, Texture.layer0(lv2), this.writer, (arg2, map) -> this.m_llpeiyoc(arg2, map, arg.getMaterial()));
+         Models.SINGLE_LAYER_ITEM.upload(lv, Texture.layer0(lv2), this.writer, (arg2, map) -> this.m_llpeiyoc(arg2, map, arg.getMaterial()));
       }
 
       for (ItemModelGenerator.C_cutcputf lv4 : f_ccmpywsi) {

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java namedSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java
--- namedTargetSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java	2023-10-27 02:07:00.588689399 +0000
+++ namedSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java	2023-10-27 02:05:25.744735357 +0000
@@ -25,6 +25,7 @@
 import java.util.stream.IntStream;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
+import net.minecraft.block.Crafter;
 import net.minecraft.block.MangrovePropaguleBlock;
 import net.minecraft.block.PitcherCropBlock;
 import net.minecraft.block.SnifferEggBlock;
@@ -54,7 +55,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
 import net.minecraft.state.property.Property;
-import net.minecraft.unmapped.C_dmnruvyr;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.Direction;
@@ -103,10 +103,13 @@
       .put(Blocks.RED_SANDSTONE, TexturedModel.SIDE_TOP_BOTTOM_WALL.get(Blocks.RED_SANDSTONE))
       .put(Blocks.SMOOTH_SANDSTONE, TexturedModel.getCubeAll(Texture.getSubId(Blocks.SANDSTONE, "_top")))
       .put(Blocks.SMOOTH_RED_SANDSTONE, TexturedModel.getCubeAll(Texture.getSubId(Blocks.RED_SANDSTONE, "_top")))
-      .put(Blocks.CUT_SANDSTONE, TexturedModel.CUBE_COLUMN.get(Blocks.SANDSTONE).texture(arg -> arg.put(TextureKey.SIDE, Texture.getId(Blocks.CUT_SANDSTONE))))
+      .put(
+         Blocks.CUT_SANDSTONE,
+         TexturedModel.CUBE_COLUMN.get(Blocks.SANDSTONE).texture(texture -> texture.put(TextureKey.SIDE, Texture.getId(Blocks.CUT_SANDSTONE)))
+      )
       .put(
          Blocks.CUT_RED_SANDSTONE,
-         TexturedModel.CUBE_COLUMN.get(Blocks.RED_SANDSTONE).texture(arg -> arg.put(TextureKey.SIDE, Texture.getId(Blocks.CUT_RED_SANDSTONE)))
+         TexturedModel.CUBE_COLUMN.get(Blocks.RED_SANDSTONE).texture(texture -> texture.put(TextureKey.SIDE, Texture.getId(Blocks.CUT_RED_SANDSTONE)))
       )
       .put(Blocks.QUARTZ_BLOCK, TexturedModel.CUBE_COLUMN.get(Blocks.QUARTZ_BLOCK))
       .put(Blocks.SMOOTH_QUARTZ, TexturedModel.getCubeAll(Texture.getSubId(Blocks.QUARTZ_BLOCK, "_bottom")))
@@ -114,7 +117,9 @@
       .put(Blocks.DEEPSLATE, TexturedModel.SIDE_END_WALL.get(Blocks.DEEPSLATE))
       .put(
          Blocks.CHISELED_QUARTZ_BLOCK,
-         TexturedModel.CUBE_COLUMN.get(Blocks.CHISELED_QUARTZ_BLOCK).texture(arg -> arg.put(TextureKey.SIDE, Texture.getId(Blocks.CHISELED_QUARTZ_BLOCK)))
+         TexturedModel.CUBE_COLUMN
+            .get(Blocks.CHISELED_QUARTZ_BLOCK)
+            .texture(texture -> texture.put(TextureKey.SIDE, Texture.getId(Blocks.CHISELED_QUARTZ_BLOCK)))
       )
       .put(Blocks.CHISELED_SANDSTONE, TexturedModel.CUBE_COLUMN.get(Blocks.CHISELED_SANDSTONE).texture(texture -> {
          texture.put(TextureKey.END, Texture.getSubId(Blocks.SANDSTONE, "_top"));
@@ -140,7 +145,7 @@
       .put(BlockFamily.Variant.CRACKED, BlockStateModelGenerator.BlockTexturePool::sandstone)
       .put(BlockFamily.Variant.CUSTOM_FENCE, BlockStateModelGenerator.BlockTexturePool::customFence)
       .put(BlockFamily.Variant.FENCE, BlockStateModelGenerator.BlockTexturePool::fence)
-      .put(BlockFamily.Variant.CUSTOM_FENCE_GATE, BlockStateModelGenerator.BlockTexturePool::m_bcruuyxo)
+      .put(BlockFamily.Variant.CUSTOM_FENCE_GATE, BlockStateModelGenerator.BlockTexturePool::customFenceGate)
       .put(BlockFamily.Variant.FENCE_GATE, BlockStateModelGenerator.BlockTexturePool::fenceGate)
       .put(BlockFamily.Variant.SIGN, BlockStateModelGenerator.BlockTexturePool::sign)
       .put(BlockFamily.Variant.SLAB, BlockStateModelGenerator.BlockTexturePool::slab)
@@ -196,9 +201,10 @@
       )
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_brxmxele Lnet/minecraft/unmapped/C_ysvjbfkt;f_brxmxele:Ljava/util/Map;}
+    * @mapping {@literal named CHISELED_BOOKSHELF_SLOT_MODEL_CACHE Lnet/minecraft/data/client/model/BlockStateModelGenerator;CHISELED_BOOKSHELF_SLOT_MODEL_CACHE:Ljava/util/Map;}
     */
-   private static final Map<BlockStateModelGenerator.C_jhuevbcm, Identifier> f_brxmxele = new HashMap();
+   private static final Map<BlockStateModelGenerator.BookSlotModelCacheKey, Identifier> CHISELED_BOOKSHELF_SLOT_MODEL_CACHE = new HashMap();
 
    /**
     * @mapping {@literal hashed m_mqvibvqy Lnet/minecraft/unmapped/C_ysvjbfkt;m_mqvibvqy(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_pgmmajlq;Ljava/util/function/BiConsumer;)Lnet/minecraft/unmapped/C_wqokohwr;}
@@ -415,17 +421,17 @@
 
    /**
     * @mapping {@literal hashed m_lhwwsxgs Lnet/minecraft/unmapped/C_ysvjbfkt;m_lhwwsxgs(Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
-    * @mapping {@literal named m_lhwwsxgs Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_lhwwsxgs(Lnet/minecraft/block/Block;)V}
+    * @mapping {@literal named registerDustable Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerDustable(Lnet/minecraft/block/Block;)V}
     */
-   private void m_lhwwsxgs(Block block) {
+   private void registerDustable(Block block) {
       this.blockStateCollector
          .accept(
             VariantsBlockStateSupplier.create(block)
                .coordinate(
                   BlockStateVariantMap.create(Properties.DUSTED)
                      .register(
-                        integer -> {
-                           String string = "_" + integer;
+                        dusted -> {
+                           String string = "_" + dusted;
                            Identifier lv = Texture.getSubId(block, string);
                            return BlockStateVariant.create()
                               .put(VariantSettings.MODEL, Models.CUBE_ALL.upload(block, string, new Texture().put(TextureKey.ALL, lv), this.modelCollector));
@@ -508,139 +514,153 @@
    private static BlockStateVariantMap.QuadrupleProperty<Direction, DoubleBlockHalf, DoorHinge, Boolean> fillDoorVariantMap(
       BlockStateVariantMap.QuadrupleProperty<Direction, DoubleBlockHalf, DoorHinge, Boolean> variantMap,
       DoubleBlockHalf targetHalf,
-      Identifier regularModel,
-      Identifier hingeModel,
-      Identifier arg5,
-      Identifier arg6
+      Identifier leftHingeClosedModel,
+      Identifier leftHingeOpenModel,
+      Identifier rightHingeClosedModel,
+      Identifier rightHingeOpenModel
    ) {
-      return variantMap.register(Direction.EAST, targetHalf, DoorHinge.LEFT, false, BlockStateVariant.create().put(VariantSettings.MODEL, regularModel))
+      return variantMap.register(Direction.EAST, targetHalf, DoorHinge.LEFT, false, BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeClosedModel))
          .register(
             Direction.SOUTH,
             targetHalf,
             DoorHinge.LEFT,
             false,
-            BlockStateVariant.create().put(VariantSettings.MODEL, regularModel).put(VariantSettings.Y, VariantSettings.Rotation.R90)
+            BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeClosedModel).put(VariantSettings.Y, VariantSettings.Rotation.R90)
          )
          .register(
             Direction.WEST,
             targetHalf,
             DoorHinge.LEFT,
             false,
-            BlockStateVariant.create().put(VariantSettings.MODEL, regularModel).put(VariantSettings.Y, VariantSettings.Rotation.R180)
+            BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeClosedModel).put(VariantSettings.Y, VariantSettings.Rotation.R180)
          )
          .register(
             Direction.NORTH,
             targetHalf,
             DoorHinge.LEFT,
             false,
-            BlockStateVariant.create().put(VariantSettings.MODEL, regularModel).put(VariantSettings.Y, VariantSettings.Rotation.R270)
+            BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeClosedModel).put(VariantSettings.Y, VariantSettings.Rotation.R270)
          )
-         .register(Direction.EAST, targetHalf, DoorHinge.RIGHT, false, BlockStateVariant.create().put(VariantSettings.MODEL, arg5))
+         .register(Direction.EAST, targetHalf, DoorHinge.RIGHT, false, BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeClosedModel))
          .register(
             Direction.SOUTH,
             targetHalf,
             DoorHinge.RIGHT,
             false,
-            BlockStateVariant.create().put(VariantSettings.MODEL, arg5).put(VariantSettings.Y, VariantSettings.Rotation.R90)
+            BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeClosedModel).put(VariantSettings.Y, VariantSettings.Rotation.R90)
          )
          .register(
             Direction.WEST,
             targetHalf,
             DoorHinge.RIGHT,
             false,
-            BlockStateVariant.create().put(VariantSettings.MODEL, arg5).put(VariantSettings.Y, VariantSettings.Rotation.R180)
+            BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeClosedModel).put(VariantSettings.Y, VariantSettings.Rotation.R180)
          )
          .register(
             Direction.NORTH,
             targetHalf,
             DoorHinge.RIGHT,
             false,
-            BlockStateVariant.create().put(VariantSettings.MODEL, arg5).put(VariantSettings.Y, VariantSettings.Rotation.R270)
+            BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeClosedModel).put(VariantSettings.Y, VariantSettings.Rotation.R270)
          )
          .register(
             Direction.EAST,
             targetHalf,
             DoorHinge.LEFT,
             true,
-            BlockStateVariant.create().put(VariantSettings.MODEL, hingeModel).put(VariantSettings.Y, VariantSettings.Rotation.R90)
+            BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeOpenModel).put(VariantSettings.Y, VariantSettings.Rotation.R90)
          )
          .register(
             Direction.SOUTH,
             targetHalf,
             DoorHinge.LEFT,
             true,
-            BlockStateVariant.create().put(VariantSettings.MODEL, hingeModel).put(VariantSettings.Y, VariantSettings.Rotation.R180)
+            BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeOpenModel).put(VariantSettings.Y, VariantSettings.Rotation.R180)
          )
          .register(
             Direction.WEST,
             targetHalf,
             DoorHinge.LEFT,
             true,
-            BlockStateVariant.create().put(VariantSettings.MODEL, hingeModel).put(VariantSettings.Y, VariantSettings.Rotation.R270)
+            BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeOpenModel).put(VariantSettings.Y, VariantSettings.Rotation.R270)
          )
-         .register(Direction.NORTH, targetHalf, DoorHinge.LEFT, true, BlockStateVariant.create().put(VariantSettings.MODEL, hingeModel))
+         .register(Direction.NORTH, targetHalf, DoorHinge.LEFT, true, BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeOpenModel))
          .register(
             Direction.EAST,
             targetHalf,
             DoorHinge.RIGHT,
             true,
-            BlockStateVariant.create().put(VariantSettings.MODEL, arg6).put(VariantSettings.Y, VariantSettings.Rotation.R270)
+            BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeOpenModel).put(VariantSettings.Y, VariantSettings.Rotation.R270)
          )
-         .register(Direction.SOUTH, targetHalf, DoorHinge.RIGHT, true, BlockStateVariant.create().put(VariantSettings.MODEL, arg6))
+         .register(Direction.SOUTH, targetHalf, DoorHinge.RIGHT, true, BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeOpenModel))
          .register(
             Direction.WEST,
             targetHalf,
             DoorHinge.RIGHT,
             true,
-            BlockStateVariant.create().put(VariantSettings.MODEL, arg6).put(VariantSettings.Y, VariantSettings.Rotation.R90)
+            BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeOpenModel).put(VariantSettings.Y, VariantSettings.Rotation.R90)
          )
          .register(
             Direction.NORTH,
             targetHalf,
             DoorHinge.RIGHT,
             true,
-            BlockStateVariant.create().put(VariantSettings.MODEL, arg6).put(VariantSettings.Y, VariantSettings.Rotation.R180)
+            BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeOpenModel).put(VariantSettings.Y, VariantSettings.Rotation.R180)
          );
    }
 
    /**
     * @mapping {@literal hashed m_cbfhoczw Lnet/minecraft/unmapped/C_ysvjbfkt;m_cbfhoczw(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wqokohwr;}
-    * @mapping {@literal named m_cbfhoczw Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_cbfhoczw(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
+    * @mapping {@literal named createDoorBlockState Lnet/minecraft/data/client/model/BlockStateModelGenerator;createDoorBlockState(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
     */
-   private static BlockStateSupplier m_cbfhoczw(
-      Block block, Identifier arg2, Identifier arg3, Identifier arg4, Identifier arg5, Identifier arg6, Identifier arg7, Identifier arg8, Identifier arg9
+   private static BlockStateSupplier createDoorBlockState(
+      Block doorBlock,
+      Identifier bottomLeftHingeClosedModelId,
+      Identifier bottomLeftHingeOpenModelId,
+      Identifier bottomRightHingeClosedModelId,
+      Identifier bottomRightHingeOpenModelId,
+      Identifier topLeftHingeClosedModelId,
+      Identifier topLeftHingeOpenModelId,
+      Identifier topRightHingeClosedModelId,
+      Identifier topRightHingeOpenModelId
    ) {
-      return VariantsBlockStateSupplier.create(block)
+      return VariantsBlockStateSupplier.create(doorBlock)
          .coordinate(
             fillDoorVariantMap(
                fillDoorVariantMap(
                   BlockStateVariantMap.create(Properties.HORIZONTAL_FACING, Properties.DOUBLE_BLOCK_HALF, Properties.DOOR_HINGE, Properties.OPEN),
                   DoubleBlockHalf.LOWER,
-                  arg2,
-                  arg3,
-                  arg4,
-                  arg5
+                  bottomLeftHingeClosedModelId,
+                  bottomLeftHingeOpenModelId,
+                  bottomRightHingeClosedModelId,
+                  bottomRightHingeOpenModelId
                ),
                DoubleBlockHalf.UPPER,
-               arg6,
-               arg7,
-               arg8,
-               arg9
+               topLeftHingeClosedModelId,
+               topLeftHingeOpenModelId,
+               topRightHingeClosedModelId,
+               topRightHingeOpenModelId
             )
          );
    }
 
    /**
     * @mapping {@literal hashed m_anzxptee Lnet/minecraft/unmapped/C_ysvjbfkt;m_anzxptee(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wqokohwr;}
-    * @mapping {@literal named m_anzxptee Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_anzxptee(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
+    * @mapping {@literal named createCustomFenceBlockState Lnet/minecraft/data/client/model/BlockStateModelGenerator;createCustomFenceBlockState(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
     */
-   static BlockStateSupplier m_anzxptee(Block block, Identifier arg2, Identifier arg3, Identifier arg4, Identifier arg5, Identifier arg6) {
-      return MultipartBlockStateSupplier.create(block)
-         .with(BlockStateVariant.create().put(VariantSettings.MODEL, arg2))
-         .with(When.create().set(Properties.NORTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, arg3).put(VariantSettings.UVLOCK, false))
-         .with(When.create().set(Properties.EAST, true), BlockStateVariant.create().put(VariantSettings.MODEL, arg4).put(VariantSettings.UVLOCK, false))
-         .with(When.create().set(Properties.SOUTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, arg5).put(VariantSettings.UVLOCK, false))
-         .with(When.create().set(Properties.WEST, true), BlockStateVariant.create().put(VariantSettings.MODEL, arg6).put(VariantSettings.UVLOCK, false));
+   static BlockStateSupplier createCustomFenceBlockState(
+      Block fenceBlock, Identifier postModelId, Identifier northModelId, Identifier eastModelId, Identifier southModelId, Identifier westModelId
+   ) {
+      return MultipartBlockStateSupplier.create(fenceBlock)
+         .with(BlockStateVariant.create().put(VariantSettings.MODEL, postModelId))
+         .with(
+            When.create().set(Properties.NORTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, northModelId).put(VariantSettings.UVLOCK, false)
+         )
+         .with(When.create().set(Properties.EAST, true), BlockStateVariant.create().put(VariantSettings.MODEL, eastModelId).put(VariantSettings.UVLOCK, false))
+         .with(
+            When.create().set(Properties.SOUTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, southModelId).put(VariantSettings.UVLOCK, false)
+         )
+         .with(When.create().set(Properties.WEST, true), BlockStateVariant.create().put(VariantSettings.MODEL, westModelId).put(VariantSettings.UVLOCK, false));
    }
 
    /**
@@ -738,9 +758,9 @@
     * @mapping {@literal named createFenceGateBlockState Lnet/minecraft/data/client/model/BlockStateModelGenerator;createFenceGateBlockState(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Z)Lnet/minecraft/data/client/model/BlockStateSupplier;}
     */
    static BlockStateSupplier createFenceGateBlockState(
-      Block fenceGateBlock, Identifier openModelId, Identifier closedModelId, Identifier openWallModelId, Identifier closedWallModelId, boolean bl
+      Block fenceGateBlock, Identifier openModelId, Identifier closedModelId, Identifier openWallModelId, Identifier closedWallModelId, boolean uvLock
    ) {
-      return VariantsBlockStateSupplier.create(fenceGateBlock, BlockStateVariant.create().put(VariantSettings.UVLOCK, bl))
+      return VariantsBlockStateSupplier.create(fenceGateBlock, BlockStateVariant.create().put(VariantSettings.UVLOCK, uvLock))
          .coordinate(createSouthDefaultHorizontalRotationStates())
          .coordinate(
             BlockStateVariantMap.create(Properties.IN_WALL, Properties.OPEN)
@@ -1284,13 +1304,13 @@
 
    /**
     * @mapping {@literal hashed m_oxulsacv Lnet/minecraft/unmapped/C_ysvjbfkt;m_oxulsacv(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_pgmmajlq;Ljava/util/function/BiConsumer;)Lnet/minecraft/unmapped/C_wqokohwr;}
-    * @mapping {@literal named m_oxulsacv Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_oxulsacv(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/model/Texture;Ljava/util/function/BiConsumer;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
+    * @mapping {@literal named createUvLockedPillarBlockState Lnet/minecraft/data/client/model/BlockStateModelGenerator;createUvLockedPillarBlockState(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/model/Texture;Ljava/util/function/BiConsumer;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
     */
-   static BlockStateSupplier m_oxulsacv(Block block, Texture arg2, BiConsumer<Identifier, Supplier<JsonElement>> biConsumer) {
-      Identifier lv = Models.CUBE_COLUMN_UV_LOCKED_X.upload(block, arg2, biConsumer);
-      Identifier lv2 = Models.CUBE_COLUMN_UV_LOCKED_Y.upload(block, arg2, biConsumer);
-      Identifier lv3 = Models.CUBE_COLUMN_UV_LOCKED_Z.upload(block, arg2, biConsumer);
-      Identifier lv4 = Models.CUBE_COLUMN.upload(block, arg2, biConsumer);
+   static BlockStateSupplier createUvLockedPillarBlockState(Block block, Texture texture, BiConsumer<Identifier, Supplier<JsonElement>> modelCollector) {
+      Identifier lv = Models.CUBE_COLUMN_UV_LOCKED_X.upload(block, texture, modelCollector);
+      Identifier lv2 = Models.CUBE_COLUMN_UV_LOCKED_Y.upload(block, texture, modelCollector);
+      Identifier lv3 = Models.CUBE_COLUMN_UV_LOCKED_Z.upload(block, texture, modelCollector);
+      Identifier lv4 = Models.CUBE_COLUMN.upload(block, texture, modelCollector);
       return VariantsBlockStateSupplier.create(block, BlockStateVariant.create().put(VariantSettings.MODEL, lv4))
          .coordinate(
             BlockStateVariantMap.create(Properties.AXIS)
@@ -1436,15 +1456,16 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zffcuixd Lnet/minecraft/unmapped/C_ysvjbfkt;m_zffcuixd(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
+    * @mapping {@literal named registerHangingSign Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerHangingSign(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V}
     */
-   public void m_zffcuixd(Block arg, Block arg2, Block arg3) {
-      Texture lv = Texture.particle(arg);
-      Identifier lv2 = Models.PARTICLE.upload(arg2, lv, this.modelCollector);
-      this.blockStateCollector.accept(createSingletonBlockState(arg2, lv2));
-      this.blockStateCollector.accept(createSingletonBlockState(arg3, lv2));
-      this.registerItemModel(arg2.asItem());
-      this.excludeFromSimpleItemModelGeneration(arg3);
+   public void registerHangingSign(Block log, Block hangingSign, Block wallSign) {
+      Texture lv = Texture.particle(log);
+      Identifier lv2 = Models.PARTICLE.upload(hangingSign, lv, this.modelCollector);
+      this.blockStateCollector.accept(createSingletonBlockState(hangingSign, lv2));
+      this.blockStateCollector.accept(createSingletonBlockState(wallSign, lv2));
+      this.registerItemModel(hangingSign.asItem());
+      this.excludeFromSimpleItemModelGeneration(wallSign);
    }
 
    /**
@@ -1462,23 +1483,24 @@
       Identifier lv8 = Models.DOOR_TOP_RIGHT.upload(doorBlock, lv, this.modelCollector);
       Identifier lv9 = Models.DOOR_TOP_RIGHT_OPEN.upload(doorBlock, lv, this.modelCollector);
       this.registerItemModel(doorBlock.asItem());
-      this.blockStateCollector.accept(m_cbfhoczw(doorBlock, lv2, lv3, lv4, lv5, lv6, lv7, lv8, lv9));
+      this.blockStateCollector.accept(createDoorBlockState(doorBlock, lv2, lv3, lv4, lv5, lv6, lv7, lv8, lv9));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ewobmawf Lnet/minecraft/unmapped/C_ysvjbfkt;m_ewobmawf(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
+    * @mapping {@literal named registerCopperDoor Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerCopperDoor(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V}
     */
-   private void m_ewobmawf(Block arg, Block arg2) {
-      Identifier lv = Models.DOOR_BOTTOM_LEFT.m_izvaynaq(arg);
-      Identifier lv2 = Models.DOOR_BOTTOM_LEFT_OPEN.m_izvaynaq(arg);
-      Identifier lv3 = Models.DOOR_BOTTOM_RIGHT.m_izvaynaq(arg);
-      Identifier lv4 = Models.DOOR_BOTTOM_RIGHT_OPEN.m_izvaynaq(arg);
-      Identifier lv5 = Models.DOOR_TOP_LEFT.m_izvaynaq(arg);
-      Identifier lv6 = Models.DOOR_TOP_LEFT_OPEN.m_izvaynaq(arg);
-      Identifier lv7 = Models.DOOR_TOP_RIGHT.m_izvaynaq(arg);
-      Identifier lv8 = Models.DOOR_TOP_RIGHT_OPEN.m_izvaynaq(arg);
-      this.registerParentedItemModel(arg2, ModelIds.getItemModelId(arg.asItem()));
-      this.blockStateCollector.accept(m_cbfhoczw(arg2, lv, lv2, lv3, lv4, lv5, lv6, lv7, lv8));
+   private void registerCopperDoor(Block doorBlock, Block parent) {
+      Identifier lv = Models.DOOR_BOTTOM_LEFT.getDefaultModelId(doorBlock);
+      Identifier lv2 = Models.DOOR_BOTTOM_LEFT_OPEN.getDefaultModelId(doorBlock);
+      Identifier lv3 = Models.DOOR_BOTTOM_RIGHT.getDefaultModelId(doorBlock);
+      Identifier lv4 = Models.DOOR_BOTTOM_RIGHT_OPEN.getDefaultModelId(doorBlock);
+      Identifier lv5 = Models.DOOR_TOP_LEFT.getDefaultModelId(doorBlock);
+      Identifier lv6 = Models.DOOR_TOP_LEFT_OPEN.getDefaultModelId(doorBlock);
+      Identifier lv7 = Models.DOOR_TOP_RIGHT.getDefaultModelId(doorBlock);
+      Identifier lv8 = Models.DOOR_TOP_RIGHT_OPEN.getDefaultModelId(doorBlock);
+      this.registerParentedItemModel(parent, ModelIds.getItemModelId(doorBlock.asItem()));
+      this.blockStateCollector.accept(createDoorBlockState(parent, lv, lv2, lv3, lv4, lv5, lv6, lv7, lv8));
    }
 
    /**
@@ -1508,14 +1530,15 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pxydxvus Lnet/minecraft/unmapped/C_ysvjbfkt;m_pxydxvus(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
+    * @mapping {@literal named registerCopperTrapdoor Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerCopperTrapdoor(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V}
     */
-   private void m_pxydxvus(Block arg, Block arg2) {
-      Identifier lv = Models.TEMPLATE_TRAPDOOR_TOP.m_izvaynaq(arg);
-      Identifier lv2 = Models.TEMPLATE_TRAPDOOR_BOTTOM.m_izvaynaq(arg);
-      Identifier lv3 = Models.TEMPLATE_TRAPDOOR_OPEN.m_izvaynaq(arg);
-      this.registerParentedItemModel(arg2, ModelIds.getItemModelId(arg.asItem()));
-      this.blockStateCollector.accept(createTrapdoorBlockState(arg2, lv, lv2, lv3));
+   private void registerCopperTrapdoor(Block trapdoorBlock, Block parent) {
+      Identifier lv = Models.TEMPLATE_TRAPDOOR_TOP.getDefaultModelId(trapdoorBlock);
+      Identifier lv2 = Models.TEMPLATE_TRAPDOOR_BOTTOM.getDefaultModelId(trapdoorBlock);
+      Identifier lv3 = Models.TEMPLATE_TRAPDOOR_OPEN.getDefaultModelId(trapdoorBlock);
+      this.registerParentedItemModel(parent, ModelIds.getItemModelId(trapdoorBlock.asItem()));
+      this.blockStateCollector.accept(createTrapdoorBlockState(parent, lv, lv2, lv3));
    }
 
    /**
@@ -1603,16 +1626,16 @@
 
    /**
     * @mapping {@literal hashed m_vvrdgvwj Lnet/minecraft/unmapped/C_ysvjbfkt;m_vvrdgvwj(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ysvjbfkt$C_mqnwzrnb;Lnet/minecraft/unmapped/C_vzlztuyw;[I)V}
-    * @mapping {@literal named m_vvrdgvwj Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_vvrdgvwj(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/model/BlockStateModelGenerator$TintType;Lnet/minecraft/state/property/Property;[I)V}
+    * @mapping {@literal named registerTintableStagedCrossBlockState Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerTintableStagedCrossBlockState(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/model/BlockStateModelGenerator$TintType;Lnet/minecraft/state/property/Property;[I)V}
     */
-   private void m_vvrdgvwj(Block block, BlockStateModelGenerator.TintType arg2, Property<Integer> arg3, int... is) {
-      if (arg3.getValues().size() != is.length) {
-         throw new IllegalArgumentException("missing values for property: " + arg3);
+   private void registerTintableStagedCrossBlockState(Block block, BlockStateModelGenerator.TintType tintType, Property<Integer> stageProperty, int... stages) {
+      if (stageProperty.getValues().size() != stages.length) {
+         throw new IllegalArgumentException("missing values for property: " + stageProperty);
       } else {
-         BlockStateVariantMap lv = BlockStateVariantMap.create(arg3).register(integer -> {
-            String string = "_stage" + is[integer];
+         BlockStateVariantMap lv = BlockStateVariantMap.create(stageProperty).register(stage -> {
+            String string = "_stage" + stages[stage];
             Texture lvx = Texture.cross(Texture.getSubId(block, string));
-            Identifier lv2 = arg2.getCrossModel().upload(block, string, lvx, this.modelCollector);
+            Identifier lv2 = tintType.getCrossModel().upload(block, string, lvx, this.modelCollector);
             return BlockStateVariant.create().put(VariantSettings.MODEL, lv2);
          });
          this.registerItemModel(block.asItem());
@@ -1674,17 +1697,17 @@
                .coordinate(
                   BlockStateVariantMap.create(Properties.AGE_7)
                      .register(
-                        integer -> BlockStateVariant.create()
-                              .put(VariantSettings.MODEL, Models.STEM_GROWTH_STAGES[integer].upload(stemBlock, lv, this.modelCollector))
+                        age -> BlockStateVariant.create().put(VariantSettings.MODEL, Models.STEM_GROWTH_STAGES[age].upload(stemBlock, lv, this.modelCollector))
                      )
                )
          );
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mwtfkfoc Lnet/minecraft/unmapped/C_ysvjbfkt;m_mwtfkfoc()V}
+    * @mapping {@literal named registerPitcherPlant Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerPitcherPlant()V}
     */
-   private void m_mwtfkfoc() {
+   private void registerPitcherPlant() {
       Block lv = Blocks.PITCHER_PLANT;
       this.registerItemModel(lv.asItem());
       Identifier lv2 = ModelIds.getBlockSubModelId(lv, "_top");
@@ -1693,15 +1716,16 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_oxrdxyqg Lnet/minecraft/unmapped/C_ysvjbfkt;m_oxrdxyqg()V}
+    * @mapping {@literal named registerPitcherCrop Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerPitcherCrop()V}
     */
-   private void m_oxrdxyqg() {
+   private void registerPitcherCrop() {
       Block lv = Blocks.PITCHER_CROP;
       this.registerItemModel(lv.asItem());
-      BlockStateVariantMap lv2 = BlockStateVariantMap.create(PitcherCropBlock.AGE, Properties.DOUBLE_BLOCK_HALF).register((integer, arg2) -> {
-         return switch (arg2) {
-            case UPPER -> BlockStateVariant.create().put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(lv, "_top_stage_" + integer));
-            case LOWER -> BlockStateVariant.create().put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(lv, "_bottom_stage_" + integer));
+      BlockStateVariantMap lv2 = BlockStateVariantMap.create(PitcherCropBlock.AGE, Properties.DOUBLE_BLOCK_HALF).register((age, half) -> {
+         return switch (half) {
+            case UPPER -> BlockStateVariant.create().put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(lv, "_top_stage_" + age));
+            case LOWER -> BlockStateVariant.create().put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(lv, "_bottom_stage_" + age));
          };
       });
       this.blockStateCollector.accept(VariantsBlockStateSupplier.create(lv).coordinate(lv2));
@@ -1846,20 +1870,20 @@
       Identifier lv4 = this.createSubModel(rail, "_on", Models.RAIL_FLAT, Texture::rail);
       Identifier lv5 = this.createSubModel(rail, "_on", Models.TEMPLATE_RAIL_RAISED_NE, Texture::rail);
       Identifier lv6 = this.createSubModel(rail, "_on", Models.TEMPLATE_RAIL_RAISED_SW, Texture::rail);
-      BlockStateVariantMap lv7 = BlockStateVariantMap.create(Properties.POWERED, Properties.STRAIGHT_RAIL_SHAPE).register((arg7, arg8) -> {
-         switch (arg8) {
+      BlockStateVariantMap lv7 = BlockStateVariantMap.create(Properties.POWERED, Properties.STRAIGHT_RAIL_SHAPE).register((powered, straightShape) -> {
+         switch (straightShape) {
             case NORTH_SOUTH:
-               return BlockStateVariant.create().put(VariantSettings.MODEL, arg7 ? lv4 : lv);
+               return BlockStateVariant.create().put(VariantSettings.MODEL, powered ? lv4 : lv);
             case EAST_WEST:
-               return BlockStateVariant.create().put(VariantSettings.MODEL, arg7 ? lv4 : lv).put(VariantSettings.Y, VariantSettings.Rotation.R90);
+               return BlockStateVariant.create().put(VariantSettings.MODEL, powered ? lv4 : lv).put(VariantSettings.Y, VariantSettings.Rotation.R90);
             case ASCENDING_EAST:
-               return BlockStateVariant.create().put(VariantSettings.MODEL, arg7 ? lv5 : lv2).put(VariantSettings.Y, VariantSettings.Rotation.R90);
+               return BlockStateVariant.create().put(VariantSettings.MODEL, powered ? lv5 : lv2).put(VariantSettings.Y, VariantSettings.Rotation.R90);
             case ASCENDING_WEST:
-               return BlockStateVariant.create().put(VariantSettings.MODEL, arg7 ? lv6 : lv3).put(VariantSettings.Y, VariantSettings.Rotation.R90);
+               return BlockStateVariant.create().put(VariantSettings.MODEL, powered ? lv6 : lv3).put(VariantSettings.Y, VariantSettings.Rotation.R90);
             case ASCENDING_NORTH:
-               return BlockStateVariant.create().put(VariantSettings.MODEL, arg7 ? lv5 : lv2);
+               return BlockStateVariant.create().put(VariantSettings.MODEL, powered ? lv5 : lv2);
             case ASCENDING_SOUTH:
-               return BlockStateVariant.create().put(VariantSettings.MODEL, arg7 ? lv6 : lv3);
+               return BlockStateVariant.create().put(VariantSettings.MODEL, powered ? lv6 : lv3);
             default:
                throw new UnsupportedOperationException("Fix you generator!");
          }
@@ -1914,14 +1938,14 @@
 
    /**
     * @mapping {@literal hashed m_rzwirmpw Lnet/minecraft/unmapped/C_ysvjbfkt;m_rzwirmpw(Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
-    * @mapping {@literal named m_rzwirmpw Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_rzwirmpw(Lnet/minecraft/block/Block;)V}
+    * @mapping {@literal named registerFlowerbed Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerFlowerbed(Lnet/minecraft/block/Block;)V}
     */
-   private void m_rzwirmpw(Block block) {
+   private void registerFlowerbed(Block block) {
       this.registerItemModel(block.asItem());
-      Identifier lv = TexturedModel.f_wkllyois.upload(block, this.modelCollector);
-      Identifier lv2 = TexturedModel.f_blaugkpd.upload(block, this.modelCollector);
-      Identifier lv3 = TexturedModel.f_fjiipfwk.upload(block, this.modelCollector);
-      Identifier lv4 = TexturedModel.f_ulvknsfo.upload(block, this.modelCollector);
+      Identifier lv = TexturedModel.FLOWERBED_1.upload(block, this.modelCollector);
+      Identifier lv2 = TexturedModel.FLOWERBED_2.upload(block, this.modelCollector);
+      Identifier lv3 = TexturedModel.FLOWERBED_3.upload(block, this.modelCollector);
+      Identifier lv4 = TexturedModel.FLOWERBED_4.upload(block, this.modelCollector);
       this.blockStateCollector
          .accept(
             MultipartBlockStateSupplier.create(block)
@@ -2066,7 +2090,7 @@
    private void registerCommandBlock(Block commandBlock) {
       Texture lv = Texture.sideFrontBack(commandBlock);
       Identifier lv2 = Models.TEMPLATE_COMMAND_BLOCK.upload(commandBlock, lv, this.modelCollector);
-      Identifier lv3 = this.createSubModel(commandBlock, "_conditional", Models.TEMPLATE_COMMAND_BLOCK, arg2 -> lv.copyAndAdd(TextureKey.SIDE, arg2));
+      Identifier lv3 = this.createSubModel(commandBlock, "_conditional", Models.TEMPLATE_COMMAND_BLOCK, id -> lv.copyAndAdd(TextureKey.SIDE, id));
       this.blockStateCollector
          .accept(
             VariantsBlockStateSupplier.create(commandBlock)
@@ -2162,7 +2186,7 @@
                               VariantSettings.MODEL,
                               TexturedModel.CUBE_BOTTOM_TOP
                                  .get(Blocks.BARREL)
-                                 .texture(arg2 -> arg2.put(TextureKey.TOP, lv))
+                                 .texture(texture -> texture.put(TextureKey.TOP, lv))
                                  .upload(Blocks.BARREL, "_open", this.modelCollector)
                            )
                      )
@@ -2179,8 +2203,8 @@
    ) {
       BlockStateVariant lv = BlockStateVariant.create().put(VariantSettings.MODEL, higherOrEqualModelId);
       BlockStateVariant lv2 = BlockStateVariant.create().put(VariantSettings.MODEL, lowerModelId);
-      return BlockStateVariantMap.create(property).register(comparable2 -> {
-         boolean bl = comparable2.compareTo(fence) >= 0;
+      return BlockStateVariantMap.create(property).register(value -> {
+         boolean bl = value.compareTo(fence) >= 0;
          return bl ? lv : lv2;
       });
    }
@@ -2213,10 +2237,10 @@
          Int2ObjectMap<Identifier> int2ObjectMap = new Int2ObjectOpenHashMap<>();
          BlockStateVariantMap lv = BlockStateVariantMap.create(ageProperty)
             .register(
-               integer -> {
-                  int i = ageTextureIndices[integer];
+               age -> {
+                  int i = ageTextureIndices[age];
                   Identifier lvx = int2ObjectMap.computeIfAbsent(
-                     i, (Int2ObjectFunction<? extends Identifier>)(j -> this.createSubModel(crop, "_stage" + i, Models.CROP, Texture::crop))
+                     i, (Int2ObjectFunction<? extends Identifier>)(key -> this.createSubModel(crop, "_stage" + i, Models.CROP, Texture::crop))
                   );
                   return BlockStateVariant.create().put(VariantSettings.MODEL, lvx);
                }
@@ -2368,7 +2392,7 @@
    private void registerCooker(Block cooker, TexturedModel.Factory modelFactory) {
       Identifier lv = modelFactory.upload(cooker, this.modelCollector);
       Identifier lv2 = Texture.getSubId(cooker, "_front_on");
-      Identifier lv3 = modelFactory.get(cooker).texture(arg2 -> arg2.put(TextureKey.FRONT, lv2)).upload(cooker, "_on", this.modelCollector);
+      Identifier lv3 = modelFactory.get(cooker).texture(texture -> texture.put(TextureKey.FRONT, lv2)).upload(cooker, "_on", this.modelCollector);
       this.blockStateCollector
          .accept(
             VariantsBlockStateSupplier.create(cooker)
@@ -2412,9 +2436,9 @@
    private void registerPottedAzaleaBush(Block block) {
       Identifier lv;
       if (block == Blocks.POTTED_FLOWERING_AZALEA_BUSH) {
-         lv = Models.f_cvgdtrqx.upload(block, Texture.m_nzbyyqjx(block), this.modelCollector);
+         lv = Models.TEMPLATE_POTTED_FLOWERING_AZALEA_BUSH.upload(block, Texture.pottedAzalea(block), this.modelCollector);
       } else {
-         lv = Models.TEMPLATE_POTTED_AZALEA_BUSH.upload(block, Texture.m_nzbyyqjx(block), this.modelCollector);
+         lv = Models.TEMPLATE_POTTED_AZALEA_BUSH.upload(block, Texture.pottedAzalea(block), this.modelCollector);
       }
 
       this.blockStateCollector.accept(createSingletonBlockState(block, lv));
@@ -2743,9 +2767,9 @@
 
    /**
     * @mapping {@literal hashed m_jzrspkqa Lnet/minecraft/unmapped/C_ysvjbfkt;m_jzrspkqa(Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
-    * @mapping {@literal named m_jzrspkqa Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_jzrspkqa(Lnet/minecraft/block/Block;)V}
+    * @mapping {@literal named registerCube Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerCube(Lnet/minecraft/block/Block;)V}
     */
-   public void m_jzrspkqa(Block block) {
+   public void registerCube(Block block) {
       Texture lv = new Texture()
          .put(TextureKey.PARTICLE, Texture.getSubId(block, "_particle"))
          .put(TextureKey.DOWN, Texture.getSubId(block, "_down"))
@@ -2872,15 +2896,16 @@
    private void registerChorusFlower() {
       Texture lv = Texture.texture(Blocks.CHORUS_FLOWER);
       Identifier lv2 = Models.TEMPLATE_CHORUS_FLOWER.upload(Blocks.CHORUS_FLOWER, lv, this.modelCollector);
-      Identifier lv3 = this.createSubModel(Blocks.CHORUS_FLOWER, "_dead", Models.TEMPLATE_CHORUS_FLOWER, arg2 -> lv.copyAndAdd(TextureKey.TEXTURE, arg2));
+      Identifier lv3 = this.createSubModel(Blocks.CHORUS_FLOWER, "_dead", Models.TEMPLATE_CHORUS_FLOWER, id -> lv.copyAndAdd(TextureKey.TEXTURE, id));
       this.blockStateCollector
          .accept(VariantsBlockStateSupplier.create(Blocks.CHORUS_FLOWER).coordinate(createValueFencedModelMap(Properties.AGE_5, 5, lv3, lv2)));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vgjywrmr Lnet/minecraft/unmapped/C_ysvjbfkt;m_vgjywrmr()V}
+    * @mapping {@literal named registerCrafter Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerCrafter()V}
     */
-   private void m_vgjywrmr() {
+   private void registerCrafter() {
       Identifier lv = ModelIds.getBlockModelId(Blocks.CRAFTER);
       Identifier lv2 = ModelIds.getBlockSubModelId(Blocks.CRAFTER, "_triggered");
       Identifier lv3 = ModelIds.getBlockSubModelId(Blocks.CRAFTER, "_crafting");
@@ -2889,10 +2914,11 @@
          .accept(
             VariantsBlockStateSupplier.create(Blocks.CRAFTER)
                .coordinate(
-                  BlockStateVariantMap.create(Properties.ORIENTATION).register(arg -> this.addJigsawOrientationToVariant(arg, BlockStateVariant.create()))
+                  BlockStateVariantMap.create(Properties.ORIENTATION)
+                     .register(orientation -> this.addJigsawOrientationToVariant(orientation, BlockStateVariant.create()))
                )
                .coordinate(
-                  BlockStateVariantMap.create(Properties.TRIGGERED, C_dmnruvyr.f_vffbqbgm)
+                  BlockStateVariantMap.create(Properties.TRIGGERED, Crafter.f_vffbqbgm)
                      .register(false, false, BlockStateVariant.create().put(VariantSettings.MODEL, lv))
                      .register(true, true, BlockStateVariant.create().put(VariantSettings.MODEL, lv4))
                      .register(true, false, BlockStateVariant.create().put(VariantSettings.MODEL, lv2))
@@ -3156,42 +3182,43 @@
 
    /**
     * @mapping {@literal hashed m_dnjqhzou Lnet/minecraft/unmapped/C_ysvjbfkt;m_dnjqhzou(Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
-    * @mapping {@literal named m_dnjqhzou Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_dnjqhzou(Lnet/minecraft/block/Block;)V}
+    * @mapping {@literal named registerCopperBulb Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerCopperBulb(Lnet/minecraft/block/Block;)V}
     */
-   private void m_dnjqhzou(Block block) {
-      Identifier lv = Models.CUBE_ALL.upload(block, Texture.all(block), this.modelCollector);
-      Identifier lv2 = this.createSubModel(block, "_powered", Models.CUBE_ALL, Texture::all);
-      Identifier lv3 = this.createSubModel(block, "_lit", Models.CUBE_ALL, Texture::all);
-      Identifier lv4 = this.createSubModel(block, "_lit_powered", Models.CUBE_ALL, Texture::all);
-      this.blockStateCollector.accept(this.m_ibtoybri(block, lv, lv3, lv2, lv4));
+   private void registerCopperBulb(Block bulb) {
+      Identifier lv = Models.CUBE_ALL.upload(bulb, Texture.all(bulb), this.modelCollector);
+      Identifier lv2 = this.createSubModel(bulb, "_powered", Models.CUBE_ALL, Texture::all);
+      Identifier lv3 = this.createSubModel(bulb, "_lit", Models.CUBE_ALL, Texture::all);
+      Identifier lv4 = this.createSubModel(bulb, "_lit_powered", Models.CUBE_ALL, Texture::all);
+      this.blockStateCollector.accept(this.createCopperBulbBlockState(bulb, lv, lv3, lv2, lv4));
    }
 
    /**
     * @mapping {@literal hashed m_ibtoybri Lnet/minecraft/unmapped/C_ysvjbfkt;m_ibtoybri(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wqokohwr;}
-    * @mapping {@literal named m_ibtoybri Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_ibtoybri(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
+    * @mapping {@literal named createCopperBulbBlockState Lnet/minecraft/data/client/model/BlockStateModelGenerator;createCopperBulbBlockState(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
     */
-   private BlockStateSupplier m_ibtoybri(Block block, Identifier arg2, Identifier arg3, Identifier arg4, Identifier arg5) {
+   private BlockStateSupplier createCopperBulbBlockState(Block block, Identifier base, Identifier lit, Identifier powered, Identifier litAndPowered) {
       return VariantsBlockStateSupplier.create(block)
          .coordinate(
             BlockStateVariantMap.create(Properties.LIT, Properties.POWERED)
                .register(
-                  (arg5x, arg6) -> arg5x
-                        ? BlockStateVariant.create().put(VariantSettings.MODEL, arg6 ? arg5 : arg3)
-                        : BlockStateVariant.create().put(VariantSettings.MODEL, arg6 ? arg4 : arg2)
+                  (litx, poweredx) -> litx
+                        ? BlockStateVariant.create().put(VariantSettings.MODEL, poweredx ? litAndPowered : lit)
+                        : BlockStateVariant.create().put(VariantSettings.MODEL, poweredx ? powered : base)
                )
          );
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hjdevwtp Lnet/minecraft/unmapped/C_ysvjbfkt;m_hjdevwtp(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
+    * @mapping {@literal named registerWaxedCopperBulb Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerWaxedCopperBulb(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V}
     */
-   private void m_hjdevwtp(Block arg, Block arg2) {
-      Identifier lv = ModelIds.getBlockModelId(arg);
-      Identifier lv2 = ModelIds.getBlockSubModelId(arg, "_powered");
-      Identifier lv3 = ModelIds.getBlockSubModelId(arg, "_lit");
-      Identifier lv4 = ModelIds.getBlockSubModelId(arg, "_lit_powered");
-      this.registerParentedItemModel(arg2, ModelIds.getItemModelId(arg.asItem()));
-      this.blockStateCollector.accept(this.m_ibtoybri(arg2, lv, lv3, lv2, lv4));
+   private void registerWaxedCopperBulb(Block bulb, Block waxedBulb) {
+      Identifier lv = ModelIds.getBlockModelId(bulb);
+      Identifier lv2 = ModelIds.getBlockSubModelId(bulb, "_powered");
+      Identifier lv3 = ModelIds.getBlockSubModelId(bulb, "_lit");
+      Identifier lv4 = ModelIds.getBlockSubModelId(bulb, "_lit_powered");
+      this.registerParentedItemModel(waxedBulb, ModelIds.getItemModelId(bulb.asItem()));
+      this.blockStateCollector.accept(this.createCopperBulbBlockState(waxedBulb, lv, lv3, lv2, lv4));
    }
 
    /**
@@ -3373,7 +3400,7 @@
     */
    private static List<BlockStateVariant> buildBlockStateVariants(List<Identifier> modelIds, UnaryOperator<BlockStateVariant> processor) {
       return (List<BlockStateVariant>)modelIds.stream()
-         .map(arg -> BlockStateVariant.create().put(VariantSettings.MODEL, arg))
+         .map(id -> BlockStateVariant.create().put(VariantSettings.MODEL, id))
          .map(processor)
          .collect(Collectors.toList());
    }
@@ -3395,21 +3422,21 @@
       this.blockStateCollector
          .accept(
             MultipartBlockStateSupplier.create(Blocks.FIRE)
-               .with(lv, buildBlockStateVariants(list, arg -> arg))
-               .with(When.anyOf(When.create().set(Properties.NORTH, true), lv), buildBlockStateVariants(list2, arg -> arg))
+               .with(lv, buildBlockStateVariants(list, variant -> variant))
+               .with(When.anyOf(When.create().set(Properties.NORTH, true), lv), buildBlockStateVariants(list2, variant -> variant))
                .with(
                   When.anyOf(When.create().set(Properties.EAST, true), lv),
-                  buildBlockStateVariants(list2, arg -> arg.put(VariantSettings.Y, VariantSettings.Rotation.R90))
+                  buildBlockStateVariants(list2, variant -> variant.put(VariantSettings.Y, VariantSettings.Rotation.R90))
                )
                .with(
                   When.anyOf(When.create().set(Properties.SOUTH, true), lv),
-                  buildBlockStateVariants(list2, arg -> arg.put(VariantSettings.Y, VariantSettings.Rotation.R180))
+                  buildBlockStateVariants(list2, variant -> variant.put(VariantSettings.Y, VariantSettings.Rotation.R180))
                )
                .with(
                   When.anyOf(When.create().set(Properties.WEST, true), lv),
-                  buildBlockStateVariants(list2, arg -> arg.put(VariantSettings.Y, VariantSettings.Rotation.R270))
+                  buildBlockStateVariants(list2, variant -> variant.put(VariantSettings.Y, VariantSettings.Rotation.R270))
                )
-               .with(When.create().set(Properties.UP, true), buildBlockStateVariants(list3, arg -> arg))
+               .with(When.create().set(Properties.UP, true), buildBlockStateVariants(list3, variant -> variant))
          );
    }
 
@@ -3423,11 +3450,11 @@
       this.blockStateCollector
          .accept(
             MultipartBlockStateSupplier.create(Blocks.SOUL_FIRE)
-               .with(buildBlockStateVariants(list, arg -> arg))
-               .with(buildBlockStateVariants(list2, arg -> arg))
-               .with(buildBlockStateVariants(list2, arg -> arg.put(VariantSettings.Y, VariantSettings.Rotation.R90)))
-               .with(buildBlockStateVariants(list2, arg -> arg.put(VariantSettings.Y, VariantSettings.Rotation.R180)))
-               .with(buildBlockStateVariants(list2, arg -> arg.put(VariantSettings.Y, VariantSettings.Rotation.R270)))
+               .with(buildBlockStateVariants(list, variant -> variant))
+               .with(buildBlockStateVariants(list2, variant -> variant))
+               .with(buildBlockStateVariants(list2, variant -> variant.put(VariantSettings.Y, VariantSettings.Rotation.R90)))
+               .with(buildBlockStateVariants(list2, variant -> variant.put(VariantSettings.Y, VariantSettings.Rotation.R180)))
+               .with(buildBlockStateVariants(list2, variant -> variant.put(VariantSettings.Y, VariantSettings.Rotation.R270)))
          );
    }
 
@@ -3443,18 +3470,20 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mkszkjye Lnet/minecraft/unmapped/C_ysvjbfkt;m_mkszkjye()V}
+    * @mapping {@literal named registerMuddyMangroveRoots Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerMuddyMangroveRoots()V}
     */
-   private void m_mkszkjye() {
+   private void registerMuddyMangroveRoots() {
       Texture lv = Texture.sideEnd(Texture.getSubId(Blocks.MUDDY_MANGROVE_ROOTS, "_side"), Texture.getSubId(Blocks.MUDDY_MANGROVE_ROOTS, "_top"));
       Identifier lv2 = Models.CUBE_COLUMN.upload(Blocks.MUDDY_MANGROVE_ROOTS, lv, this.modelCollector);
       this.blockStateCollector.accept(createAxisRotatedBlockState(Blocks.MUDDY_MANGROVE_ROOTS, lv2));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zutsvuwn Lnet/minecraft/unmapped/C_ysvjbfkt;m_zutsvuwn()V}
+    * @mapping {@literal named registerMangrovePropagule Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerMangrovePropagule()V}
     */
-   private void m_zutsvuwn() {
+   private void registerMangrovePropagule() {
       this.registerItemModel(Items.f_mqfklpco);
       Block lv = Blocks.MANGROVE_PROPAGULE;
       BlockStateVariantMap.DoubleProperty<Boolean, Integer> lv2 = BlockStateVariantMap.create(MangrovePropaguleBlock.HANGING, MangrovePropaguleBlock.AGE_4);
@@ -3511,12 +3540,12 @@
       this.registerTopSoil(Blocks.GRASS_BLOCK, ModelIds.getBlockModelId(Blocks.GRASS_BLOCK), lv3);
       Identifier lv4 = TexturedModel.CUBE_BOTTOM_TOP
          .get(Blocks.MYCELIUM)
-         .texture(arg2 -> arg2.put(TextureKey.BOTTOM, lv))
+         .texture(texture -> texture.put(TextureKey.BOTTOM, lv))
          .upload(Blocks.MYCELIUM, this.modelCollector);
       this.registerTopSoil(Blocks.MYCELIUM, lv4, lv3);
       Identifier lv5 = TexturedModel.CUBE_BOTTOM_TOP
          .get(Blocks.PODZOL)
-         .texture(arg2 -> arg2.put(TextureKey.BOTTOM, lv))
+         .texture(texture -> texture.put(TextureKey.BOTTOM, lv))
          .upload(Blocks.PODZOL, this.modelCollector);
       this.registerTopSoil(Blocks.PODZOL, lv5, lv3);
    }
@@ -3731,9 +3760,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_juiovgan Lnet/minecraft/unmapped/C_ysvjbfkt;m_juiovgan()V}
+    * @mapping {@literal named registerFrogspawn Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerFrogspawn()V}
     */
-   private void m_juiovgan() {
+   private void registerFrogspawn() {
       this.registerItemModel(Blocks.FROGSPAWN);
       this.blockStateCollector.accept(createSingletonBlockState(Blocks.FROGSPAWN, ModelIds.getBlockModelId(Blocks.FROGSPAWN)));
    }
@@ -3923,17 +3953,18 @@
                .coordinate(
                   BlockStateVariantMap.create(Properties.SCULK_SENSOR_PHASE)
                      .register(
-                        arg3 -> BlockStateVariant.create()
-                              .put(VariantSettings.MODEL, arg3 != SculkSensorPhase.ACTIVE && arg3 != SculkSensorPhase.COOLDOWN ? lv : lv2)
+                        phase -> BlockStateVariant.create()
+                              .put(VariantSettings.MODEL, phase != SculkSensorPhase.ACTIVE && phase != SculkSensorPhase.COOLDOWN ? lv : lv2)
                      )
                )
          );
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_odanwlbt Lnet/minecraft/unmapped/C_ysvjbfkt;m_odanwlbt()V}
+    * @mapping {@literal named registerCalibratedSculkSensor Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerCalibratedSculkSensor()V}
     */
-   private void m_odanwlbt() {
+   private void registerCalibratedSculkSensor() {
       Identifier lv = ModelIds.getBlockSubModelId(Blocks.CALIBRATED_SCULK_SENSOR, "_inactive");
       Identifier lv2 = ModelIds.getBlockSubModelId(Blocks.CALIBRATED_SCULK_SENSOR, "_active");
       this.registerParentedItemModel(Blocks.CALIBRATED_SCULK_SENSOR, lv);
@@ -3943,8 +3974,8 @@
                .coordinate(
                   BlockStateVariantMap.create(Properties.SCULK_SENSOR_PHASE)
                      .register(
-                        arg3 -> BlockStateVariant.create()
-                              .put(VariantSettings.MODEL, arg3 != SculkSensorPhase.ACTIVE && arg3 != SculkSensorPhase.COOLDOWN ? lv : lv2)
+                        phase -> BlockStateVariant.create()
+                              .put(VariantSettings.MODEL, phase != SculkSensorPhase.ACTIVE && phase != SculkSensorPhase.COOLDOWN ? lv : lv2)
                      )
                )
                .coordinate(createNorthDefaultHorizontalRotationStates())
@@ -3952,11 +3983,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xghzmykj Lnet/minecraft/unmapped/C_ysvjbfkt;m_xghzmykj()V}
+    * @mapping {@literal named registerSculkShrieker Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerSculkShrieker()V}
     */
-   private void m_xghzmykj() {
-      Identifier lv = Models.TEMPLATE_SCULK_SHRIEKER.upload(Blocks.SCULK_SHRIEKER, Texture.m_esmayivc(false), this.modelCollector);
-      Identifier lv2 = Models.TEMPLATE_SCULK_SHRIEKER.upload(Blocks.SCULK_SHRIEKER, "_can_summon", Texture.m_esmayivc(true), this.modelCollector);
+   private void registerSculkShrieker() {
+      Identifier lv = Models.TEMPLATE_SCULK_SHRIEKER.upload(Blocks.SCULK_SHRIEKER, Texture.sculkShrieker(false), this.modelCollector);
+      Identifier lv2 = Models.TEMPLATE_SCULK_SHRIEKER.upload(Blocks.SCULK_SHRIEKER, "_can_summon", Texture.sculkShrieker(true), this.modelCollector);
       this.registerParentedItemModel(Blocks.SCULK_SHRIEKER, lv);
       this.blockStateCollector
          .accept(VariantsBlockStateSupplier.create(Blocks.SCULK_SHRIEKER).coordinate(createBooleanModelMap(Properties.CAN_SUMMON, lv2, lv)));
@@ -4046,14 +4078,14 @@
       this.blockStateCollector
          .accept(
             VariantsBlockStateSupplier.create(Blocks.REPEATER)
-               .coordinate(BlockStateVariantMap.create(Properties.DELAY, Properties.LOCKED, Properties.POWERED).register((integer, arg, arg2) -> {
+               .coordinate(BlockStateVariantMap.create(Properties.DELAY, Properties.LOCKED, Properties.POWERED).register((delay, locked, powered) -> {
                   StringBuilder stringBuilder = new StringBuilder();
-                  stringBuilder.append('_').append(integer).append("tick");
-                  if (arg2) {
+                  stringBuilder.append('_').append(delay).append("tick");
+                  if (powered) {
                      stringBuilder.append("_on");
                   }
          
-                  if (arg) {
+                  if (locked) {
                      stringBuilder.append("_locked");
                   }
          
@@ -4113,8 +4145,8 @@
                .coordinate(
                   BlockStateVariantMap.create(Properties.LAYERS)
                      .register(
-                        integer -> BlockStateVariant.create()
-                              .put(VariantSettings.MODEL, integer < 8 ? ModelIds.getBlockSubModelId(Blocks.SNOW, "_height" + integer * 2) : lv2)
+                        layers -> BlockStateVariant.create()
+                              .put(VariantSettings.MODEL, layers < 8 ? ModelIds.getBlockSubModelId(Blocks.SNOW, "_height" + layers * 2) : lv2)
                      )
                )
          );
@@ -4149,8 +4181,8 @@
                .coordinate(
                   BlockStateVariantMap.create(Properties.STRUCTURE_BLOCK_MODE)
                      .register(
-                        arg -> BlockStateVariant.create()
-                              .put(VariantSettings.MODEL, this.createSubModel(Blocks.STRUCTURE_BLOCK, "_" + arg.asString(), Models.CUBE_ALL, Texture::all))
+                        mode -> BlockStateVariant.create()
+                              .put(VariantSettings.MODEL, this.createSubModel(Blocks.STRUCTURE_BLOCK, "_" + mode.asString(), Models.CUBE_ALL, Texture::all))
                      )
                )
          );
@@ -4168,8 +4200,8 @@
                .coordinate(
                   BlockStateVariantMap.create(Properties.AGE_3)
                      .register(
-                        integer -> BlockStateVariant.create()
-                              .put(VariantSettings.MODEL, this.createSubModel(Blocks.SWEET_BERRY_BUSH, "_stage" + integer, Models.CROSS, Texture::cross))
+                        age -> BlockStateVariant.create()
+                              .put(VariantSettings.MODEL, this.createSubModel(Blocks.SWEET_BERRY_BUSH, "_stage" + age, Models.CROSS, Texture::cross))
                      )
                )
          );
@@ -4498,8 +4530,8 @@
                .coordinate(
                   BlockStateVariantMap.create(Properties.ATTACHED, Properties.POWERED)
                      .register(
-                        (arg, arg2) -> BlockStateVariant.create()
-                              .put(VariantSettings.MODEL, Texture.getSubId(Blocks.TRIPWIRE_HOOK, (arg ? "_attached" : "") + (arg2 ? "_on" : "")))
+                        (attached, powered) -> BlockStateVariant.create()
+                              .put(VariantSettings.MODEL, Texture.getSubId(Blocks.TRIPWIRE_HOOK, (attached ? "_attached" : "") + (powered ? "_on" : "")))
                      )
                )
                .coordinate(createNorthDefaultHorizontalRotationStates())
@@ -4555,25 +4587,24 @@
             VariantsBlockStateSupplier.create(Blocks.TURTLE_EGG)
                .coordinate(
                   BlockStateVariantMap.create(Properties.EGGS, Properties.HATCH)
-                     .registerVariants(
-                        (integer, integer2) -> Arrays.asList(createModelVariantWithRandomHorizontalRotations(this.getTurtleEggModel(integer, integer2)))
-                     )
+                     .registerVariants((eggs, hatch) -> Arrays.asList(createModelVariantWithRandomHorizontalRotations(this.getTurtleEggModel(eggs, hatch))))
                )
          );
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ngiuljtx Lnet/minecraft/unmapped/C_ysvjbfkt;m_ngiuljtx()V}
+    * @mapping {@literal named registerSnifferEgg Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerSnifferEgg()V}
     */
-   private void m_ngiuljtx() {
+   private void registerSnifferEgg() {
       this.registerItemModel(Items.f_dxsnwedf);
-      Function<Integer, Identifier> function = integer -> {
-         String string = switch (integer) {
+      Function<Integer, Identifier> function = hatch -> {
+         String string = switch (hatch) {
             case 1 -> "_slightly_cracked";
             case 2 -> "_very_cracked";
             default -> "_not_cracked";
          };
-         Texture lv = Texture.m_wmodlmje(string);
+         Texture lv = Texture.snifferEgg(string);
          return Models.SNIFFER_EGG.upload(Blocks.SNIFFER_EGG, string, lv, this.modelCollector);
       };
       this.blockStateCollector
@@ -4581,7 +4612,7 @@
             VariantsBlockStateSupplier.create(Blocks.SNIFFER_EGG)
                .coordinate(
                   BlockStateVariantMap.create(SnifferEggBlock.HATCH)
-                     .register(integer -> BlockStateVariant.create().put(VariantSettings.MODEL, (Identifier)function.apply(integer)))
+                     .register(hatch -> BlockStateVariant.create().put(VariantSettings.MODEL, (Identifier)function.apply(hatch)))
                )
          );
    }
@@ -4613,9 +4644,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vxaizyos Lnet/minecraft/unmapped/C_ysvjbfkt;m_vxaizyos()V}
+    * @mapping {@literal named registerSculkCatalyst Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerSculkCatalyst()V}
     */
-   private void m_vxaizyos() {
+   private void registerSculkCatalyst() {
       Identifier lv = Texture.getSubId(Blocks.SCULK_CATALYST, "_bottom");
       Texture lv2 = new Texture()
          .put(TextureKey.BOTTOM, lv)
@@ -4631,16 +4663,17 @@
          .accept(
             VariantsBlockStateSupplier.create(Blocks.SCULK_CATALYST)
                .coordinate(
-                  BlockStateVariantMap.create(Properties.BLOOM).register(arg3 -> BlockStateVariant.create().put(VariantSettings.MODEL, arg3 ? lv5 : lv4))
+                  BlockStateVariantMap.create(Properties.BLOOM).register(bloom -> BlockStateVariant.create().put(VariantSettings.MODEL, bloom ? lv5 : lv4))
                )
          );
       this.registerParentedItemModel(Items.f_qlkldakz, lv4);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pufbzbcu Lnet/minecraft/unmapped/C_ysvjbfkt;m_pufbzbcu()V}

The diff for this file is not complete!

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (3/3): 
Continuation of the last diff...
+    * @mapping {@literal named registerChiseledBookshelf Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerChiseledBookshelf()V}
     */
-   private void m_pufbzbcu() {
+   private void registerChiseledBookshelf() {
       Block lv = Blocks.CHISELED_BOOKSHELF;
       Identifier lv2 = ModelIds.getBlockModelId(lv);
       MultipartBlockStateSupplier lv3 = MultipartBlockStateSupplier.create(lv);
@@ -4654,20 +4687,23 @@
             Direction.WEST,
             VariantSettings.Rotation.R270
          )
-         .forEach((direction, arg4) -> {
+         .forEach((direction, rotation) -> {
             When.PropertyCondition lvx = When.create().set(Properties.HORIZONTAL_FACING, direction);
-            lv3.with(lvx, BlockStateVariant.create().put(VariantSettings.MODEL, lv2).put(VariantSettings.Y, arg4).put(VariantSettings.UVLOCK, true));
-            this.m_zoxlycaq(lv3, lvx, arg4);
+            lv3.with(lvx, BlockStateVariant.create().put(VariantSettings.MODEL, lv2).put(VariantSettings.Y, rotation).put(VariantSettings.UVLOCK, true));
+            this.addSlotStateAndRotationVariants(lv3, lvx, rotation);
          });
       this.blockStateCollector.accept(lv3);
       this.registerParentedItemModel(lv, ModelIds.getBlockSubModelId(lv, "_inventory"));
-      f_brxmxele.clear();
+      CHISELED_BOOKSHELF_SLOT_MODEL_CACHE.clear();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zoxlycaq Lnet/minecraft/unmapped/C_ysvjbfkt;m_zoxlycaq(Lnet/minecraft/unmapped/C_xsihzhnp;Lnet/minecraft/unmapped/C_javqjqhm$C_gdifjgob;Lnet/minecraft/unmapped/C_nhjtezea$C_gkuxgtdu;)V}
+    * @mapping {@literal named addSlotStateAndRotationVariants Lnet/minecraft/data/client/model/BlockStateModelGenerator;addSlotStateAndRotationVariants(Lnet/minecraft/data/client/model/MultipartBlockStateSupplier;Lnet/minecraft/data/client/model/When$PropertyCondition;Lnet/minecraft/data/client/model/VariantSettings$Rotation;)V}
     */
-   private void m_zoxlycaq(MultipartBlockStateSupplier arg, When.PropertyCondition arg2, VariantSettings.Rotation arg3) {
+   private void addSlotStateAndRotationVariants(
+      MultipartBlockStateSupplier stateSupplier, When.PropertyCondition facingCondition, VariantSettings.Rotation rotation
+   ) {
       List.of(
             Pair.of(Properties.SLOT_0_OCCUPIED, Models.TEMPLATE_CHISELED_BOOKSHELF_SLOT_TOP_LEFT),
             Pair.of(Properties.SLOT_1_OCCUPIED, Models.TEMPLATE_CHISELED_BOOKSHELF_SLOT_TOP_MID),
@@ -4679,22 +4715,33 @@
          .forEach(pair -> {
             BooleanProperty lv = (BooleanProperty)pair.getFirst();
             Model lv2 = (Model)pair.getSecond();
-            this.m_hcupecjt(arg, arg2, arg3, lv, lv2, true);
-            this.m_hcupecjt(arg, arg2, arg3, lv, lv2, false);
+            this.addBookSlotModel(stateSupplier, facingCondition, rotation, lv, lv2, true);
+            this.addBookSlotModel(stateSupplier, facingCondition, rotation, lv, lv2, false);
          });
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hcupecjt Lnet/minecraft/unmapped/C_ysvjbfkt;m_hcupecjt(Lnet/minecraft/unmapped/C_xsihzhnp;Lnet/minecraft/unmapped/C_javqjqhm$C_gdifjgob;Lnet/minecraft/unmapped/C_nhjtezea$C_gkuxgtdu;Lnet/minecraft/unmapped/C_xhwijdsd;Lnet/minecraft/unmapped/C_zppcsbsk;Z)V}
+    * @mapping {@literal named addBookSlotModel Lnet/minecraft/data/client/model/BlockStateModelGenerator;addBookSlotModel(Lnet/minecraft/data/client/model/MultipartBlockStateSupplier;Lnet/minecraft/data/client/model/When$PropertyCondition;Lnet/minecraft/data/client/model/VariantSettings$Rotation;Lnet/minecraft/state/property/BooleanProperty;Lnet/minecraft/data/client/model/Model;Z)V}
     */
-   private void m_hcupecjt(
-      MultipartBlockStateSupplier arg, When.PropertyCondition arg2, VariantSettings.Rotation arg3, BooleanProperty arg4, Model arg5, boolean bl
+   private void addBookSlotModel(
+      MultipartBlockStateSupplier stateSupplier,
+      When.PropertyCondition facingCondition,
+      VariantSettings.Rotation rotation,
+      BooleanProperty occupiedProperty,
+      Model model,
+      boolean occupied
    ) {
-      String string = bl ? "_occupied" : "_empty";
+      String string = occupied ? "_occupied" : "_empty";
       Texture lv = new Texture().put(TextureKey.TEXTURE, Texture.getSubId(Blocks.CHISELED_BOOKSHELF, string));
-      BlockStateModelGenerator.C_jhuevbcm lv2 = new BlockStateModelGenerator.C_jhuevbcm(arg5, string);
-      Identifier lv3 = (Identifier)f_brxmxele.computeIfAbsent(lv2, arg3x -> arg5.upload(Blocks.CHISELED_BOOKSHELF, string, lv, this.modelCollector));
-      arg.with(When.allOf(arg2, When.create().set(arg4, bl)), BlockStateVariant.create().put(VariantSettings.MODEL, lv3).put(VariantSettings.Y, arg3));
+      BlockStateModelGenerator.BookSlotModelCacheKey lv2 = new BlockStateModelGenerator.BookSlotModelCacheKey(model, string);
+      Identifier lv3 = (Identifier)CHISELED_BOOKSHELF_SLOT_MODEL_CACHE.computeIfAbsent(
+         lv2, arg3 -> model.upload(Blocks.CHISELED_BOOKSHELF, string, lv, this.modelCollector)
+      );
+      stateSupplier.with(
+         When.allOf(facingCondition, When.create().set(occupiedProperty, occupied)),
+         BlockStateVariant.create().put(VariantSettings.MODEL, lv3).put(VariantSettings.Y, rotation)
+      );
    }
 
    /**
@@ -4792,7 +4839,7 @@
          .accept(
             VariantsBlockStateSupplier.create(Blocks.RESPAWN_ANCHOR)
                .coordinate(
-                  BlockStateVariantMap.create(Properties.CHARGES).register(integer -> BlockStateVariant.create().put(VariantSettings.MODEL, lvs[integer]))
+                  BlockStateVariantMap.create(Properties.CHARGES).register(charges -> BlockStateVariant.create().put(VariantSettings.MODEL, lvs[charges]))
                )
          );
       this.registerParentedItemModel(Items.f_qywvykbu, lvs[0]);
@@ -4855,7 +4902,8 @@
          .accept(
             VariantsBlockStateSupplier.create(Blocks.JIGSAW, BlockStateVariant.create().put(VariantSettings.MODEL, lv6))
                .coordinate(
-                  BlockStateVariantMap.create(Properties.ORIENTATION).register(arg -> this.addJigsawOrientationToVariant(arg, BlockStateVariant.create()))
+                  BlockStateVariantMap.create(Properties.ORIENTATION)
+                     .register(orientation -> this.addJigsawOrientationToVariant(orientation, BlockStateVariant.create()))
                )
          );
    }
@@ -4881,35 +4929,35 @@
    public void register() {
       BlockFamilies.getFamilies()
          .filter(BlockFamily::shouldGenerateModels)
-         .forEach(arg -> this.registerCubeAllModelTexturePool(arg.getBaseBlock()).family(arg));
+         .forEach(block -> this.registerCubeAllModelTexturePool(block.getBaseBlock()).family(block));
       this.registerCubeAllModelTexturePool(Blocks.CUT_COPPER)
          .family(BlockFamilies.CUT_COPPER)
-         .m_mmtayaup(Blocks.CUT_COPPER, Blocks.WAXED_CUT_COPPER)
-         .m_mmtayaup(Blocks.CHISELED_COPPER, Blocks.WAXED_CHISELED_COPPER)
+         .parented(Blocks.CUT_COPPER, Blocks.WAXED_CUT_COPPER)
+         .parented(Blocks.CHISELED_COPPER, Blocks.WAXED_CHISELED_COPPER)
          .family(BlockFamilies.WAXED_CUT_COPPER);
       this.registerCubeAllModelTexturePool(Blocks.EXPOSED_CUT_COPPER)
          .family(BlockFamilies.EXPOSED_CUT_COPPER)
-         .m_mmtayaup(Blocks.EXPOSED_CUT_COPPER, Blocks.WAXED_EXPOSED_CUT_COPPER)
-         .m_mmtayaup(Blocks.EXPOSED_CHISELED_COPPER, Blocks.WAXED_EXPOSED_CHISELED_COPPER)
+         .parented(Blocks.EXPOSED_CUT_COPPER, Blocks.WAXED_EXPOSED_CUT_COPPER)
+         .parented(Blocks.EXPOSED_CHISELED_COPPER, Blocks.WAXED_EXPOSED_CHISELED_COPPER)
          .family(BlockFamilies.WAXED_EXPOSED_CUT_COPPER);
       this.registerCubeAllModelTexturePool(Blocks.WEATHERED_CUT_COPPER)
          .family(BlockFamilies.WEATHERED_CUT_COPPER)
-         .m_mmtayaup(Blocks.WEATHERED_CUT_COPPER, Blocks.WAXED_WEATHERED_CUT_COPPER)
-         .m_mmtayaup(Blocks.WEATHERED_CHISELED_COPPER, Blocks.WAXED_WEATHERED_CHISELED_COPPER)
+         .parented(Blocks.WEATHERED_CUT_COPPER, Blocks.WAXED_WEATHERED_CUT_COPPER)
+         .parented(Blocks.WEATHERED_CHISELED_COPPER, Blocks.WAXED_WEATHERED_CHISELED_COPPER)
          .family(BlockFamilies.WAXED_WEATHERED_CUT_COPPER);
       this.registerCubeAllModelTexturePool(Blocks.OXIDIZED_CUT_COPPER)
          .family(BlockFamilies.OXIDIZED_CUT_COPPER)
-         .m_mmtayaup(Blocks.OXIDIZED_CUT_COPPER, Blocks.WAXED_OXIDIZED_CUT_COPPER)
-         .m_mmtayaup(Blocks.OXIDIZED_CHISELED_COPPER, Blocks.WAXED_OXIDIZED_CHISELED_COPPER)
+         .parented(Blocks.OXIDIZED_CUT_COPPER, Blocks.WAXED_OXIDIZED_CUT_COPPER)
+         .parented(Blocks.OXIDIZED_CHISELED_COPPER, Blocks.WAXED_OXIDIZED_CHISELED_COPPER)
          .family(BlockFamilies.WAXED_OXIDIZED_CUT_COPPER);
-      this.m_dnjqhzou(Blocks.COPPER_BULB);
-      this.m_dnjqhzou(Blocks.EXPOSED_COPPER_BULB);
-      this.m_dnjqhzou(Blocks.WEATHERED_COPPER_BULB);
-      this.m_dnjqhzou(Blocks.OXIDIZED_COPPER_BULB);
-      this.m_hjdevwtp(Blocks.COPPER_BULB, Blocks.WAXED_COPPER_BULB);
-      this.m_hjdevwtp(Blocks.EXPOSED_COPPER_BULB, Blocks.WAXED_EXPOSED_COPPER_BULB);
-      this.m_hjdevwtp(Blocks.WEATHERED_COPPER_BULB, Blocks.WAXED_WEATHERED_COPPER_BULB);
-      this.m_hjdevwtp(Blocks.OXIDIZED_COPPER_BULB, Blocks.WAXED_OXIDIZED_COPPER_BULB);
+      this.registerCopperBulb(Blocks.COPPER_BULB);
+      this.registerCopperBulb(Blocks.EXPOSED_COPPER_BULB);
+      this.registerCopperBulb(Blocks.WEATHERED_COPPER_BULB);
+      this.registerCopperBulb(Blocks.OXIDIZED_COPPER_BULB);
+      this.registerWaxedCopperBulb(Blocks.COPPER_BULB, Blocks.WAXED_COPPER_BULB);
+      this.registerWaxedCopperBulb(Blocks.EXPOSED_COPPER_BULB, Blocks.WAXED_EXPOSED_COPPER_BULB);
+      this.registerWaxedCopperBulb(Blocks.WEATHERED_COPPER_BULB, Blocks.WAXED_WEATHERED_COPPER_BULB);
+      this.registerWaxedCopperBulb(Blocks.OXIDIZED_COPPER_BULB, Blocks.WAXED_OXIDIZED_COPPER_BULB);
       this.registerSimpleState(Blocks.AIR);
       this.registerStateWithModelReference(Blocks.CAVE_AIR, Blocks.AIR);
       this.registerStateWithModelReference(Blocks.VOID_AIR, Blocks.AIR);
@@ -4953,7 +5001,7 @@
       this.registerPottedAzaleaBush(Blocks.POTTED_FLOWERING_AZALEA_BUSH);
       this.registerCaveVines();
       this.registerCarpet(Blocks.MOSS_BLOCK, Blocks.MOSS_CARPET);
-      this.m_rzwirmpw(Blocks.PINK_PETALS);
+      this.registerFlowerbed(Blocks.PINK_PETALS);
       this.registerBuiltinWithParticle(Blocks.BARRIER, Items.f_jedosiym);
       this.registerItemModel(Items.f_jedosiym);
       this.registerLightBlock();
@@ -5040,18 +5088,18 @@
       this.registerDoor(Blocks.EXPOSED_COPPER_DOOR);
       this.registerDoor(Blocks.WEATHERED_COPPER_DOOR);
       this.registerDoor(Blocks.OXIDIZED_COPPER_DOOR);
-      this.m_ewobmawf(Blocks.COPPER_DOOR, Blocks.WAXED_COPPER_DOOR);
-      this.m_ewobmawf(Blocks.EXPOSED_COPPER_DOOR, Blocks.WAXED_EXPOSED_COPPER_DOOR);
-      this.m_ewobmawf(Blocks.WEATHERED_COPPER_DOOR, Blocks.WAXED_WEATHERED_COPPER_DOOR);
-      this.m_ewobmawf(Blocks.OXIDIZED_COPPER_DOOR, Blocks.WAXED_OXIDIZED_COPPER_DOOR);
+      this.registerCopperDoor(Blocks.COPPER_DOOR, Blocks.WAXED_COPPER_DOOR);
+      this.registerCopperDoor(Blocks.EXPOSED_COPPER_DOOR, Blocks.WAXED_EXPOSED_COPPER_DOOR);
+      this.registerCopperDoor(Blocks.WEATHERED_COPPER_DOOR, Blocks.WAXED_WEATHERED_COPPER_DOOR);
+      this.registerCopperDoor(Blocks.OXIDIZED_COPPER_DOOR, Blocks.WAXED_OXIDIZED_COPPER_DOOR);
       this.registerTrapdoor(Blocks.COPPER_TRAPDOOR);
       this.registerTrapdoor(Blocks.EXPOSED_COPPER_TRAPDOOR);
       this.registerTrapdoor(Blocks.WEATHERED_COPPER_TRAPDOOR);
       this.registerTrapdoor(Blocks.OXIDIZED_COPPER_TRAPDOOR);
-      this.m_pxydxvus(Blocks.COPPER_TRAPDOOR, Blocks.WAXED_COPPER_TRAPDOOR);
-      this.m_pxydxvus(Blocks.EXPOSED_COPPER_TRAPDOOR, Blocks.WAXED_EXPOSED_COPPER_TRAPDOOR);
-      this.m_pxydxvus(Blocks.WEATHERED_COPPER_TRAPDOOR, Blocks.WAXED_WEATHERED_COPPER_TRAPDOOR);
-      this.m_pxydxvus(Blocks.OXIDIZED_COPPER_TRAPDOOR, Blocks.WAXED_OXIDIZED_COPPER_TRAPDOOR);
+      this.registerCopperTrapdoor(Blocks.COPPER_TRAPDOOR, Blocks.WAXED_COPPER_TRAPDOOR);
+      this.registerCopperTrapdoor(Blocks.EXPOSED_COPPER_TRAPDOOR, Blocks.WAXED_EXPOSED_COPPER_TRAPDOOR);
+      this.registerCopperTrapdoor(Blocks.WEATHERED_COPPER_TRAPDOOR, Blocks.WAXED_WEATHERED_COPPER_TRAPDOOR);
+      this.registerCopperTrapdoor(Blocks.OXIDIZED_COPPER_TRAPDOOR, Blocks.WAXED_OXIDIZED_COPPER_TRAPDOOR);
       this.registerSimpleCubeAll(Blocks.COPPER_GRATE);
       this.registerSimpleCubeAll(Blocks.EXPOSED_COPPER_GRATE);
       this.registerSimpleCubeAll(Blocks.WEATHERED_COPPER_GRATE);
@@ -5064,7 +5112,7 @@
       this.registerPressurePlate(Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE, Blocks.IRON_BLOCK);
       this.registerAmethysts();
       this.registerBookshelf();
-      this.m_pufbzbcu();
+      this.registerChiseledBookshelf();
       this.registerBrewingStand();
       this.registerCake();
       this.registerCampfire(Blocks.CAMPFIRE, Blocks.SOUL_CAMPFIRE);
@@ -5107,18 +5155,18 @@
       this.registerTripwire();
       this.registerTripwireHook();
       this.registerTurtleEgg();
-      this.m_ngiuljtx();
+      this.registerSnifferEgg();
       this.registerWallPlant(Blocks.VINE);
       this.registerWallPlant(Blocks.GLOW_LICHEN);
       this.registerWallPlant(Blocks.SCULK_VEIN);
       this.registerMagmaBlock();
       this.registerJigsaw();
       this.registerSculkSensor();
-      this.m_odanwlbt();
-      this.m_xghzmykj();
-      this.m_juiovgan();
-      this.m_zutsvuwn();
-      this.m_mkszkjye();
+      this.registerCalibratedSculkSensor();
+      this.registerSculkShrieker();
+      this.registerFrogspawn();
+      this.registerMangrovePropagule();
+      this.registerMuddyMangroveRoots();
       this.registerNorthDefaultHorizontalRotation(Blocks.LADDER);
       this.registerItemModel(Blocks.LADDER);
       this.registerNorthDefaultHorizontalRotation(Blocks.LECTERN);
@@ -5132,7 +5180,7 @@
       this.registerNetherrackBottomCustomTop(Blocks.WARPED_NYLIUM);
       this.registerFurnaceLikeOrientable(Blocks.DISPENSER);
       this.registerFurnaceLikeOrientable(Blocks.DROPPER);
-      this.m_vgjywrmr();
+      this.registerCrafter();
       this.registerLantern(Blocks.LANTERN);
       this.registerLantern(Blocks.SOUL_LANTERN);
       this.registerAxisRotated(Blocks.CHAIN, ModelIds.getBlockModelId(Blocks.CHAIN));
@@ -5143,8 +5191,8 @@
       this.registerRotatable(Blocks.DIRT);
       this.registerRotatable(Blocks.ROOTED_DIRT);
       this.registerRotatable(Blocks.SAND);
-      this.m_lhwwsxgs(Blocks.SUSPICIOUS_SAND);
-      this.m_lhwwsxgs(Blocks.SUSPICIOUS_GRAVEL);
+      this.registerDustable(Blocks.SUSPICIOUS_SAND);
+      this.registerDustable(Blocks.SUSPICIOUS_GRAVEL);
       this.registerRotatable(Blocks.RED_SAND);
       this.registerMirrorable(Blocks.BEDROCK);
       this.registerSingleton(Blocks.REINFORCED_DEEPSLATE, TexturedModel.CUBE_BOTTOM_TOP);
@@ -5163,9 +5211,9 @@
       this.registerCrop(Blocks.NETHER_WART, Properties.AGE_3, 0, 1, 1, 2);
       this.registerCrop(Blocks.POTATOES, Properties.AGE_7, 0, 0, 1, 1, 2, 2, 2, 3);
       this.registerCrop(Blocks.WHEAT, Properties.AGE_7, 0, 1, 2, 3, 4, 5, 6, 7);
-      this.m_vvrdgvwj(Blocks.TORCHFLOWER_CROP, BlockStateModelGenerator.TintType.NOT_TINTED, Properties.AGE_1, 0, 1);
-      this.m_oxrdxyqg();
-      this.m_mwtfkfoc();
+      this.registerTintableStagedCrossBlockState(Blocks.TORCHFLOWER_CROP, BlockStateModelGenerator.TintType.NOT_TINTED, Properties.AGE_1, 0, 1);
+      this.registerPitcherCrop();
+      this.registerPitcherPlant();
       this.registerBuiltin(ModelIds.getMinecraftNamespacedBlock("decorated_pot"), Blocks.TERRACOTTA).includeWithoutItem(Blocks.DECORATED_POT);
       this.registerBuiltin(ModelIds.getMinecraftNamespacedBlock("banner"), Blocks.OAK_PLANKS)
          .includeWithItem(
@@ -5493,56 +5541,56 @@
       this.registerGourd(Blocks.f_domkrbru, Blocks.f_ryluqxrm);
       this.registerLog(Blocks.MANGROVE_LOG).log(Blocks.MANGROVE_LOG).wood(Blocks.MANGROVE_WOOD);
       this.registerLog(Blocks.STRIPPED_MANGROVE_LOG).log(Blocks.STRIPPED_MANGROVE_LOG).wood(Blocks.STRIPPED_MANGROVE_WOOD);
-      this.m_zffcuixd(Blocks.STRIPPED_MANGROVE_LOG, Blocks.MANGROVE_HANGING_SIGN, Blocks.MANGROVE_WALL_HANGING_SIGN);
+      this.registerHangingSign(Blocks.STRIPPED_MANGROVE_LOG, Blocks.MANGROVE_HANGING_SIGN, Blocks.MANGROVE_WALL_HANGING_SIGN);
       this.registerSingleton(Blocks.MANGROVE_LEAVES, TexturedModel.LEAVES);
       this.registerLog(Blocks.ACACIA_LOG).log(Blocks.ACACIA_LOG).wood(Blocks.ACACIA_WOOD);
       this.registerLog(Blocks.STRIPPED_ACACIA_LOG).log(Blocks.STRIPPED_ACACIA_LOG).wood(Blocks.STRIPPED_ACACIA_WOOD);
-      this.m_zffcuixd(Blocks.STRIPPED_ACACIA_LOG, Blocks.ACACIA_HANGING_SIGN, Blocks.ACACIA_WALL_HANGING_SIGN);
+      this.registerHangingSign(Blocks.STRIPPED_ACACIA_LOG, Blocks.ACACIA_HANGING_SIGN, Blocks.ACACIA_WALL_HANGING_SIGN);
       this.registerFlowerPotPlant(Blocks.ACACIA_SAPLING, Blocks.POTTED_ACACIA_SAPLING, BlockStateModelGenerator.TintType.NOT_TINTED);
       this.registerSingleton(Blocks.ACACIA_LEAVES, TexturedModel.LEAVES);
-      this.registerLog(Blocks.CHERRY_LOG).m_jgmzdamz(Blocks.CHERRY_LOG).wood(Blocks.CHERRY_WOOD);
-      this.registerLog(Blocks.STRIPPED_CHERRY_LOG).m_jgmzdamz(Blocks.STRIPPED_CHERRY_LOG).wood(Blocks.STRIPPED_CHERRY_WOOD);
-      this.m_zffcuixd(Blocks.STRIPPED_CHERRY_LOG, Blocks.CHERRY_HANGING_SIGN, Blocks.CHERRY_WALL_HANGING_SIGN);
+      this.registerLog(Blocks.CHERRY_LOG).uvLockedLog(Blocks.CHERRY_LOG).wood(Blocks.CHERRY_WOOD);
+      this.registerLog(Blocks.STRIPPED_CHERRY_LOG).uvLockedLog(Blocks.STRIPPED_CHERRY_LOG).wood(Blocks.STRIPPED_CHERRY_WOOD);
+      this.registerHangingSign(Blocks.STRIPPED_CHERRY_LOG, Blocks.CHERRY_HANGING_SIGN, Blocks.CHERRY_WALL_HANGING_SIGN);
       this.registerFlowerPotPlant(Blocks.CHERRY_SAPLING, Blocks.POTTED_CHERRY_SAPLING, BlockStateModelGenerator.TintType.NOT_TINTED);
       this.registerSingleton(Blocks.CHERRY_LEAVES, TexturedModel.LEAVES);
       this.registerLog(Blocks.BIRCH_LOG).log(Blocks.BIRCH_LOG).wood(Blocks.BIRCH_WOOD);
       this.registerLog(Blocks.STRIPPED_BIRCH_LOG).log(Blocks.STRIPPED_BIRCH_LOG).wood(Blocks.STRIPPED_BIRCH_WOOD);
-      this.m_zffcuixd(Blocks.STRIPPED_BIRCH_LOG, Blocks.BIRCH_HANGING_SIGN, Blocks.BIRCH_WALL_HANGING_SIGN);
+      this.registerHangingSign(Blocks.STRIPPED_BIRCH_LOG, Blocks.BIRCH_HANGING_SIGN, Blocks.BIRCH_WALL_HANGING_SIGN);
       this.registerFlowerPotPlant(Blocks.BIRCH_SAPLING, Blocks.POTTED_BIRCH_SAPLING, BlockStateModelGenerator.TintType.NOT_TINTED);
       this.registerSingleton(Blocks.BIRCH_LEAVES, TexturedModel.LEAVES);
       this.registerLog(Blocks.OAK_LOG).log(Blocks.OAK_LOG).wood(Blocks.OAK_WOOD);
       this.registerLog(Blocks.STRIPPED_OAK_LOG).log(Blocks.STRIPPED_OAK_LOG).wood(Blocks.STRIPPED_OAK_WOOD);
-      this.m_zffcuixd(Blocks.STRIPPED_OAK_LOG, Blocks.OAK_HANGING_SIGN, Blocks.OAK_WALL_HANGING_SIGN);
+      this.registerHangingSign(Blocks.STRIPPED_OAK_LOG, Blocks.OAK_HANGING_SIGN, Blocks.OAK_WALL_HANGING_SIGN);
       this.registerFlowerPotPlant(Blocks.OAK_SAPLING, Blocks.POTTED_OAK_SAPLING, BlockStateModelGenerator.TintType.NOT_TINTED);
       this.registerSingleton(Blocks.OAK_LEAVES, TexturedModel.LEAVES);
       this.registerLog(Blocks.SPRUCE_LOG).log(Blocks.SPRUCE_LOG).wood(Blocks.SPRUCE_WOOD);
       this.registerLog(Blocks.STRIPPED_SPRUCE_LOG).log(Blocks.STRIPPED_SPRUCE_LOG).wood(Blocks.STRIPPED_SPRUCE_WOOD);
-      this.m_zffcuixd(Blocks.STRIPPED_SPRUCE_LOG, Blocks.SPRUCE_HANGING_SIGN, Blocks.SPRUCE_WALL_HANGING_SIGN);
+      this.registerHangingSign(Blocks.STRIPPED_SPRUCE_LOG, Blocks.SPRUCE_HANGING_SIGN, Blocks.SPRUCE_WALL_HANGING_SIGN);
       this.registerFlowerPotPlant(Blocks.SPRUCE_SAPLING, Blocks.POTTED_SPRUCE_SAPLING, BlockStateModelGenerator.TintType.NOT_TINTED);
       this.registerSingleton(Blocks.SPRUCE_LEAVES, TexturedModel.LEAVES);
       this.registerLog(Blocks.DARK_OAK_LOG).log(Blocks.DARK_OAK_LOG).wood(Blocks.DARK_OAK_WOOD);
       this.registerLog(Blocks.STRIPPED_DARK_OAK_LOG).log(Blocks.STRIPPED_DARK_OAK_LOG).wood(Blocks.STRIPPED_DARK_OAK_WOOD);
-      this.m_zffcuixd(Blocks.STRIPPED_DARK_OAK_LOG, Blocks.DARK_OAK_HANGING_SIGN, Blocks.DARK_OAK_WALL_HANGING_SIGN);
+      this.registerHangingSign(Blocks.STRIPPED_DARK_OAK_LOG, Blocks.DARK_OAK_HANGING_SIGN, Blocks.DARK_OAK_WALL_HANGING_SIGN);
       this.registerFlowerPotPlant(Blocks.DARK_OAK_SAPLING, Blocks.POTTED_DARK_OAK_SAPLING, BlockStateModelGenerator.TintType.NOT_TINTED);
       this.registerSingleton(Blocks.DARK_OAK_LEAVES, TexturedModel.LEAVES);
       this.registerLog(Blocks.JUNGLE_LOG).log(Blocks.JUNGLE_LOG).wood(Blocks.JUNGLE_WOOD);
       this.registerLog(Blocks.STRIPPED_JUNGLE_LOG).log(Blocks.STRIPPED_JUNGLE_LOG).wood(Blocks.STRIPPED_JUNGLE_WOOD);
-      this.m_zffcuixd(Blocks.STRIPPED_JUNGLE_LOG, Blocks.JUNGLE_HANGING_SIGN, Blocks.JUNGLE_WALL_HANGING_SIGN);
+      this.registerHangingSign(Blocks.STRIPPED_JUNGLE_LOG, Blocks.JUNGLE_HANGING_SIGN, Blocks.JUNGLE_WALL_HANGING_SIGN);
       this.registerFlowerPotPlant(Blocks.JUNGLE_SAPLING, Blocks.POTTED_JUNGLE_SAPLING, BlockStateModelGenerator.TintType.NOT_TINTED);
       this.registerSingleton(Blocks.JUNGLE_LEAVES, TexturedModel.LEAVES);
       this.registerLog(Blocks.CRIMSON_STEM).stem(Blocks.CRIMSON_STEM).wood(Blocks.CRIMSON_HYPHAE);
       this.registerLog(Blocks.STRIPPED_CRIMSON_STEM).stem(Blocks.STRIPPED_CRIMSON_STEM).wood(Blocks.STRIPPED_CRIMSON_HYPHAE);
-      this.m_zffcuixd(Blocks.STRIPPED_CRIMSON_STEM, Blocks.CRIMSON_HANGING_SIGN, Blocks.CRIMSON_WALL_HANGING_SIGN);
+      this.registerHangingSign(Blocks.STRIPPED_CRIMSON_STEM, Blocks.CRIMSON_HANGING_SIGN, Blocks.CRIMSON_WALL_HANGING_SIGN);
       this.registerFlowerPotPlant(Blocks.CRIMSON_FUNGUS, Blocks.POTTED_CRIMSON_FUNGUS, BlockStateModelGenerator.TintType.NOT_TINTED);
       this.registerRoots(Blocks.CRIMSON_ROOTS, Blocks.POTTED_CRIMSON_ROOTS);
       this.registerLog(Blocks.WARPED_STEM).stem(Blocks.WARPED_STEM).wood(Blocks.WARPED_HYPHAE);
       this.registerLog(Blocks.STRIPPED_WARPED_STEM).stem(Blocks.STRIPPED_WARPED_STEM).wood(Blocks.STRIPPED_WARPED_HYPHAE);
-      this.m_zffcuixd(Blocks.STRIPPED_WARPED_STEM, Blocks.WARPED_HANGING_SIGN, Blocks.WARPED_WALL_HANGING_SIGN);
+      this.registerHangingSign(Blocks.STRIPPED_WARPED_STEM, Blocks.WARPED_HANGING_SIGN, Blocks.WARPED_WALL_HANGING_SIGN);
       this.registerFlowerPotPlant(Blocks.WARPED_FUNGUS, Blocks.POTTED_WARPED_FUNGUS, BlockStateModelGenerator.TintType.NOT_TINTED);
       this.registerRoots(Blocks.WARPED_ROOTS, Blocks.POTTED_WARPED_ROOTS);
-      this.registerLog(Blocks.BAMBOO_BLOCK).m_jgmzdamz(Blocks.BAMBOO_BLOCK);
-      this.registerLog(Blocks.STRIPPED_BAMBOO_BLOCK).m_jgmzdamz(Blocks.STRIPPED_BAMBOO_BLOCK);
-      this.m_zffcuixd(Blocks.BAMBOO_PLANKS, Blocks.BAMBOO_HANGING_SIGN, Blocks.BAMBOO_WALL_HANGING_SIGN);
+      this.registerLog(Blocks.BAMBOO_BLOCK).uvLockedLog(Blocks.BAMBOO_BLOCK);
+      this.registerLog(Blocks.STRIPPED_BAMBOO_BLOCK).uvLockedLog(Blocks.STRIPPED_BAMBOO_BLOCK);
+      this.registerHangingSign(Blocks.BAMBOO_PLANKS, Blocks.BAMBOO_HANGING_SIGN, Blocks.BAMBOO_WALL_HANGING_SIGN);
       this.registerTintableCrossBlockState(Blocks.NETHER_SPROUTS, BlockStateModelGenerator.TintType.NOT_TINTED);
       this.registerItemModel(Items.f_reybjwsg);
       this.registerDoor(Blocks.IRON_DOOR);
@@ -5566,7 +5614,7 @@
       this.registerCooker(Blocks.SMOKER, TexturedModel.ORIENTABLE_WITH_BOTTOM);
       this.registerRedstone();
       this.registerRespawnAnchor();
-      this.m_vxaizyos();
+      this.registerSculkCatalyst();
       this.registerInfested(Blocks.CHISELED_STONE_BRICKS, Blocks.INFESTED_CHISELED_STONE_BRICKS);
       this.registerInfested(Blocks.COBBLESTONE, Blocks.INFESTED_COBBLESTONE);
       this.registerInfested(Blocks.CRACKED_STONE_BRICKS, Blocks.INFESTED_CRACKED_STONE_BRICKS);
@@ -5661,9 +5709,10 @@
       @Nullable
       private Identifier baseModelId;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_narscpoc Lnet/minecraft/unmapped/C_ysvjbfkt$C_jphnvadg;f_narscpoc:Ljava/util/Set;}
+       * @mapping {@literal named skippedModels Lnet/minecraft/data/client/model/BlockStateModelGenerator$BlockTexturePool;skippedModels:Ljava/util/Set;}
        */
-      private final Set<Block> f_narscpoc = new HashSet();
+      private final Set<Block> skippedModels = new HashSet();
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ysvjbfkt$C_jphnvadg;<init>(Lnet/minecraft/unmapped/C_ysvjbfkt;Lnet/minecraft/unmapped/C_pgmmajlq;)V}
@@ -5693,13 +5742,14 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_mmtayaup Lnet/minecraft/unmapped/C_ysvjbfkt$C_jphnvadg;m_mmtayaup(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_jphnvadg;}
+       * @mapping {@literal named parented Lnet/minecraft/data/client/model/BlockStateModelGenerator$BlockTexturePool;parented(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/model/BlockStateModelGenerator$BlockTexturePool;}
        */
-      public BlockStateModelGenerator.BlockTexturePool m_mmtayaup(Block arg, Block arg2) {
-         Identifier lv = ModelIds.getBlockModelId(arg);
-         BlockStateModelGenerator.this.blockStateCollector.accept(BlockStateModelGenerator.createSingletonBlockState(arg2, lv));
-         BlockStateModelGenerator.this.registerParentedItemModel(arg2, lv);
-         this.f_narscpoc.add(arg2);
+      public BlockStateModelGenerator.BlockTexturePool parented(Block parent, Block block) {
+         Identifier lv = ModelIds.getBlockModelId(parent);
+         BlockStateModelGenerator.this.blockStateCollector.accept(BlockStateModelGenerator.createSingletonBlockState(block, lv));
+         BlockStateModelGenerator.this.registerParentedItemModel(block, lv);
+         this.skippedModels.add(block);
          return this;
       }
 
@@ -5735,13 +5785,13 @@
        * @mapping {@literal named customFence Lnet/minecraft/data/client/model/BlockStateModelGenerator$BlockTexturePool;customFence(Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/model/BlockStateModelGenerator$BlockTexturePool;}
        */
       public BlockStateModelGenerator.BlockTexturePool customFence(Block block) {
-         Texture lv = Texture.m_amvqbqnh(block);
+         Texture lv = Texture.customParticle(block);
          Identifier lv2 = Models.CUSTOM_FENCE_POST.upload(block, lv, BlockStateModelGenerator.this.modelCollector);
          Identifier lv3 = Models.CUSTOM_FENCE_SIDE_NORTH.upload(block, lv, BlockStateModelGenerator.this.modelCollector);
          Identifier lv4 = Models.CUSTOM_FENCE_SIDE_EAST.upload(block, lv, BlockStateModelGenerator.this.modelCollector);
          Identifier lv5 = Models.CUSTOM_FENCE_SIDE_SOUTH.upload(block, lv, BlockStateModelGenerator.this.modelCollector);
          Identifier lv6 = Models.CUSTOM_FENCE_SIDE_WEST.upload(block, lv, BlockStateModelGenerator.this.modelCollector);
-         BlockStateModelGenerator.this.blockStateCollector.accept(BlockStateModelGenerator.m_anzxptee(block, lv2, lv3, lv4, lv5, lv6));
+         BlockStateModelGenerator.this.blockStateCollector.accept(BlockStateModelGenerator.createCustomFenceBlockState(block, lv2, lv3, lv4, lv5, lv6));
          Identifier lv7 = Models.CUSTOM_FENCE_INVENTORY.upload(block, lv, BlockStateModelGenerator.this.modelCollector);
          BlockStateModelGenerator.this.registerParentedItemModel(block, lv7);
          return this;
@@ -5762,10 +5812,10 @@
 
       /**
        * @mapping {@literal hashed m_bcruuyxo Lnet/minecraft/unmapped/C_ysvjbfkt$C_jphnvadg;m_bcruuyxo(Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_jphnvadg;}
-       * @mapping {@literal named m_bcruuyxo Lnet/minecraft/data/client/model/BlockStateModelGenerator$BlockTexturePool;m_bcruuyxo(Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/model/BlockStateModelGenerator$BlockTexturePool;}
+       * @mapping {@literal named customFenceGate Lnet/minecraft/data/client/model/BlockStateModelGenerator$BlockTexturePool;customFenceGate(Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/model/BlockStateModelGenerator$BlockTexturePool;}
        */
-      public BlockStateModelGenerator.BlockTexturePool m_bcruuyxo(Block block) {
-         Texture lv = Texture.m_amvqbqnh(block);
+      public BlockStateModelGenerator.BlockTexturePool customFenceGate(Block block) {
+         Texture lv = Texture.customParticle(block);
          Identifier lv2 = Models.TEMPLATE_CUSTOM_FENCE_GATE_OPEN.upload(block, lv, BlockStateModelGenerator.this.modelCollector);
          Identifier lv3 = Models.TEMPLATE_CUSTOM_FENCE_GATE.upload(block, lv, BlockStateModelGenerator.this.modelCollector);
          Identifier lv4 = Models.TEMPLATE_CUSTOM_FENCE_GATE_WALL_OPEN.upload(block, lv, BlockStateModelGenerator.this.modelCollector);
@@ -5895,7 +5945,7 @@
          family.getVariants()
             .forEach(
                (variant, block) -> {
-                  if (!this.f_narscpoc.contains(block)) {
+                  if (!this.skippedModels.contains(block)) {
                      BiConsumer<BlockStateModelGenerator.BlockTexturePool, Block> biConsumer = (BiConsumer)BlockStateModelGenerator.VARIANT_POOL_FUNCTIONS
                         .get(variant);
                      if (biConsumer != null) {
@@ -5909,6 +5959,13 @@
    }
 
    /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_ysvjbfkt$C_jhuevbcm}
+    * @mapping {@literal named net/minecraft/data/client/model/BlockStateModelGenerator$BookSlotModelCacheKey}
+    */
+   static record BookSlotModelCacheKey(Model template, String modelSuffix) {
+   }
+
+   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_ysvjbfkt$C_ieiptmbq}
     * @mapping {@literal named net/minecraft/data/client/model/BlockStateModelGenerator$BuiltinModelPool}
     */
@@ -5965,13 +6022,6 @@
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_ysvjbfkt$C_jhuevbcm}
-    * @mapping {@literal named net/minecraft/data/client/model/BlockStateModelGenerator$C_jhuevbcm}
-    */
-   static record C_jhuevbcm(Model template, String modelSuffix) {
-   }
-
-   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_ysvjbfkt$C_tpmbjwqh}
     * @mapping {@literal named net/minecraft/data/client/model/BlockStateModelGenerator$LogTexturePool}
     */
@@ -6024,11 +6074,11 @@
 
       /**
        * @mapping {@literal hashed m_jgmzdamz Lnet/minecraft/unmapped/C_ysvjbfkt$C_tpmbjwqh;m_jgmzdamz(Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ysvjbfkt$C_tpmbjwqh;}
-       * @mapping {@literal named m_jgmzdamz Lnet/minecraft/data/client/model/BlockStateModelGenerator$LogTexturePool;m_jgmzdamz(Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/model/BlockStateModelGenerator$LogTexturePool;}
+       * @mapping {@literal named uvLockedLog Lnet/minecraft/data/client/model/BlockStateModelGenerator$LogTexturePool;uvLockedLog(Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/model/BlockStateModelGenerator$LogTexturePool;}
        */
-      public BlockStateModelGenerator.LogTexturePool m_jgmzdamz(Block block) {
+      public BlockStateModelGenerator.LogTexturePool uvLockedLog(Block block) {
          BlockStateModelGenerator.this.blockStateCollector
-            .accept(BlockStateModelGenerator.m_oxulsacv(block, this.texture, BlockStateModelGenerator.this.modelCollector));
+            .accept(BlockStateModelGenerator.createUvLockedPillarBlockState(block, this.texture, BlockStateModelGenerator.this.modelCollector));
          return this;
       }
    }
diff -bur namedTargetSrc/net/minecraft/data/client/model/Model.java namedSrc/net/minecraft/data/client/model/Model.java
--- namedTargetSrc/net/minecraft/data/client/model/Model.java	2023-10-27 02:07:00.576689405 +0000
+++ namedSrc/net/minecraft/data/client/model/Model.java	2023-10-27 02:05:25.728735366 +0000
@@ -47,9 +47,9 @@
 
    /**
     * @mapping {@literal hashed m_izvaynaq Lnet/minecraft/unmapped/C_zppcsbsk;m_izvaynaq(Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_ncpywfca;}
-    * @mapping {@literal named m_izvaynaq Lnet/minecraft/data/client/model/Model;m_izvaynaq(Lnet/minecraft/block/Block;)Lnet/minecraft/util/Identifier;}
+    * @mapping {@literal named getDefaultModelId Lnet/minecraft/data/client/model/Model;getDefaultModelId(Lnet/minecraft/block/Block;)Lnet/minecraft/util/Identifier;}
     */
-   public Identifier m_izvaynaq(Block block) {
+   public Identifier getDefaultModelId(Block block) {
       return ModelIds.getBlockSubModelId(block, (String)this.variant.orElse(""));
    }
 
@@ -82,27 +82,29 @@
     * @mapping {@literal named upload Lnet/minecraft/data/client/model/Model;upload(Lnet/minecraft/util/Identifier;Lnet/minecraft/data/client/model/Texture;Ljava/util/function/BiConsumer;)Lnet/minecraft/util/Identifier;}
     */
    public Identifier upload(Identifier id, Texture texture, BiConsumer<Identifier, Supplier<JsonElement>> modelCollector) {
-      return this.m_oyjlnybm(id, texture, modelCollector, this::m_mjmunmmv);
+      return this.upload(id, texture, modelCollector, this::createJson);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_oyjlnybm Lnet/minecraft/unmapped/C_zppcsbsk;m_oyjlnybm(Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_pgmmajlq;Ljava/util/function/BiConsumer;Lnet/minecraft/unmapped/C_zppcsbsk$C_sbdlbkmi;)Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named upload Lnet/minecraft/data/client/model/Model;upload(Lnet/minecraft/util/Identifier;Lnet/minecraft/data/client/model/Texture;Ljava/util/function/BiConsumer;Lnet/minecraft/data/client/model/Model$JsonFactory;)Lnet/minecraft/util/Identifier;}
     */
-   public Identifier m_oyjlnybm(Identifier arg, Texture arg2, BiConsumer<Identifier, Supplier<JsonElement>> biConsumer, Model.C_sbdlbkmi arg3) {
-      Map<TextureKey, Identifier> map = this.createTextureMap(arg2);
-      biConsumer.accept(arg, (Supplier)() -> arg3.create(arg, map));
-      return arg;
+   public Identifier upload(Identifier id, Texture texture, BiConsumer<Identifier, Supplier<JsonElement>> modelCollector, Model.JsonFactory jsonFactory) {
+      Map<TextureKey, Identifier> map = this.createTextureMap(texture);
+      modelCollector.accept(id, (Supplier)() -> jsonFactory.create(id, map));
+      return id;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mjmunmmv Lnet/minecraft/unmapped/C_zppcsbsk;m_mjmunmmv(Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Map;)Lcom/google/gson/JsonObject;}
+    * @mapping {@literal named createJson Lnet/minecraft/data/client/model/Model;createJson(Lnet/minecraft/util/Identifier;Ljava/util/Map;)Lcom/google/gson/JsonObject;}
     */
-   public JsonObject m_mjmunmmv(Identifier arg, Map<TextureKey, Identifier> map) {
+   public JsonObject createJson(Identifier id, Map<TextureKey, Identifier> textureMap) {
       JsonObject jsonObject = new JsonObject();
-      this.parent.ifPresent(argx -> jsonObject.addProperty("parent", argx.toString()));
-      if (!map.isEmpty()) {
+      this.parent.ifPresent(parent -> jsonObject.addProperty("parent", parent.toString()));
+      if (!textureMap.isEmpty()) {
          JsonObject jsonObject2 = new JsonObject();
-         map.forEach((argx, arg2) -> jsonObject2.addProperty(argx.getName(), arg2.toString()));
+         textureMap.forEach((key, textureId) -> jsonObject2.addProperty(key.getName(), textureId.toString()));
          jsonObject.add("textures", jsonObject2);
       }
 
@@ -120,12 +122,13 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_zppcsbsk$C_sbdlbkmi}
-    * @mapping {@literal named net/minecraft/data/client/model/Model$C_sbdlbkmi}
+    * @mapping {@literal named net/minecraft/data/client/model/Model$JsonFactory}
     */
-   public interface C_sbdlbkmi {
+   public interface JsonFactory {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed create Lnet/minecraft/unmapped/C_zppcsbsk$C_sbdlbkmi;create(Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Map;)Lcom/google/gson/JsonObject;}
+       * @mapping {@literal named create Lnet/minecraft/data/client/model/Model$JsonFactory;create(Lnet/minecraft/util/Identifier;Ljava/util/Map;)Lcom/google/gson/JsonObject;}
        */
-      JsonObject create(Identifier arg, Map<TextureKey, Identifier> map);
+      JsonObject create(Identifier id, Map<TextureKey, Identifier> textureMap);
    }
 }
diff -bur namedTargetSrc/net/minecraft/data/client/model/Models.java namedSrc/net/minecraft/data/client/model/Models.java
--- namedTargetSrc/net/minecraft/data/client/model/Models.java	2023-10-27 02:07:00.608689389 +0000
+++ namedSrc/net/minecraft/data/client/model/Models.java	2023-10-27 02:05:25.764735345 +0000
@@ -505,8 +505,8 @@
     * @mapping {@literal named STEM_GROWTH_STAGES Lnet/minecraft/data/client/model/Models;STEM_GROWTH_STAGES:[Lnet/minecraft/data/client/model/Model;}
     */
    public static final Model[] STEM_GROWTH_STAGES = (Model[])IntStream.range(0, 8)
-      .mapToObj(i -> block("stem_growth" + i, "_stage" + i, TextureKey.STEM))
-      .toArray(i -> new Model[i]);
+      .mapToObj(stage -> block("stem_growth" + stage, "_stage" + stage, TextureKey.STEM))
+      .toArray(length -> new Model[length]);
    /**
     * @mapping {@literal hashed f_afxljsay Lnet/minecraft/unmapped/C_vcuykfgc;f_afxljsay:Lnet/minecraft/unmapped/C_zppcsbsk;}
     * @mapping {@literal named STEM_FRUIT Lnet/minecraft/data/client/model/Models;STEM_FRUIT:Lnet/minecraft/data/client/model/Model;}
@@ -649,9 +649,10 @@
     */
    public static final Model TEMPLATE_POTTED_AZALEA_BUSH = block("template_potted_azalea_bush", TextureKey.PLANT, TextureKey.TOP, TextureKey.SIDE);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_cvgdtrqx Lnet/minecraft/unmapped/C_vcuykfgc;f_cvgdtrqx:Lnet/minecraft/unmapped/C_zppcsbsk;}
+    * @mapping {@literal named TEMPLATE_POTTED_FLOWERING_AZALEA_BUSH Lnet/minecraft/data/client/model/Models;TEMPLATE_POTTED_FLOWERING_AZALEA_BUSH:Lnet/minecraft/data/client/model/Model;}
     */
-   public static final Model f_cvgdtrqx = block("template_potted_azalea_bush", TextureKey.PLANT, TextureKey.TOP, TextureKey.SIDE);
+   public static final Model TEMPLATE_POTTED_FLOWERING_AZALEA_BUSH = block("template_potted_azalea_bush", TextureKey.PLANT, TextureKey.TOP, TextureKey.SIDE);
    /**
     * @mapping {@literal hashed f_ffaqbpcf Lnet/minecraft/unmapped/C_vcuykfgc;f_ffaqbpcf:Lnet/minecraft/unmapped/C_zppcsbsk;}
     * @mapping {@literal named SNIFFER_EGG Lnet/minecraft/data/client/model/Models;SNIFFER_EGG:Lnet/minecraft/data/client/model/Model;}
diff -bur namedTargetSrc/net/minecraft/data/client/model/TexturedModel.java namedSrc/net/minecraft/data/client/model/TexturedModel.java
--- namedTargetSrc/net/minecraft/data/client/model/TexturedModel.java	2023-10-27 02:07:00.524689432 +0000
+++ namedSrc/net/minecraft/data/client/model/TexturedModel.java	2023-10-27 02:05:25.672735392 +0000
@@ -61,21 +61,25 @@
     */
    public static final TexturedModel.Factory CARPET = makeFactory(Texture::wool, Models.CARPET);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_wkllyois Lnet/minecraft/unmapped/C_tkkixdtc;f_wkllyois:Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;}
+    * @mapping {@literal named FLOWERBED_1 Lnet/minecraft/data/client/model/TexturedModel;FLOWERBED_1:Lnet/minecraft/data/client/model/TexturedModel$Factory;}
     */
-   public static final TexturedModel.Factory f_wkllyois = makeFactory(Texture::m_gnvgpjsu, Models.FLOWERBED_1);
+   public static final TexturedModel.Factory FLOWERBED_1 = makeFactory(Texture::flowerbed, Models.FLOWERBED_1);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_blaugkpd Lnet/minecraft/unmapped/C_tkkixdtc;f_blaugkpd:Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;}
+    * @mapping {@literal named FLOWERBED_2 Lnet/minecraft/data/client/model/TexturedModel;FLOWERBED_2:Lnet/minecraft/data/client/model/TexturedModel$Factory;}
     */
-   public static final TexturedModel.Factory f_blaugkpd = makeFactory(Texture::m_gnvgpjsu, Models.FLOWERBED_2);
+   public static final TexturedModel.Factory FLOWERBED_2 = makeFactory(Texture::flowerbed, Models.FLOWERBED_2);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_fjiipfwk Lnet/minecraft/unmapped/C_tkkixdtc;f_fjiipfwk:Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;}
+    * @mapping {@literal named FLOWERBED_3 Lnet/minecraft/data/client/model/TexturedModel;FLOWERBED_3:Lnet/minecraft/data/client/model/TexturedModel$Factory;}
     */
-   public static final TexturedModel.Factory f_fjiipfwk = makeFactory(Texture::m_gnvgpjsu, Models.FLOWERBED_3);
+   public static final TexturedModel.Factory FLOWERBED_3 = makeFactory(Texture::flowerbed, Models.FLOWERBED_3);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ulvknsfo Lnet/minecraft/unmapped/C_tkkixdtc;f_ulvknsfo:Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;}
+    * @mapping {@literal named FLOWERBED_4 Lnet/minecraft/data/client/model/TexturedModel;FLOWERBED_4:Lnet/minecraft/data/client/model/TexturedModel$Factory;}
     */
-   public static final TexturedModel.Factory f_ulvknsfo = makeFactory(Texture::m_gnvgpjsu, Models.FLOWERBED_4);
+   public static final TexturedModel.Factory FLOWERBED_4 = makeFactory(Texture::flowerbed, Models.FLOWERBED_4);
    /**
     * @mapping {@literal hashed f_xdqlljao Lnet/minecraft/unmapped/C_tkkixdtc;f_xdqlljao:Lnet/minecraft/unmapped/C_tkkixdtc$C_jbkydoyx;}
     * @mapping {@literal named TEMPLATE_GLAZED_TERRACOTTA Lnet/minecraft/data/client/model/TexturedModel;TEMPLATE_GLAZED_TERRACOTTA:Lnet/minecraft/data/client/model/TexturedModel$Factory;}
diff -bur namedTargetSrc/net/minecraft/data/client/model/Texture.java namedSrc/net/minecraft/data/client/model/Texture.java
--- namedTargetSrc/net/minecraft/data/client/model/Texture.java	2023-10-27 02:07:00.664689361 +0000
+++ namedSrc/net/minecraft/data/client/model/Texture.java	2023-10-27 02:05:25.820735314 +0000
@@ -193,9 +193,9 @@
 
    /**
     * @mapping {@literal hashed m_gnvgpjsu Lnet/minecraft/unmapped/C_pgmmajlq;m_gnvgpjsu(Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq;}
-    * @mapping {@literal named m_gnvgpjsu Lnet/minecraft/data/client/model/Texture;m_gnvgpjsu(Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/model/Texture;}
+    * @mapping {@literal named flowerbed Lnet/minecraft/data/client/model/Texture;flowerbed(Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/model/Texture;}
     */
-   public static Texture m_gnvgpjsu(Block block) {
+   public static Texture flowerbed(Block block) {
       return new Texture().put(TextureKey.FLOWERBED, getId(block)).put(TextureKey.STEM, getSubId(block, "_stem"));
    }
 
@@ -281,9 +281,9 @@
 
    /**
     * @mapping {@literal hashed m_nzbyyqjx Lnet/minecraft/unmapped/C_pgmmajlq;m_nzbyyqjx(Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq;}
-    * @mapping {@literal named m_nzbyyqjx Lnet/minecraft/data/client/model/Texture;m_nzbyyqjx(Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/model/Texture;}
+    * @mapping {@literal named pottedAzalea Lnet/minecraft/data/client/model/Texture;pottedAzalea(Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/model/Texture;}
     */
-   public static Texture m_nzbyyqjx(Block block) {
+   public static Texture pottedAzalea(Block block) {
       return new Texture()
          .put(TextureKey.PLANT, getSubId(block, "_plant"))
          .put(TextureKey.SIDE, getSubId(block, "_side"))
@@ -308,17 +308,17 @@
 
    /**
     * @mapping {@literal hashed m_wnenptud Lnet/minecraft/unmapped/C_pgmmajlq;m_wnenptud(Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq;}
-    * @mapping {@literal named m_wnenptud Lnet/minecraft/data/client/model/Texture;m_wnenptud(Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/model/Texture;}
+    * @mapping {@literal named fence Lnet/minecraft/data/client/model/Texture;fence(Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/model/Texture;}
     */
-   public static Texture m_wnenptud(Block block) {
+   public static Texture fence(Block block) {
       return new Texture().put(TextureKey.TEXTURE, getId(block)).put(TextureKey.SIDE, getSubId(block, "_side")).put(TextureKey.TOP, getSubId(block, "_top"));
    }
 
    /**
     * @mapping {@literal hashed m_amvqbqnh Lnet/minecraft/unmapped/C_pgmmajlq;m_amvqbqnh(Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_pgmmajlq;}
-    * @mapping {@literal named m_amvqbqnh Lnet/minecraft/data/client/model/Texture;m_amvqbqnh(Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/model/Texture;}
+    * @mapping {@literal named customParticle Lnet/minecraft/data/client/model/Texture;customParticle(Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/model/Texture;}
     */
-   public static Texture m_amvqbqnh(Block block) {
+   public static Texture customParticle(Block block) {
       return new Texture().put(TextureKey.TEXTURE, getId(block)).put(TextureKey.PARTICLE, getSubId(block, "_particle"));
    }
 
@@ -519,17 +519,18 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wmodlmje Lnet/minecraft/unmapped/C_pgmmajlq;m_wmodlmje(Ljava/lang/String;)Lnet/minecraft/unmapped/C_pgmmajlq;}
+    * @mapping {@literal named snifferEgg Lnet/minecraft/data/client/model/Texture;snifferEgg(Ljava/lang/String;)Lnet/minecraft/data/client/model/Texture;}
     */
-   public static Texture m_wmodlmje(String string) {
+   public static Texture snifferEgg(String type) {
       return new Texture()
-         .put(TextureKey.PARTICLE, getSubId(Blocks.SNIFFER_EGG, string + "_north"))
-         .put(TextureKey.BOTTOM, getSubId(Blocks.SNIFFER_EGG, string + "_bottom"))
-         .put(TextureKey.TOP, getSubId(Blocks.SNIFFER_EGG, string + "_top"))
-         .put(TextureKey.NORTH, getSubId(Blocks.SNIFFER_EGG, string + "_north"))
-         .put(TextureKey.SOUTH, getSubId(Blocks.SNIFFER_EGG, string + "_south"))
-         .put(TextureKey.EAST, getSubId(Blocks.SNIFFER_EGG, string + "_east"))
-         .put(TextureKey.WEST, getSubId(Blocks.SNIFFER_EGG, string + "_west"));
+         .put(TextureKey.PARTICLE, getSubId(Blocks.SNIFFER_EGG, type + "_north"))
+         .put(TextureKey.BOTTOM, getSubId(Blocks.SNIFFER_EGG, type + "_bottom"))
+         .put(TextureKey.TOP, getSubId(Blocks.SNIFFER_EGG, type + "_top"))
+         .put(TextureKey.NORTH, getSubId(Blocks.SNIFFER_EGG, type + "_north"))
+         .put(TextureKey.SOUTH, getSubId(Blocks.SNIFFER_EGG, type + "_south"))
+         .put(TextureKey.EAST, getSubId(Blocks.SNIFFER_EGG, type + "_east"))
+         .put(TextureKey.WEST, getSubId(Blocks.SNIFFER_EGG, type + "_west"));
    }
 
    /**
@@ -568,10 +569,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_esmayivc Lnet/minecraft/unmapped/C_pgmmajlq;m_esmayivc(Z)Lnet/minecraft/unmapped/C_pgmmajlq;}
+    * @mapping {@literal named sculkShrieker Lnet/minecraft/data/client/model/Texture;sculkShrieker(Z)Lnet/minecraft/data/client/model/Texture;}
     */
-   public static Texture m_esmayivc(boolean bl) {
-      String string = bl ? "_can_summon" : "";
+   public static Texture sculkShrieker(boolean canSummon) {
+      String string = canSummon ? "_can_summon" : "";
       return new Texture()
          .put(TextureKey.PARTICLE, getSubId(Blocks.SCULK_SHRIEKER, "_bottom"))
          .put(TextureKey.SIDE, getSubId(Blocks.SCULK_SHRIEKER, "_side"))
@@ -635,7 +637,7 @@
     */
    public static Identifier getSubId(Block block, String suffix) {
       Identifier lv = Registries.BLOCK.getId(block);
-      return lv.withPath((UnaryOperator<String>)(string2 -> "block/" + string2 + suffix));
+      return lv.withPath((UnaryOperator<String>)(path -> "block/" + path + suffix));
    }
 
    /**
@@ -653,6 +655,6 @@
     */
    public static Identifier getSubId(Item item, String suffix) {
       Identifier lv = Registries.ITEM.getId(item);
-      return lv.withPath((UnaryOperator<String>)(string2 -> "item/" + string2 + suffix));
+      return lv.withPath((UnaryOperator<String>)(path -> "item/" + path + suffix));
    }
 }
diff -bur namedTargetSrc/net/minecraft/recipe/BlastingRecipe.java namedSrc/net/minecraft/recipe/BlastingRecipe.java
--- namedTargetSrc/net/minecraft/recipe/BlastingRecipe.java	2023-10-27 02:07:00.620689383 +0000
+++ namedSrc/net/minecraft/recipe/BlastingRecipe.java	2023-10-27 02:05:25.776735339 +0000
@@ -12,8 +12,8 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ywbgonlm;<init>(Ljava/lang/String;Lnet/minecraft/unmapped/C_gtxamkec;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_sddaxwyk;FI)V}
     * @mapping {@literal named <init> Lnet/minecraft/recipe/BlastingRecipe;<init>(Ljava/lang/String;Lnet/minecraft/recipe/CookingCategory;Lnet/minecraft/recipe/Ingredient;Lnet/minecraft/item/ItemStack;FI)V}
     */
-   public BlastingRecipe(String string, CookingCategory arg, Ingredient arg2, ItemStack stack, float f, int i) {
-      super(RecipeType.BLASTING, string, arg, arg2, stack, f, i);
+   public BlastingRecipe(String group, CookingCategory category, Ingredient ingredient, ItemStack stack, float experience, int cookTime) {
+      super(RecipeType.BLASTING, group, category, ingredient, stack, experience, cookTime);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/recipe/book/RecipeBook.java namedSrc/net/minecraft/recipe/book/RecipeBook.java
--- namedTargetSrc/net/minecraft/recipe/book/RecipeBook.java	2023-10-27 02:07:00.580689403 +0000
+++ namedSrc/net/minecraft/recipe/book/RecipeBook.java	2023-10-27 02:05:25.736735361 +0000
@@ -41,11 +41,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ijxqozuf Lnet/minecraft/unmapped/C_bluodrzq;m_ijxqozuf(Lnet/minecraft/unmapped/C_dscbrwbj;)V}
+    * @mapping {@literal named add Lnet/minecraft/recipe/book/RecipeBook;add(Lnet/minecraft/recipe/RecipeHolder;)V}
     */
-   public void m_ijxqozuf(RecipeHolder<?> arg) {
-      if (!arg.value().isIgnoredInRecipeBook()) {
-         this.add(arg.id());
+   public void add(RecipeHolder<?> recipe) {
+      if (!recipe.value().isIgnoredInRecipeBook()) {
+         this.add(recipe.id());
       }
    }
 
@@ -58,10 +59,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dcnyuasn Lnet/minecraft/unmapped/C_bluodrzq;m_dcnyuasn(Lnet/minecraft/unmapped/C_dscbrwbj;)Z}
+    * @mapping {@literal named contains Lnet/minecraft/recipe/book/RecipeBook;contains(Lnet/minecraft/recipe/RecipeHolder;)Z}
     */
-   public boolean m_dcnyuasn(@Nullable RecipeHolder<?> arg) {
-      return arg == null ? false : this.recipes.contains(arg.id());
+   public boolean contains(@Nullable RecipeHolder<?> recipe) {
+      return recipe == null ? false : this.recipes.contains(recipe.id());
    }
 
    /**
@@ -73,10 +75,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dllnexer Lnet/minecraft/unmapped/C_bluodrzq;m_dllnexer(Lnet/minecraft/unmapped/C_dscbrwbj;)V}
+    * @mapping {@literal named remove Lnet/minecraft/recipe/book/RecipeBook;remove(Lnet/minecraft/recipe/RecipeHolder;)V}
     */
-   public void m_dllnexer(RecipeHolder<?> arg) {
-      this.remove(arg.id());
+   public void remove(RecipeHolder<?> recipe) {
+      this.remove(recipe.id());
    }
 
    /**
@@ -92,23 +95,24 @@
     * @mapping {@literal hashed m_aqitkiku Lnet/minecraft/unmapped/C_bluodrzq;m_aqitkiku(Lnet/minecraft/unmapped/C_dscbrwbj;)Z}
     * @mapping {@literal named shouldHighlight Lnet/minecraft/recipe/book/RecipeBook;shouldHighlight(Lnet/minecraft/recipe/RecipeHolder;)Z}
     */
-   public boolean shouldHighlight(RecipeHolder<?> arg) {
-      return this.toBeDisplayed.contains(arg.id());
+   public boolean shouldHighlight(RecipeHolder<?> recipe) {
+      return this.toBeDisplayed.contains(recipe.id());
    }
 
    /**
     * @mapping {@literal hashed m_laevpnyc Lnet/minecraft/unmapped/C_bluodrzq;m_laevpnyc(Lnet/minecraft/unmapped/C_dscbrwbj;)V}
     * @mapping {@literal named finishHighlight Lnet/minecraft/recipe/book/RecipeBook;finishHighlight(Lnet/minecraft/recipe/RecipeHolder;)V}
     */
-   public void finishHighlight(RecipeHolder<?> arg) {
-      this.toBeDisplayed.remove(arg.id());
+   public void finishHighlight(RecipeHolder<?> recipe) {
+      this.toBeDisplayed.remove(recipe.id());
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_drzdihac Lnet/minecraft/unmapped/C_bluodrzq;m_drzdihac(Lnet/minecraft/unmapped/C_dscbrwbj;)V}
+    * @mapping {@literal named queueForHighlight Lnet/minecraft/recipe/book/RecipeBook;queueForHighlight(Lnet/minecraft/recipe/RecipeHolder;)V}
     */
-   public void m_drzdihac(RecipeHolder<?> arg) {
-      this.queueForHighlight(arg.id());
+   public void queueForHighlight(RecipeHolder<?> recipe) {
+      this.queueForHighlight(recipe.id());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/recipe/CampfireCookingRecipe.java namedSrc/net/minecraft/recipe/CampfireCookingRecipe.java
--- namedTargetSrc/net/minecraft/recipe/CampfireCookingRecipe.java	2023-10-27 02:07:00.584689401 +0000
+++ namedSrc/net/minecraft/recipe/CampfireCookingRecipe.java	2023-10-27 02:05:25.740735359 +0000
@@ -12,8 +12,8 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_alixkcla;<init>(Ljava/lang/String;Lnet/minecraft/unmapped/C_gtxamkec;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_sddaxwyk;FI)V}
     * @mapping {@literal named <init> Lnet/minecraft/recipe/CampfireCookingRecipe;<init>(Ljava/lang/String;Lnet/minecraft/recipe/CookingCategory;Lnet/minecraft/recipe/Ingredient;Lnet/minecraft/item/ItemStack;FI)V}
     */
-   public CampfireCookingRecipe(String string, CookingCategory arg, Ingredient arg2, ItemStack stack, float f, int i) {
-      super(RecipeType.CAMPFIRE_COOKING, string, arg, arg2, stack, f, i);
+   public CampfireCookingRecipe(String group, CookingCategory category, Ingredient ingredient, ItemStack stack, float experience, int cookTime) {
+      super(RecipeType.CAMPFIRE_COOKING, group, category, ingredient, stack, experience, cookTime);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/recipe/CookingRecipeSerializer.java namedSrc/net/minecraft/recipe/CookingRecipeSerializer.java
--- namedTargetSrc/net/minecraft/recipe/CookingRecipeSerializer.java	2023-10-27 02:07:00.544689421 +0000
+++ namedSrc/net/minecraft/recipe/CookingRecipeSerializer.java	2023-10-27 02:05:25.696735384 +0000
@@ -46,7 +46,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<T> m_ypbzaepi() {
+   public Codec<T> getCodec() {
       return this.codec;
    }
 
@@ -86,6 +86,6 @@
        * @mapping {@literal hashed create Lnet/minecraft/unmapped/C_nuvmhgvy$C_askfjrsu;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;}
        * @mapping {@literal named create Lnet/minecraft/recipe/CookingRecipeSerializer$RecipeFactory;create(Ljava/lang/String;Lnet/minecraft/recipe/CookingCategory;Lnet/minecraft/recipe/Ingredient;Lnet/minecraft/item/ItemStack;FI)Lnet/minecraft/recipe/AbstractCookingRecipe;}
        */
-      T create(String string, CookingCategory arg, Ingredient arg2, ItemStack stack, float f, int i);
+      T create(String group, CookingCategory category, Ingredient ingredient, ItemStack stack, float experience, int cookTime);
    }
 }
diff -bur namedTargetSrc/net/minecraft/recipe/CuttingRecipe.java namedSrc/net/minecraft/recipe/CuttingRecipe.java
--- namedTargetSrc/net/minecraft/recipe/CuttingRecipe.java	2023-10-27 02:07:00.596689395 +0000
+++ namedSrc/net/minecraft/recipe/CuttingRecipe.java	2023-10-27 02:05:25.752735352 +0000
@@ -121,9 +121,10 @@
     */
    public static class Serializer<T extends CuttingRecipe> implements RecipeSerializer<T> {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_ksqoieom Lnet/minecraft/unmapped/C_ziizojwa$C_jqwnrmvy;f_ksqoieom:Lcom/mojang/serialization/MapCodec;}
+       * @mapping {@literal named RESULT_CODEC Lnet/minecraft/recipe/CuttingRecipe$Serializer;RESULT_CODEC:Lcom/mojang/serialization/MapCodec;}
        */
-      private static final MapCodec<ItemStack> f_ksqoieom = RecordCodecBuilder.mapCodec(
+      private static final MapCodec<ItemStack> RESULT_CODEC = RecordCodecBuilder.mapCodec(
          instance -> instance.group(
                   Registries.ITEM.getCodec().fieldOf("result").forGetter(ItemStack::getItem), Codec.INT.fieldOf("count").forGetter(ItemStack::getCount)
                )
@@ -148,9 +149,9 @@
          this.recipeFactory = recipeFactory;
          this.codec = RecordCodecBuilder.create(
             instance -> instance.group(
-                     Codecs.m_aeryaqrd(Codec.STRING, "group", "").forGetter(argx -> argx.group),
-                     Ingredient.f_mbldvcwx.fieldOf("ingredient").forGetter(argx -> argx.ingredient),
-                     f_ksqoieom.forGetter(argx -> argx.result)
+                     Codecs.m_aeryaqrd(Codec.STRING, "group", "").forGetter(recipe -> recipe.group),
+                     Ingredient.f_mbldvcwx.fieldOf("ingredient").forGetter(recipe -> recipe.ingredient),
+                     RESULT_CODEC.forGetter(recipe -> recipe.result)
                   )
                   .apply(instance, recipeFactory::create)
          );
@@ -160,7 +161,7 @@
        * Mapping not found
        */
       @Override
-      public Codec<T> m_ypbzaepi() {
+      public Codec<T> getCodec() {
          return this.codec;
       }
 
@@ -194,7 +195,7 @@
           * @mapping {@literal hashed create Lnet/minecraft/unmapped/C_ziizojwa$C_jqwnrmvy$C_ysvqdtqh;create(Ljava/lang/String;Lnet/minecraft/unmapped/C_tcpsydrv;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ziizojwa;}
           * @mapping {@literal named create Lnet/minecraft/recipe/CuttingRecipe$Serializer$RecipeFactory;create(Ljava/lang/String;Lnet/minecraft/recipe/Ingredient;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/recipe/CuttingRecipe;}
           */
-         T create(String string, Ingredient arg, ItemStack stack);
+         T create(String group, Ingredient ingredient, ItemStack stack);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/recipe/Ingredient.java namedSrc/net/minecraft/recipe/Ingredient.java
--- namedTargetSrc/net/minecraft/recipe/Ingredient.java	2023-10-27 02:07:00.580689403 +0000
+++ namedSrc/net/minecraft/recipe/Ingredient.java	2023-10-27 02:05:25.736735361 +0000
@@ -24,7 +24,6 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.tag.TagKey;
-import net.minecraft.unmapped.C_fvoqrgef;
 import net.minecraft.util.Util;
 import net.minecraft.util.dynamic.Codecs;
 import org.jetbrains.annotations.Nullable;
@@ -59,11 +58,11 @@
    /**
     * Mapping not found
     */
-   public static final Codec<Ingredient> f_clxednmi = m_lhlpdsji(true);
+   public static final Codec<Ingredient> f_clxednmi = createCodec(true);
    /**
     * Mapping not found
     */
-   public static final Codec<Ingredient> f_mbldvcwx = m_lhlpdsji(false);
+   public static final Codec<Ingredient> f_mbldvcwx = createCodec(false);
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_tcpsydrv;<init>(Ljava/util/stream/Stream;)V}
@@ -227,26 +226,27 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lhlpdsji Lnet/minecraft/unmapped/C_tcpsydrv;m_lhlpdsji(Z)Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named createCodec Lnet/minecraft/recipe/Ingredient;createCodec(Z)Lcom/mojang/serialization/Codec;}
     */
-   private static Codec<Ingredient> m_lhlpdsji(boolean bl) {
+   private static Codec<Ingredient> createCodec(boolean allowEmpty) {
       Codec<Ingredient.Entry[]> codec = Codec.list(Ingredient.Entry.CODEC)
          .comapFlatMap(
-            list -> !bl && list.size() < 1
+            list -> !allowEmpty && list.size() < 1
                   ? DataResult.error(() -> "Item array cannot be empty, at least one item must be defined")
                   : DataResult.success((Ingredient.Entry[])list.toArray(new Ingredient.Entry[0])),
             List::of
          );
       return Codecs.m_mrsshdck(codec, Ingredient.Entry.CODEC)
          .flatComapMap(
-            either -> either.map(Ingredient::new, arg -> new Ingredient(new Ingredient.Entry[]{arg})),
-            arg -> {
-               if (arg.entries.length == 1) {
-                  return DataResult.success(Either.right(arg.entries[0]));
+            either -> either.map(Ingredient::new, entry -> new Ingredient(new Ingredient.Entry[]{entry})),
+            ingredient -> {
+               if (ingredient.entries.length == 1) {
+                  return DataResult.success(Either.right(ingredient.entries[0]));
                } else {
-                  return arg.entries.length == 0 && !bl
+                  return ingredient.entries.length == 0 && !allowEmpty
                      ? DataResult.error(() -> "Item array cannot be empty, at least one item must be defined")
-                     : DataResult.success(Either.left(arg.entries));
+                     : DataResult.success(Either.left(ingredient.entries));
                }
             }
          );
@@ -289,7 +289,7 @@
        * @mapping {@literal named CODEC Lnet/minecraft/recipe/Ingredient$StackEntry;CODEC:Lcom/mojang/serialization/Codec;}
        */
       static final Codec<Ingredient.StackEntry> CODEC = RecordCodecBuilder.create(
-         instance -> instance.group(C_fvoqrgef.f_zrkytccc.fieldOf("item").forGetter(arg -> arg.stack)).apply(instance, Ingredient.StackEntry::new)
+         instance -> instance.group(RecipeCodecThingTODO.f_zrkytccc.fieldOf("item").forGetter(arg -> arg.stack)).apply(instance, Ingredient.StackEntry::new)
       );
 
       /**
@@ -331,7 +331,8 @@
        * @mapping {@literal named CODEC Lnet/minecraft/recipe/Ingredient$TagEntry;CODEC:Lcom/mojang/serialization/Codec;}
        */
       static final Codec<Ingredient.TagEntry> CODEC = RecordCodecBuilder.create(
-         instance -> instance.group(TagKey.createCodec(RegistryKeys.ITEM).fieldOf("tag").forGetter(arg -> arg.tag)).apply(instance, Ingredient.TagEntry::new)
+         instance -> instance.group(TagKey.createCodec(RegistryKeys.ITEM).fieldOf("tag").forGetter(entry -> entry.tag))
+               .apply(instance, Ingredient.TagEntry::new)
       );
 
       /**


The remaining diff is too long!

Please sign in to comment.