A lot of new classes (#565) · QuiltMC/quilt-mappings@00dc8a6

github-actions · 2024-03-19T16:58:06Z

With commit 00dc8a6, 117 file(s) were updated with 1555 line(s) added and 1466 removed compared to the latest Quilt Mappings version.

View the diff here (1/3):

diff -bur namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-03-19 16:58:04.411252983 +0000
+++ namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-03-19 16:56:55.051263334 +0000
@@ -431,7 +431,7 @@
    private static Holder<StatusEffect> readStatusEffect(NbtCompound nbt, String effectName) {
       if (nbt.contains(effectName, NbtElement.STRING_TYPE)) {
          Identifier lv = Identifier.tryParse(nbt.getString(effectName));
-         return lv == null ? null : (Holder)Registries.STATUS_EFFECT.m_nxhthmir(lv).map(BeaconBlockEntity::validate).orElse(null);
+         return lv == null ? null : (Holder)Registries.STATUS_EFFECT.getHolder(lv).map(BeaconBlockEntity::validate).orElse(null);
       } else {
          return null;
       }
Only in namedSrc/net/minecraft/block/entity: OneTwentyOneBannerPatterns.java
Only in namedSrc/net/minecraft/client/gui/screen: BanScreenFactories.java
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2024-03-19 16:58:04.359252977 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-03-19 16:56:54.959263326 +0000
@@ -78,6 +78,7 @@
 import net.minecraft.client.gui.hud.debug.DebugHud;
 import net.minecraft.client.gui.hud.in_game.InGameHud;
 import net.minecraft.client.gui.screen.AccessibilityOnboardingScreen;
+import net.minecraft.client.gui.screen.BanScreenFactories;
 import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.gui.screen.ConfirmLinkScreen;
 import net.minecraft.client.gui.screen.DeathScreen;
@@ -214,7 +215,6 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.text.component.KeyBindTextResolver;
-import net.minecraft.unmapped.C_tkoofxmf;
 import net.minecraft.unmapped.C_yfulyots;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.FileNameUtil;
@@ -1315,7 +1315,7 @@
 
       BanDetails banDetails = this.getBanDetails();
       if (banDetails != null) {
-         list.add((Function)runnable -> C_tkoofxmf.m_odezxkdz(bl -> {
+         list.add((Function)runnable -> BanScreenFactories.createBanScreen(bl -> {
                if (bl) {
                   Util.getOperatingSystem().open("https://aka.ms/mcjavamoderation");
                }
@@ -1329,11 +1329,11 @@
          GameProfile gameProfile = profileResult.profile();
          Set<ProfileActionType> set = profileResult.actions();
          if (set.contains(ProfileActionType.FORCED_NAME_CHANGE)) {
-            list.add((Function)runnable -> C_tkoofxmf.m_kkrfulue(gameProfile.getName(), runnable));
+            list.add((Function)runnable -> BanScreenFactories.createUsernameBanScreen(gameProfile.getName(), runnable));
          }
 
          if (set.contains(ProfileActionType.USING_BANNED_SKIN)) {
-            list.add(C_tkoofxmf::m_bkhgjebh);
+            list.add(BanScreenFactories::createSkinBanScreen);
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/animation/ArmadilloEntityAnimations.java namedSrc/net/minecraft/client/render/entity/animation/ArmadilloEntityAnimations.java
--- namedTargetSrc/net/minecraft/client/render/entity/animation/ArmadilloEntityAnimations.java	2024-03-19 16:58:04.471252989 +0000
+++ namedSrc/net/minecraft/client/render/entity/animation/ArmadilloEntityAnimations.java	2024-03-19 16:56:55.151263343 +0000
@@ -14,9 +14,10 @@
 @Environment(EnvType.CLIENT)
 public class ArmadilloEntityAnimations {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_sotwqpnh Lnet/minecraft/unmapped/C_ctkzhiqu;f_sotwqpnh:Lnet/minecraft/unmapped/C_mnzbondw;}
+    * @mapping {@literal named ROLLING Lnet/minecraft/client/render/entity/animation/ArmadilloEntityAnimations;ROLLING:Lnet/minecraft/client/render/animation/Animation;}
     */
-   public static final Animation f_sotwqpnh = Animation.Builder.withLength(0.5F)
+   public static final Animation ROLLING = Animation.Builder.withLength(0.5F)
       .addPartAnimation(
          "body",
          new PartAnimation(
@@ -347,9 +348,10 @@
       )
       .build();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bbyvliiy Lnet/minecraft/unmapped/C_ctkzhiqu;f_bbyvliiy:Lnet/minecraft/unmapped/C_mnzbondw;}
+    * @mapping {@literal named SCARED Lnet/minecraft/client/render/entity/animation/ArmadilloEntityAnimations;SCARED:Lnet/minecraft/client/render/animation/Animation;}
     */
-   public static final Animation f_bbyvliiy = Animation.Builder.withLength(2.5F)
+   public static final Animation SCARED = Animation.Builder.withLength(2.5F)
       .addPartAnimation(
          "head",
          new PartAnimation(
@@ -492,9 +494,10 @@
       )
       .build();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_avlxnhtb Lnet/minecraft/unmapped/C_ctkzhiqu;f_avlxnhtb:Lnet/minecraft/unmapped/C_mnzbondw;}
+    * @mapping {@literal named UNROLLING Lnet/minecraft/client/render/entity/animation/ArmadilloEntityAnimations;UNROLLING:Lnet/minecraft/client/render/animation/Animation;}
     */
-   public static final Animation f_avlxnhtb = Animation.Builder.withLength(1.5F)
+   public static final Animation UNROLLING = Animation.Builder.withLength(1.5F)
       .addPartAnimation(
          "head",
          new PartAnimation(
Only in namedSrc/net/minecraft/client/render/entity/animation: BatEntityAnimations.java
Only in namedSrc/net/minecraft/client/render/entity: BoggedEntityRenderer.java
diff -bur namedTargetSrc/net/minecraft/client/render/entity/BreezeEntityRenderer.java namedSrc/net/minecraft/client/render/entity/BreezeEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/BreezeEntityRenderer.java	2024-03-19 16:58:04.339252975 +0000
+++ namedSrc/net/minecraft/client/render/entity/BreezeEntityRenderer.java	2024-03-19 16:56:54.931263324 +0000
@@ -6,10 +6,10 @@
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.feature.BreezeEyesFeatureRenderer;
 import net.minecraft.client.render.entity.feature.BreezeWindFeatureRenderer;
+import net.minecraft.client.render.entity.model.BreezeEntityModel;
 import net.minecraft.client.render.entity.model.EntityModelLayers;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.mob.BreezeEntity;
-import net.minecraft.unmapped.C_qcaxblsy;
 import net.minecraft.util.Identifier;
 
 /**
@@ -17,7 +17,7 @@
  * @mapping {@literal named net/minecraft/client/render/entity/BreezeEntityRenderer}
  */
 @Environment(EnvType.CLIENT)
-public class BreezeEntityRenderer extends MobEntityRenderer<BreezeEntity, C_qcaxblsy<BreezeEntity>> {
+public class BreezeEntityRenderer extends MobEntityRenderer<BreezeEntity, BreezeEntityModel<BreezeEntity>> {
    /**
     * @mapping {@literal hashed f_ypoaynub Lnet/minecraft/unmapped/C_wdrzvsvu;f_ypoaynub:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/render/entity/BreezeEntityRenderer;TEXTURE:Lnet/minecraft/util/Identifier;}
@@ -28,7 +28,7 @@
     * Mapping not found
     */
    public BreezeEntityRenderer(EntityRendererFactory.Context arg) {
-      super(arg, new C_qcaxblsy<>(arg.getPart(EntityModelLayers.BREEZE)), 0.5F);
+      super(arg, new BreezeEntityModel<>(arg.getPart(EntityModelLayers.BREEZE)), 0.5F);
       this.addFeature(new BreezeWindFeatureRenderer(this));
       this.addFeature(new BreezeEyesFeatureRenderer(this));
    }
@@ -38,8 +38,8 @@
     * @mapping {@literal named render Lnet/minecraft/client/render/entity/BreezeEntityRenderer;render(Lnet/minecraft/entity/mob/BreezeEntity;FFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V}
     */
    public void render(BreezeEntity arg, float f, float g, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i) {
-      C_qcaxblsy<BreezeEntity> lv = this.getModel();
-      m_ouhxcsjr(lv, lv.m_rbhceaic(), lv.m_dfjyavaz());
+      BreezeEntityModel<BreezeEntity> lv = this.getModel();
+      m_ouhxcsjr(lv, lv.getBodyHead(), lv.getBodyRods());
       super.render(arg, f, g, matrices, vertexConsumers, i);
    }
 
@@ -53,13 +53,13 @@
 
    /**
     * @mapping {@literal hashed m_ouhxcsjr Lnet/minecraft/unmapped/C_wdrzvsvu;m_ouhxcsjr(Lnet/minecraft/unmapped/C_qcaxblsy;[Lnet/minecraft/unmapped/C_rglqxnbw;)Lnet/minecraft/unmapped/C_qcaxblsy;}
-    * @mapping {@literal named m_ouhxcsjr Lnet/minecraft/client/render/entity/BreezeEntityRenderer;m_ouhxcsjr(Lnet/minecraft/unmapped/C_qcaxblsy;[Lnet/minecraft/client/model/ModelPart;)Lnet/minecraft/unmapped/C_qcaxblsy;}
+    * @mapping {@literal named m_ouhxcsjr Lnet/minecraft/client/render/entity/BreezeEntityRenderer;m_ouhxcsjr(Lnet/minecraft/client/render/entity/model/BreezeEntityModel;[Lnet/minecraft/client/model/ModelPart;)Lnet/minecraft/client/render/entity/model/BreezeEntityModel;}
     */
-   public static C_qcaxblsy<BreezeEntity> m_ouhxcsjr(C_qcaxblsy<BreezeEntity> entity, ModelPart... parts) {
-      entity.m_rbhceaic().visible = false;
-      entity.m_jfxtcafk().visible = false;
-      entity.m_dfjyavaz().visible = false;
-      entity.m_tgpjmyzq().visible = false;
+   public static BreezeEntityModel<BreezeEntity> m_ouhxcsjr(BreezeEntityModel<BreezeEntity> entity, ModelPart... parts) {
+      entity.getBodyHead().visible = false;
+      entity.getBodyEyes().visible = false;
+      entity.getBodyRods().visible = false;
+      entity.getWind().visible = false;
 
       for (ModelPart lv : parts) {
          lv.visible = true;
diff -bur namedTargetSrc/net/minecraft/client/render/entity/EntityRenderers.java namedSrc/net/minecraft/client/render/entity/EntityRenderers.java
--- namedTargetSrc/net/minecraft/client/render/entity/EntityRenderers.java	2024-03-19 16:58:04.327252973 +0000
+++ namedSrc/net/minecraft/client/render/entity/EntityRenderers.java	2024-03-19 16:56:54.911263323 +0000
@@ -15,7 +15,6 @@
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.registry.Registries;
-import net.minecraft.unmapped.C_ddcesbvk;
 import org.slf4j.Logger;
 
 /**
@@ -117,7 +116,7 @@
       register(EntityType.BLAZE, BlazeEntityRenderer::new);
       register(EntityType.BLOCK_DISPLAY, DisplayEntityRenderer.BlockDisplayEntityRenderer::new);
       register(EntityType.BOAT, ctx -> new BoatEntityRenderer(ctx, false));
-      register(EntityType.BOGGED, C_ddcesbvk::new);
+      register(EntityType.BOGGED, BoggedEntityRenderer::new);
       register(EntityType.BREEZE, BreezeEntityRenderer::new);
       register(EntityType.BREEZE_WIND_CHARGE, WindChargeEntityRenderer::new);
       register(EntityType.CAT, CatEntityRenderer::new);
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.java	2024-03-19 16:58:04.531252996 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer.java	2024-03-19 16:56:55.267263352 +0000
@@ -7,9 +7,9 @@
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.BreezeEntityRenderer;
+import net.minecraft.client.render.entity.model.BreezeEntityModel;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.mob.BreezeEntity;
-import net.minecraft.unmapped.C_qcaxblsy;
 import net.minecraft.util.Identifier;
 
 /**
@@ -17,7 +17,7 @@
  * @mapping {@literal named net/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer}
  */
 @Environment(EnvType.CLIENT)
-public class BreezeEyesFeatureRenderer extends FeatureRenderer<BreezeEntity, C_qcaxblsy<BreezeEntity>> {
+public class BreezeEyesFeatureRenderer extends FeatureRenderer<BreezeEntity, BreezeEntityModel<BreezeEntity>> {
    /**
     * @mapping {@literal hashed f_qjuzyiwa Lnet/minecraft/unmapped/C_qbgjrzoa;f_qjuzyiwa:Lnet/minecraft/unmapped/C_tizlwnnv;}
     * @mapping {@literal named EYES_LAYER Lnet/minecraft/client/render/entity/feature/BreezeEyesFeatureRenderer;EYES_LAYER:Lnet/minecraft/client/render/RenderLayer;}
@@ -27,7 +27,7 @@
    /**
     * Mapping not found
     */
-   public BreezeEyesFeatureRenderer(FeatureRendererContext<BreezeEntity, C_qcaxblsy<BreezeEntity>> arg) {
+   public BreezeEyesFeatureRenderer(FeatureRendererContext<BreezeEntity, BreezeEntityModel<BreezeEntity>> arg) {
       super(arg);
    }
 
@@ -39,7 +39,7 @@
       MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, BreezeEntity arg3, float f, float g, float h, float j, float k, float l
    ) {
       VertexConsumer lv = vertexConsumers.getBuffer(EYES_LAYER);
-      C_qcaxblsy<BreezeEntity> lv2 = this.getContextModel();
-      BreezeEntityRenderer.m_ouhxcsjr(lv2, lv2.m_rbhceaic(), lv2.m_jfxtcafk()).render(matrices, lv, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
+      BreezeEntityModel<BreezeEntity> lv2 = this.getContextModel();
+      BreezeEntityRenderer.m_ouhxcsjr(lv2, lv2.getBodyHead(), lv2.getBodyEyes()).render(matrices, lv, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer.java	2024-03-19 16:58:04.339252975 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer.java	2024-03-19 16:56:54.927263324 +0000
@@ -7,9 +7,9 @@
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.BreezeEntityRenderer;
+import net.minecraft.client.render.entity.model.BreezeEntityModel;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.mob.BreezeEntity;
-import net.minecraft.unmapped.C_qcaxblsy;
 import net.minecraft.util.Identifier;
 
 /**
@@ -17,7 +17,7 @@
  * @mapping {@literal named net/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer}
  */
 @Environment(EnvType.CLIENT)
-public class BreezeWindFeatureRenderer extends FeatureRenderer<BreezeEntity, C_qcaxblsy<BreezeEntity>> {
+public class BreezeWindFeatureRenderer extends FeatureRenderer<BreezeEntity, BreezeEntityModel<BreezeEntity>> {
    /**
     * @mapping {@literal hashed f_jefknuem Lnet/minecraft/unmapped/C_pbhdquim;f_jefknuem:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named TEXTURE Lnet/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer;TEXTURE:Lnet/minecraft/util/Identifier;}
@@ -25,14 +25,14 @@
    private static final Identifier TEXTURE = new Identifier("textures/entity/breeze/breeze_wind.png");
    /**
     * @mapping {@literal hashed f_otevdvpo Lnet/minecraft/unmapped/C_pbhdquim;f_otevdvpo:Lnet/minecraft/unmapped/C_qcaxblsy;}
-    * @mapping {@literal named MODEL Lnet/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer;MODEL:Lnet/minecraft/unmapped/C_qcaxblsy;}
+    * @mapping {@literal named MODEL Lnet/minecraft/client/render/entity/feature/BreezeWindFeatureRenderer;MODEL:Lnet/minecraft/client/render/entity/model/BreezeEntityModel;}
     */
-   private static final C_qcaxblsy<BreezeEntity> MODEL = new C_qcaxblsy<>(C_qcaxblsy.m_mdluoqeq(128, 128).createModel());
+   private static final BreezeEntityModel<BreezeEntity> MODEL = new BreezeEntityModel<>(BreezeEntityModel.getTexturedModelData(128, 128).createModel());
 
    /**
     * Mapping not found
     */
-   public BreezeWindFeatureRenderer(FeatureRendererContext<BreezeEntity, C_qcaxblsy<BreezeEntity>> arg) {
+   public BreezeWindFeatureRenderer(FeatureRendererContext<BreezeEntity, BreezeEntityModel<BreezeEntity>> arg) {
       super(arg);
    }
 
@@ -46,7 +46,7 @@
       float m = (float)arg3.age + h;
       VertexConsumer lv = vertexConsumers.getBuffer(RenderLayer.getBreezeWind(TEXTURE, this.m_hpqgajlv(m) % 1.0F, 0.0F));
       MODEL.setAngles(arg3, f, g, j, k, l);
-      BreezeEntityRenderer.m_ouhxcsjr(MODEL, MODEL.m_tgpjmyzq()).render(matrices, lv, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
+      BreezeEntityRenderer.m_ouhxcsjr(MODEL, MODEL.getWind()).render(matrices, lv, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
    }
 
    /**
Only in namedSrc/net/minecraft/client/render/entity/feature: SkeletonOverlayFeatureRenderer.java
Only in namedSrc/net/minecraft/client/render/entity/feature: WolfArmorFeatureRenderer.java
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/ArmadilloEntityModel.java namedSrc/net/minecraft/client/render/entity/model/ArmadilloEntityModel.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/ArmadilloEntityModel.java	2024-03-19 16:58:04.419252984 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/ArmadilloEntityModel.java	2024-03-19 16:56:55.067263336 +0000
@@ -253,8 +253,8 @@
       }
 
       this.animateWalk(ArmadilloEntityAnimations.WALK, f, g, 16.5F, 2.5F);
-      this.animate(arg.unrollingState, ArmadilloEntityAnimations.f_avlxnhtb, h, 1.0F);
-      this.animate(arg.rollingState, ArmadilloEntityAnimations.f_sotwqpnh, h, 1.0F);
-      this.animate(arg.scaredState, ArmadilloEntityAnimations.f_bbyvliiy, h, 1.0F);
+      this.animate(arg.unrollingState, ArmadilloEntityAnimations.UNROLLING, h, 1.0F);
+      this.animate(arg.rollingState, ArmadilloEntityAnimations.ROLLING, h, 1.0F);
+      this.animate(arg.scaredState, ArmadilloEntityAnimations.SCARED, h, 1.0F);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/BatEntityModel.java namedSrc/net/minecraft/client/render/entity/model/BatEntityModel.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/BatEntityModel.java	2024-03-19 16:58:04.475252990 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/BatEntityModel.java	2024-03-19 16:56:55.163263343 +0000
@@ -9,8 +9,8 @@
 import net.minecraft.client.model.ModelTransform;
 import net.minecraft.client.model.TexturedModelData;
 import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.entity.animation.BatEntityAnimations;
 import net.minecraft.entity.passive.BatEntity;
-import net.minecraft.unmapped.C_vdwepyje;
 
 /**
  * Represents the model of a {@linkplain BatEntity}.
@@ -175,8 +175,8 @@
          this.setRoostingHeadYaw(i);
       }
 
-      this.animate(arg.flyingState, C_vdwepyje.f_fzrmuxfg, h, 1.0F);
-      this.animate(arg.roostingState, C_vdwepyje.f_ctmcosxl, h, 1.0F);
+      this.animate(arg.flyingState, BatEntityAnimations.FLYING, h, 1.0F);
+      this.animate(arg.roostingState, BatEntityAnimations.ROOSTING, h, 1.0F);
    }
 
    /**
Only in namedSrc/net/minecraft/client/render/entity/model: BoggedEntityModel.java
Only in namedSrc/net/minecraft/client/render/entity/model: BreezeEntityModel.java
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/EntityModelLayers.java namedSrc/net/minecraft/client/render/entity/model/EntityModelLayers.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/EntityModelLayers.java	2024-03-19 16:58:04.379252979 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/EntityModelLayers.java	2024-03-19 16:56:54.995263329 +0000
@@ -96,17 +96,20 @@
     */
    public static final EntityModelLayer BOGGED = registerMain("bogged");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_vvapuulj Lnet/minecraft/unmapped/C_ikhmhinf;f_vvapuulj:Lnet/minecraft/unmapped/C_rghfgwax;}
+    * @mapping {@literal named BOGGED_INNER_ARMOR Lnet/minecraft/client/render/entity/model/EntityModelLayers;BOGGED_INNER_ARMOR:Lnet/minecraft/client/render/entity/model/EntityModelLayer;}
     */
-   public static final EntityModelLayer f_vvapuulj = createInnerArmor("bogged");
+   public static final EntityModelLayer BOGGED_INNER_ARMOR = createInnerArmor("bogged");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_btvjrcbe Lnet/minecraft/unmapped/C_ikhmhinf;f_btvjrcbe:Lnet/minecraft/unmapped/C_rghfgwax;}
+    * @mapping {@literal named BOGGED_OUTER_ARMOR Lnet/minecraft/client/render/entity/model/EntityModelLayers;BOGGED_OUTER_ARMOR:Lnet/minecraft/client/render/entity/model/EntityModelLayer;}
     */
-   public static final EntityModelLayer f_btvjrcbe = createOuterArmor("bogged");
+   public static final EntityModelLayer BOGGED_OUTER_ARMOR = createOuterArmor("bogged");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_vfxufezl Lnet/minecraft/unmapped/C_ikhmhinf;f_vfxufezl:Lnet/minecraft/unmapped/C_rghfgwax;}
+    * @mapping {@literal named BOGGED_OUTER Lnet/minecraft/client/render/entity/model/EntityModelLayers;BOGGED_OUTER:Lnet/minecraft/client/render/entity/model/EntityModelLayer;}
     */
-   public static final EntityModelLayer f_vfxufezl = register("bogged", "outer");
+   public static final EntityModelLayer BOGGED_OUTER = register("bogged", "outer");
    /**
     * @mapping {@literal hashed f_bkiiyopv Lnet/minecraft/unmapped/C_ikhmhinf;f_bkiiyopv:Lnet/minecraft/unmapped/C_rghfgwax;}
     * @mapping {@literal named BOOK Lnet/minecraft/client/render/entity/model/EntityModelLayers;BOOK:Lnet/minecraft/client/render/entity/model/EntityModelLayer;}
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/EntityModelPartNames.java namedSrc/net/minecraft/client/render/entity/model/EntityModelPartNames.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/EntityModelPartNames.java	2024-03-19 16:58:04.499252992 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/EntityModelPartNames.java	2024-03-19 16:56:55.199263347 +0000
@@ -404,9 +404,10 @@
     */
    public static final String RODS = "rods";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_rxrcytbt Lnet/minecraft/unmapped/C_flvtdsjt;f_rxrcytbt:Ljava/lang/String;}
+    * @mapping {@literal named MUSHROOMS Lnet/minecraft/client/render/entity/model/EntityModelPartNames;MUSHROOMS:Ljava/lang/String;}
     */
-   public static final String f_rxrcytbt = "mushrooms";
+   public static final String MUSHROOMS = "mushrooms";
    /**
     * @mapping {@literal hashed f_ujupmhfz Lnet/minecraft/unmapped/C_flvtdsjt;f_ujupmhfz:Ljava/lang/String;}
     * @mapping {@literal named BONE Lnet/minecraft/client/render/entity/model/EntityModelPartNames;BONE:Ljava/lang/String;}
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/EntityModels.java namedSrc/net/minecraft/client/render/entity/model/EntityModels.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/EntityModels.java	2024-03-19 16:58:04.411252983 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/EntityModels.java	2024-03-19 16:56:55.047263334 +0000
@@ -26,8 +26,6 @@
 import net.minecraft.client.render.entity.WitherSkullEntityRenderer;
 import net.minecraft.client.render.entity.feature.TridentRiptideFeatureRenderer;
 import net.minecraft.entity.vehicle.BoatEntity;
-import net.minecraft.unmapped.C_orcllnsg;
-import net.minecraft.unmapped.C_qcaxblsy;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_axenkkni}
@@ -89,12 +87,12 @@
       builder.put(EntityModelLayers.BEE, BeeEntityModel.getTexturedModelData());
       builder.put(EntityModelLayers.BELL, BellBlockEntityRenderer.getTexturedModelData());
       builder.put(EntityModelLayers.BLAZE, BlazeEntityModel.getTexturedModelData());
-      builder.put(EntityModelLayers.BOGGED, C_orcllnsg.m_zvbeifvz());
-      builder.put(EntityModelLayers.f_vvapuulj, lv4);
-      builder.put(EntityModelLayers.f_btvjrcbe, lv2);
-      builder.put(EntityModelLayers.f_vfxufezl, TexturedModelData.of(BipedEntityModel.getModelData(new Dilation(0.2F), 0.0F), 64, 32));
+      builder.put(EntityModelLayers.BOGGED, BoggedEntityModel.getTexturedModelData());
+      builder.put(EntityModelLayers.BOGGED_INNER_ARMOR, lv4);
+      builder.put(EntityModelLayers.BOGGED_OUTER_ARMOR, lv2);
+      builder.put(EntityModelLayers.BOGGED_OUTER, TexturedModelData.of(BipedEntityModel.getModelData(new Dilation(0.2F), 0.0F), 64, 32));
       builder.put(EntityModelLayers.BOOK, BookModel.getTexturedModelData());
-      builder.put(EntityModelLayers.BREEZE, C_qcaxblsy.m_mdluoqeq(32, 32));
+      builder.put(EntityModelLayers.BREEZE, BreezeEntityModel.getTexturedModelData(32, 32));
       builder.put(EntityModelLayers.CAT, lv10);
       builder.put(EntityModelLayers.CAT_COLLAR, TexturedModelData.of(OcelotEntityModel.getModelData(new Dilation(0.01F)), 64, 32));
       builder.put(EntityModelLayers.CAMEL, CamelEntityModel.createTexturedModelData());
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/SkeletonEntityModel.java namedSrc/net/minecraft/client/render/entity/model/SkeletonEntityModel.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/SkeletonEntityModel.java	2024-03-19 16:58:04.471252989 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/SkeletonEntityModel.java	2024-03-19 16:56:55.155263343 +0000
@@ -38,30 +38,31 @@
    public static TexturedModelData getTexturedModelData() {
       ModelData lv = BipedEntityModel.getModelData(Dilation.NONE, 0.0F);
       ModelPartData lv2 = lv.getRoot();
-      m_xcazdwfc(lv2);
+      addLimbs(lv2);
       return TexturedModelData.of(lv, 64, 32);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xcazdwfc Lnet/minecraft/unmapped/C_lhqnvntm;m_xcazdwfc(Lnet/minecraft/unmapped/C_lacpzcxf;)V}
+    * @mapping {@literal named addLimbs Lnet/minecraft/client/render/entity/model/SkeletonEntityModel;addLimbs(Lnet/minecraft/client/model/ModelPartData;)V}
     */
-   protected static void m_xcazdwfc(ModelPartData arg) {
-      arg.addChild(
+   protected static void addLimbs(ModelPartData data) {
+      data.addChild(
          EntityModelPartNames.RIGHT_ARM,
          ModelPartBuilder.create().uv(40, 16).cuboid(-1.0F, -2.0F, -1.0F, 2.0F, 12.0F, 2.0F),
          ModelTransform.pivot(-5.0F, 2.0F, 0.0F)
       );
-      arg.addChild(
+      data.addChild(
          EntityModelPartNames.LEFT_ARM,
          ModelPartBuilder.create().uv(40, 16).mirrored().cuboid(-1.0F, -2.0F, -1.0F, 2.0F, 12.0F, 2.0F),
          ModelTransform.pivot(5.0F, 2.0F, 0.0F)
       );
-      arg.addChild(
+      data.addChild(
          EntityModelPartNames.RIGHT_LEG,
          ModelPartBuilder.create().uv(0, 16).cuboid(-1.0F, 0.0F, -1.0F, 2.0F, 12.0F, 2.0F),
          ModelTransform.pivot(-2.0F, 12.0F, 0.0F)
       );
-      arg.addChild(
+      data.addChild(
          EntityModelPartNames.LEFT_LEG,
          ModelPartBuilder.create().uv(0, 16).mirrored().cuboid(-1.0F, 0.0F, -1.0F, 2.0F, 12.0F, 2.0F),
          ModelTransform.pivot(2.0F, 12.0F, 0.0F)
diff -bur namedTargetSrc/net/minecraft/client/render/entity/StrayEntityRenderer.java namedSrc/net/minecraft/client/render/entity/StrayEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/StrayEntityRenderer.java	2024-03-19 16:58:04.463252989 +0000
+++ namedSrc/net/minecraft/client/render/entity/StrayEntityRenderer.java	2024-03-19 16:56:55.139263342 +0000
@@ -2,9 +2,9 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.render.entity.feature.SkeletonOverlayFeatureRenderer;
 import net.minecraft.client.render.entity.model.EntityModelLayers;
 import net.minecraft.entity.mob.StrayEntity;
-import net.minecraft.unmapped.C_lxpdzvpe;
 import net.minecraft.util.Identifier;
 
 /**
@@ -29,7 +29,7 @@
     */
    public StrayEntityRenderer(EntityRendererFactory.Context arg) {
       super(arg, EntityModelLayers.STRAY, EntityModelLayers.STRAY_INNER_ARMOR, EntityModelLayers.STRAY_OUTER_ARMOR);
-      this.addFeature(new C_lxpdzvpe<>(this, arg.getModelLoader(), EntityModelLayers.STRAY_OUTER, OVERLAY_TEXTURE));
+      this.addFeature(new SkeletonOverlayFeatureRenderer<>(this, arg.getModelLoader(), EntityModelLayers.STRAY_OUTER, OVERLAY_TEXTURE));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/entity/WolfEntityRenderer.java namedSrc/net/minecraft/client/render/entity/WolfEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/WolfEntityRenderer.java	2024-03-19 16:58:04.447252986 +0000
+++ namedSrc/net/minecraft/client/render/entity/WolfEntityRenderer.java	2024-03-19 16:56:55.111263340 +0000
@@ -3,12 +3,12 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.entity.feature.WolfArmorFeatureRenderer;
 import net.minecraft.client.render.entity.feature.WolfCollarFeatureRenderer;
 import net.minecraft.client.render.entity.model.EntityModelLayers;
 import net.minecraft.client.render.entity.model.WolfEntityModel;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.passive.WolfEntity;
-import net.minecraft.unmapped.C_hznbnyph;
 import net.minecraft.util.Identifier;
 
 /**
@@ -22,7 +22,7 @@
     */
    public WolfEntityRenderer(EntityRendererFactory.Context arg) {
       super(arg, new WolfEntityModel<>(arg.getPart(EntityModelLayers.WOLF)), 0.5F);
-      this.addFeature(new C_hznbnyph(this, arg.getModelLoader()));
+      this.addFeature(new WolfArmorFeatureRenderer(this, arg.getModelLoader()));
       this.addFeature(new WolfCollarFeatureRenderer(this));
    }
 
diff -bur namedTargetSrc/net/minecraft/client/util/telemetry/logging/JsonTelemetryEventLog.java namedSrc/net/minecraft/client/util/telemetry/logging/JsonTelemetryEventLog.java
--- namedTargetSrc/net/minecraft/client/util/telemetry/logging/JsonTelemetryEventLog.java	2024-03-19 16:58:04.431252985 +0000
+++ namedSrc/net/minecraft/client/util/telemetry/logging/JsonTelemetryEventLog.java	2024-03-19 16:56:55.087263337 +0000
@@ -119,7 +119,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed close Lnet/minecraft/unmapped/C_wtehsvxb;close()V}
+    * @mapping {@literal named close Lnet/minecraft/client/util/telemetry/logging/JsonTelemetryEventLog;close()V}
     */
    public void close() throws IOException {
       this.releaseReferenceAndClose();
diff -bur namedTargetSrc/net/minecraft/client/world/FlatWorldGeneratorPresets.java namedSrc/net/minecraft/client/world/FlatWorldGeneratorPresets.java
--- namedTargetSrc/net/minecraft/client/world/FlatWorldGeneratorPresets.java	2024-03-19 16:58:04.327252973 +0000
+++ namedSrc/net/minecraft/client/world/FlatWorldGeneratorPresets.java	2024-03-19 16:56:54.907263322 +0000
@@ -8,12 +8,12 @@
 import net.minecraft.block.Blocks;
 import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.Items;
+import net.minecraft.registry.BootstrapContext;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.HolderProvider;
 import net.minecraft.registry.HolderSet;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
-import net.minecraft.unmapped.C_hqoyyfco;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.Biomes;
@@ -76,9 +76,9 @@
 
    /**
     * @mapping {@literal hashed m_sybrxjpq Lnet/minecraft/unmapped/C_brlntonw;m_sybrxjpq(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
-    * @mapping {@literal named getHolder Lnet/minecraft/client/world/FlatWorldGeneratorPresets;getHolder(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
+    * @mapping {@literal named getHolder Lnet/minecraft/client/world/FlatWorldGeneratorPresets;getHolder(Lnet/minecraft/registry/BootstrapContext;)V}
     */
-   public static void getHolder(C_hqoyyfco<FlatWorldGeneratorPreset> context) {
+   public static void getHolder(BootstrapContext<FlatWorldGeneratorPreset> context) {
       new FlatWorldGeneratorPresets.Bootstrap(context).run();
    }
 
@@ -97,15 +97,15 @@
    static class Bootstrap {
       /**
        * @mapping {@literal hashed f_nevetevc Lnet/minecraft/unmapped/C_brlntonw$C_gyvjwgmv;f_nevetevc:Lnet/minecraft/unmapped/C_hqoyyfco;}
-       * @mapping {@literal named context Lnet/minecraft/client/world/FlatWorldGeneratorPresets$Bootstrap;context:Lnet/minecraft/unmapped/C_hqoyyfco;}
+       * @mapping {@literal named context Lnet/minecraft/client/world/FlatWorldGeneratorPresets$Bootstrap;context:Lnet/minecraft/registry/BootstrapContext;}
        */
-      private final C_hqoyyfco<FlatWorldGeneratorPreset> context;
+      private final BootstrapContext<FlatWorldGeneratorPreset> context;
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_brlntonw$C_gyvjwgmv;<init>(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
-       * @mapping {@literal named <init> Lnet/minecraft/client/world/FlatWorldGeneratorPresets$Bootstrap;<init>(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/client/world/FlatWorldGeneratorPresets$Bootstrap;<init>(Lnet/minecraft/registry/BootstrapContext;)V}
        */
-      Bootstrap(C_hqoyyfco<FlatWorldGeneratorPreset> context) {
+      Bootstrap(BootstrapContext<FlatWorldGeneratorPreset> context) {
          this.context = context;
       }
 
@@ -122,9 +122,9 @@
          boolean enableLakes,
          FlatChunkGeneratorLayer... generatorLayers
       ) {
-         HolderProvider<StructureSet> lv = this.context.m_cajjlsxn(RegistryKeys.STRUCTURE_SET);
-         HolderProvider<PlacedFeature> lv2 = this.context.m_cajjlsxn(RegistryKeys.PLACED_FEATURE);
-         HolderProvider<Biome> lv3 = this.context.m_cajjlsxn(RegistryKeys.BIOME);
+         HolderProvider<StructureSet> lv = this.context.getRegistryLookup(RegistryKeys.STRUCTURE_SET);
+         HolderProvider<PlacedFeature> lv2 = this.context.getRegistryLookup(RegistryKeys.PLACED_FEATURE);
+         HolderProvider<Biome> lv3 = this.context.getRegistryLookup(RegistryKeys.BIOME);
          HolderSet.DirectSet<StructureSet> lv4 = HolderSet.createDirect(
             (List<? extends Holder<StructureSet>>)structures.stream().map(lv::getHolderOrThrow).collect(Collectors.toList())
          );
@@ -141,7 +141,7 @@
             lv5.getLayers().add(generatorLayers[i]);
          }
 
-         this.context.m_pymxizhb(key, new FlatWorldGeneratorPreset(icon.asItem().getBuiltInRegistryHolder(), lv5));
+         this.context.register(key, new FlatWorldGeneratorPreset(icon.asItem().getBuiltInRegistryHolder(), lv5));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/world/GeneratorTypes.java namedSrc/net/minecraft/client/world/GeneratorTypes.java
--- namedTargetSrc/net/minecraft/client/world/GeneratorTypes.java	2024-03-19 16:58:04.543252998 +0000
+++ namedSrc/net/minecraft/client/world/GeneratorTypes.java	2024-03-19 16:56:55.283263354 +0000
@@ -2,12 +2,12 @@
 
 import java.util.Map;
 import java.util.Optional;
+import net.minecraft.registry.BootstrapContext;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.HolderProvider;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
-import net.minecraft.unmapped.C_hqoyyfco;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.Biomes;
@@ -68,9 +68,9 @@
 
    /**
     * @mapping {@literal hashed m_vtlthqfd Lnet/minecraft/unmapped/C_ogomnjoy;m_vtlthqfd(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
-    * @mapping {@literal named getHolder Lnet/minecraft/client/world/GeneratorTypes;getHolder(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
+    * @mapping {@literal named getHolder Lnet/minecraft/client/world/GeneratorTypes;getHolder(Lnet/minecraft/registry/BootstrapContext;)V}
     */
-   public static void getHolder(C_hqoyyfco<GeneratorType> context) {
+   public static void getHolder(BootstrapContext<GeneratorType> context) {
       new GeneratorTypes.Bootstrap(context).bootstrap();
    }
 
@@ -120,9 +120,9 @@
    static class Bootstrap {
       /**
        * @mapping {@literal hashed f_feuzwykz Lnet/minecraft/unmapped/C_ogomnjoy$C_fhucecjz;f_feuzwykz:Lnet/minecraft/unmapped/C_hqoyyfco;}
-       * @mapping {@literal named context Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;context:Lnet/minecraft/unmapped/C_hqoyyfco;}
+       * @mapping {@literal named context Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;context:Lnet/minecraft/registry/BootstrapContext;}
        */
-      private final C_hqoyyfco<GeneratorType> context;
+      private final BootstrapContext<GeneratorType> context;
       /**
        * @mapping {@literal hashed f_lczxbtbb Lnet/minecraft/unmapped/C_ogomnjoy$C_fhucecjz;f_lczxbtbb:Lnet/minecraft/unmapped/C_pzdchrcy;}
        * @mapping {@literal named chunkGeneratorSettings Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;chunkGeneratorSettings:Lnet/minecraft/registry/HolderProvider;}
@@ -166,16 +166,16 @@
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ogomnjoy$C_fhucecjz;<init>(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
-       * @mapping {@literal named <init> Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;<init>(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;<init>(Lnet/minecraft/registry/BootstrapContext;)V}
        */
-      Bootstrap(C_hqoyyfco<GeneratorType> context) {
+      Bootstrap(BootstrapContext<GeneratorType> context) {
          this.context = context;
-         HolderProvider<DimensionType> lv = context.m_cajjlsxn(RegistryKeys.DIMENSION_TYPE);
-         this.chunkGeneratorSettings = context.m_cajjlsxn(RegistryKeys.CHUNK_GENERATOR_SETTINGS);
-         this.biome = context.m_cajjlsxn(RegistryKeys.BIOME);
-         this.placedFeature = context.m_cajjlsxn(RegistryKeys.PLACED_FEATURE);
-         this.structureSets = context.m_cajjlsxn(RegistryKeys.STRUCTURE_SET);
-         this.multiNoiseBiomeSourceParameterList = context.m_cajjlsxn(RegistryKeys.MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST);
+         HolderProvider<DimensionType> lv = context.getRegistryLookup(RegistryKeys.DIMENSION_TYPE);
+         this.chunkGeneratorSettings = context.getRegistryLookup(RegistryKeys.CHUNK_GENERATOR_SETTINGS);
+         this.biome = context.getRegistryLookup(RegistryKeys.BIOME);
+         this.placedFeature = context.getRegistryLookup(RegistryKeys.PLACED_FEATURE);
+         this.structureSets = context.getRegistryLookup(RegistryKeys.STRUCTURE_SET);
+         this.multiNoiseBiomeSourceParameterList = context.getRegistryLookup(RegistryKeys.MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST);
          this.overworld = lv.getHolderOrThrow(DimensionTypes.OVERWORLD);
          Holder<DimensionType> lv2 = lv.getHolderOrThrow(DimensionTypes.THE_NETHER);
          Holder<ChunkGeneratorSettings> lv3 = this.chunkGeneratorSettings.getHolderOrThrow(ChunkGeneratorSettings.NETHER);
@@ -218,7 +218,7 @@
        * @mapping {@literal named addDimensionGenerator Lnet/minecraft/client/world/GeneratorTypes$Bootstrap;addDimensionGenerator(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/world/dimension/DimensionOptions;)V}
        */
       private void addDimensionGenerator(RegistryKey<GeneratorType> generator, DimensionOptions dimension) {
-         this.context.m_pymxizhb(generator, this.createType(dimension));
+         this.context.register(generator, this.createType(dimension));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/data/Main.java namedSrc/net/minecraft/data/Main.java
--- namedTargetSrc/net/minecraft/data/Main.java	2024-03-19 16:58:04.419252984 +0000
+++ namedSrc/net/minecraft/data/Main.java	2024-03-19 16:56:55.067263336 +0000
@@ -19,8 +19,10 @@
 import net.minecraft.data.report.BiomeParametersProvider;
 import net.minecraft.data.report.BlockListProvider;
 import net.minecraft.data.report.CommandSyntaxProvider;
+import net.minecraft.data.report.ItemListProvider;
 import net.minecraft.data.report.RegistriesDataPackProvider;
 import net.minecraft.data.report.RegistryDumpProvider;
+import net.minecraft.data.server.OneTwentyOneAdventureAdvancementsProvider;
 import net.minecraft.data.server.VanillaAdvancementsProvider;
 import net.minecraft.data.server.VanillaLootTableProvider;
 import net.minecraft.data.server.VanillaRecipesProvider;
@@ -44,8 +46,11 @@
 import net.minecraft.data.server.tag.PaintingTagProvider;
 import net.minecraft.data.server.tag.PoiTagProvider;
 import net.minecraft.data.server.tag.WorldPresetTagProvider;
+import net.minecraft.data.server.tag.one_twenty_one.OneTwentyOneBannerTagProvider;
 import net.minecraft.data.server.tag.one_twenty_one.OneTwentyOneBiomeTagProvider;
 import net.minecraft.data.server.tag.one_twenty_one.OneTwentyOneBlockTagProvider;
+import net.minecraft.data.server.tag.one_twenty_one.OneTwentyOneDamageTypeTagProvider;
+import net.minecraft.data.server.tag.one_twenty_one.OneTwentyOneEntityTypeTagProvider;
 import net.minecraft.data.server.tag.one_twenty_one.OneTwentyOneItemTagProvider;
 import net.minecraft.data.validate.StructureValidatorProvider;
 import net.minecraft.feature_flags.FeatureFlagBitSet;
@@ -58,11 +63,6 @@
 import net.minecraft.registry.VanillaDynamicRegistries;
 import net.minecraft.registry.tag.StructureTagsProvider;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_fhipkyzt;
-import net.minecraft.unmapped.C_jtuqxqpc;
-import net.minecraft.unmapped.C_mmcppaqq;
-import net.minecraft.unmapped.C_pfkoukpo;
-import net.minecraft.unmapped.C_qugiptdx;
 import net.minecraft.util.Util;
 import net.minecraft.world.biome.Biome;
 
@@ -171,7 +171,7 @@
       lv4.addProvider(outputx -> new NbtProvider(outputx, inputs));
       lv4 = lv.createVanillaPack(includeReports);
       lv4.addProvider(createFactory(BiomeParametersProvider::new, completableFuture));
-      lv4.addProvider(createFactory(C_pfkoukpo::new, completableFuture));
+      lv4.addProvider(createFactory(ItemListProvider::new, completableFuture));
       lv4.addProvider(createFactory(BlockListProvider::new, completableFuture));
       lv4.addProvider(createFactory(CommandSyntaxProvider::new, completableFuture));
       lv4.addProvider(RegistryDumpProvider::new);
@@ -200,10 +200,10 @@
       lv13.addProvider(
          arg -> PackMetadataProvider.create(arg, Text.translatable("dataPack.update_1_21.description"), FeatureFlagBitSet.ofFlag(FeatureFlags.UPDATE_1_21))
       );
-      lv13.addProvider(createFactory(C_mmcppaqq::new, completableFuture3));
-      lv13.addProvider(createFactory(C_qugiptdx::new, completableFuture3));
-      lv13.addProvider(createFactory(C_fhipkyzt::m_acridfqq, completableFuture3));
-      lv13.addProvider(arg2 -> new C_jtuqxqpc(arg2, completableFuture3, lv8.getTagLookupFuture()));
+      lv13.addProvider(createFactory(OneTwentyOneEntityTypeTagProvider::new, completableFuture3));
+      lv13.addProvider(createFactory(OneTwentyOneDamageTypeTagProvider::new, completableFuture3));
+      lv13.addProvider(createFactory(OneTwentyOneAdventureAdvancementsProvider::create, completableFuture3));
+      lv13.addProvider(arg2 -> new OneTwentyOneBannerTagProvider(arg2, completableFuture3, lv8.getTagLookupFuture()));
       return lv;
    }
 }
Only in namedSrc/net/minecraft/data/report: ItemListProvider.java
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-03-19 16:58:04.499252992 +0000
+++ namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2024-03-19 16:56:55.203263347 +0000
@@ -57,6 +57,7 @@
 import net.minecraft.predicate.entity.DistancePredicate;
 import net.minecraft.predicate.entity.EntityEquipmentPredicate;
 import net.minecraft.predicate.entity.EntityPredicate;
+import net.minecraft.predicate.entity.LightningBoltPredicate;
 import net.minecraft.predicate.entity.LocationPredicate;
 import net.minecraft.predicate.item.ItemPredicate;
 import net.minecraft.registry.HolderLookup;
@@ -69,7 +70,6 @@
 import net.minecraft.registry.tag.EntityTypeTags;
 import net.minecraft.registry.tag.ItemTags;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_pdvqqjua;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.village.raid.Raid;
@@ -154,7 +154,7 @@
          Optional.of(
             EntityPredicate.Builder.create()
                .distance(DistancePredicate.absolute(NumberRange.FloatRange.atMost(30.0)))
-               .typeSpecific(C_pdvqqjua.m_zguibuqp(range))
+               .typeSpecific(LightningBoltPredicate.m_zguibuqp(range))
                .build()
          ),
          entityPredicate
Only in namedSrc/net/minecraft/data/server/loot/one_twenty_one: OneTwentyOneChestLootTableProvider.java
Only in namedSrc/net/minecraft/data/server/loot/one_twenty_one: OneTwentyOneEntityLootTableProvider.java
diff -bur namedTargetSrc/net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneLootTableProviders.java namedSrc/net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneLootTableProviders.java
--- namedTargetSrc/net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneLootTableProviders.java	2024-03-19 16:58:04.451252987 +0000
+++ namedSrc/net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneLootTableProviders.java	2024-03-19 16:56:55.119263339 +0000
@@ -7,9 +7,6 @@
 import net.minecraft.data.server.LootTablesProvider;
 import net.minecraft.loot.context.LootContextTypes;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_kbczphds;
-import net.minecraft.unmapped.C_lnzuulfo;
-import net.minecraft.unmapped.C_vvwjviqg;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_omgzuwzx}
@@ -26,9 +23,9 @@
          Set.of(),
          List.of(
             new LootTablesProvider.GeneratorEntry(OneTwentyOneBlockLootTableProvider::new, LootContextTypes.BLOCK),
-            new LootTablesProvider.GeneratorEntry(C_lnzuulfo::new, LootContextTypes.CHEST),
-            new LootTablesProvider.GeneratorEntry(C_kbczphds::new, LootContextTypes.ENTITY),
-            new LootTablesProvider.GeneratorEntry(C_vvwjviqg::new, LootContextTypes.SHEARING)
+            new LootTablesProvider.GeneratorEntry(OneTwentyOneChestLootTableProvider::new, LootContextTypes.CHEST),
+            new LootTablesProvider.GeneratorEntry(OneTwentyOneEntityLootTableProvider::new, LootContextTypes.ENTITY),
+            new LootTablesProvider.GeneratorEntry(OneTwentyOneShearingLootTableProvider::new, LootContextTypes.SHEARING)
          ),
          completableFuture
       );
Only in namedSrc/net/minecraft/data/server/loot/one_twenty_one: OneTwentyOneShearingLootTableProvider.java
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java	2024-03-19 16:58:04.311252972 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java	2024-03-19 16:56:54.883263320 +0000
@@ -44,6 +44,7 @@
 import net.minecraft.loot.entry.LeafEntry;
 import net.minecraft.loot.entry.LootPoolEntry;
 import net.minecraft.loot.function.ApplyBonusLootFunction;
+import net.minecraft.loot.function.CopyComponentsLootFunction;
 import net.minecraft.loot.function.CopyStateFunction;
 import net.minecraft.loot.function.ExplosionDecayLootFunction;
 import net.minecraft.loot.function.LimitCountLootFunction;
@@ -65,7 +66,6 @@
 import net.minecraft.state.property.Property;
 import net.minecraft.unmapped.C_idgyzprx;
 import net.minecraft.unmapped.C_loxplxmp;
-import net.minecraft.unmapped.C_mbgfajkg;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.StringIdentifiable;
 import net.minecraft.util.math.BlockPos;
@@ -319,7 +319,12 @@
                drop,
                LootPool.builder()
                   .rolls(ConstantLootNumberProvider.create(1.0F))
-                  .with(ItemEntry.builder(drop).apply(C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(DataComponentTypes.CUSTOM_NAME)))
+                  .with(
+                     ItemEntry.builder(drop)
+                        .apply(
+                           CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(DataComponentTypes.CUSTOM_NAME)
+                        )
+                  )
             )
          );
    }
@@ -338,7 +343,7 @@
                   .with(
                      ItemEntry.builder(drop)
                         .apply(
-                           C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY)
+                           CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY)
                               .m_oxbhxepz(DataComponentTypes.CUSTOM_NAME)
                               .m_oxbhxepz(DataComponentTypes.CONTAINER)
                               .m_oxbhxepz(DataComponentTypes.LOCK)
@@ -411,7 +416,7 @@
                   .with(
                      ItemEntry.builder(drop)
                         .apply(
-                           C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY)
+                           CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY)
                               .m_oxbhxepz(DataComponentTypes.CUSTOM_NAME)
                               .m_oxbhxepz(DataComponentTypes.BANNER_PATTERNS)
                         )
@@ -432,7 +437,7 @@
                .rolls(ConstantLootNumberProvider.create(1.0F))
                .with(
                   ItemEntry.builder(drop)
-                     .apply(C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(DataComponentTypes.BEES))
+                     .apply(CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(DataComponentTypes.BEES))
                      .apply(CopyStateFunction.getBuilder(drop).addProperty(BeehiveBlock.HONEY_LEVEL))
                )
          );
@@ -450,7 +455,7 @@
                .with(
                   ItemEntry.builder(drop)
                      .conditionally(WITH_SILK_TOUCH)
-                     .apply(C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(DataComponentTypes.BEES))
+                     .apply(CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(DataComponentTypes.BEES))
                      .apply(CopyStateFunction.getBuilder(drop).addProperty(BeehiveBlock.HONEY_LEVEL))
                      .alternatively(ItemEntry.builder(drop))
                )
Only in namedSrc/net/minecraft/data/server/loot_table: ShearingLootTableGenerator.java
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java	2024-03-19 16:58:04.431252985 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java	2024-03-19 16:56:55.087263337 +0000
@@ -45,6 +45,7 @@
 import net.minecraft.loot.entry.LeafEntry;
 import net.minecraft.loot.entry.LootPoolEntry;
 import net.minecraft.loot.function.ApplyBonusLootFunction;
+import net.minecraft.loot.function.CopyComponentsLootFunction;
 import net.minecraft.loot.function.LimitCountLootFunction;
 import net.minecraft.loot.function.SetCountLootFunction;
 import net.minecraft.loot.operator.BoundedIntUnaryOperator;
@@ -53,7 +54,6 @@
 import net.minecraft.predicate.StatePredicate;
 import net.minecraft.predicate.item.ItemPredicate;
 import net.minecraft.registry.tag.ItemTags;
-import net.minecraft.unmapped.C_mbgfajkg;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_nmrxwpfa}
@@ -1001,7 +1001,7 @@
                         .with(
                            ItemEntry.builder(block)
                               .apply(
-                                 C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY)
+                                 CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY)
                                     .m_oxbhxepz(DataComponentTypes.PROFILE)
                                     .m_oxbhxepz(DataComponentTypes.NOTE_BLOCK_SOUND)
                                     .m_oxbhxepz(DataComponentTypes.CUSTOM_NAME)
@@ -1468,7 +1468,11 @@
                         BlockStatePropertyLootCondition.builder(pot).properties(StatePredicate.Builder.create().exactMatch(DecoratedPotBlock.CRACKED, true))
                      )
                      .alternatively(
-                        ItemEntry.builder(pot).apply(C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(DataComponentTypes.POT_DECORATIONS))
+                        ItemEntry.builder(pot)
+                           .apply(
+                              CopyComponentsLootFunction.m_tzmfkrqo(CopyComponentsLootFunction.C_zcqyfuyv.BLOCK_ENTITY)
+                                 .m_oxbhxepz(DataComponentTypes.POT_DECORATIONS)
+                           )
                      )
                )
          );
Only in namedSrc/net/minecraft/data/server: OneTwentyOneAdventureAdvancementsProvider.java
Only in namedSrc/net/minecraft/data/server/tag/one_twenty_one: OneTwentyOneBannerTagProvider.java
Only in namedSrc/net/minecraft/data/server/tag/one_twenty_one: OneTwentyOneDamageTypeTagProvider.java
Only in namedSrc/net/minecraft/data/server/tag/one_twenty_one: OneTwentyOneEntityTypeTagProvider.java
diff -bur namedTargetSrc/net/minecraft/data/server/VanillaLootTableProvider.java namedSrc/net/minecraft/data/server/VanillaLootTableProvider.java
--- namedTargetSrc/net/minecraft/data/server/VanillaLootTableProvider.java	2024-03-19 16:58:04.539252997 +0000
+++ namedSrc/net/minecraft/data/server/VanillaLootTableProvider.java	2024-03-19 16:56:55.279263354 +0000
@@ -8,12 +8,12 @@
 import net.minecraft.data.server.loot_table.ChestLootTableGenerator;
 import net.minecraft.data.server.loot_table.FishingLootTableGenerator;
 import net.minecraft.data.server.loot_table.GiftLootTableGenerator;
+import net.minecraft.data.server.loot_table.ShearingLootTableGenerator;
 import net.minecraft.data.server.loot_table.VanillaBlockLootTableGenerator;
 import net.minecraft.data.server.loot_table.VanillaEntityLootTableGenerator;
 import net.minecraft.loot.LootTables;
 import net.minecraft.loot.context.LootContextTypes;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_cmwiiqcn;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_vfvrndvd}
@@ -36,7 +36,7 @@
             new LootTablesProvider.GeneratorEntry(BarteringLootTableGenerator::new, LootContextTypes.BARTER),
             new LootTablesProvider.GeneratorEntry(GiftLootTableGenerator::new, LootContextTypes.GIFT),
             new LootTablesProvider.GeneratorEntry(ArchaeologyLootTableGenerator::new, LootContextTypes.ARCHAEOLOGY),
-            new LootTablesProvider.GeneratorEntry(C_cmwiiqcn::new, LootContextTypes.SHEARING)
+            new LootTablesProvider.GeneratorEntry(ShearingLootTableGenerator::new, LootContextTypes.SHEARING)
          ),
          completableFuture
       );
Only in namedSrc/net/minecraft/datafixer: DataFixUtil.java
Only in namedSrc/net/minecraft/datafixer/fix: AreaEffectCloudPotionFix.java
Only in namedSrc/net/minecraft/datafixer/fix: BannerPatternFormatFix.java
Only in namedSrc/net/minecraft/datafixer/fix: BeehiveFieldRenameFix.java
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/BlockNameFix.java namedSrc/net/minecraft/datafixer/fix/BlockNameFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/BlockNameFix.java	2024-03-19 16:58:04.347252976 +0000
+++ namedSrc/net/minecraft/datafixer/fix/BlockNameFix.java	2024-03-19 16:56:54.935263325 +0000
@@ -35,7 +35,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed makeRule Lnet/minecraft/unmapped/C_wdyzpagx;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
+    * @mapping {@literal named makeRule Lnet/minecraft/datafixer/fix/BlockNameFix;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
     */
    @Override
    public TypeRewriteRule makeRule() {
Only in namedSrc/net/minecraft/datafixer/fix: BlockPosFormatFix.java
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/DragonFightFix.java namedSrc/net/minecraft/datafixer/fix/DragonFightFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/DragonFightFix.java	2024-03-19 16:58:04.379252979 +0000
+++ namedSrc/net/minecraft/datafixer/fix/DragonFightFix.java	2024-03-19 16:56:54.995263329 +0000
@@ -6,8 +6,8 @@
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.serialization.Dynamic;
 import com.mojang.serialization.OptionalDynamic;
+import net.minecraft.datafixer.DataFixUtil;
 import net.minecraft.datafixer.TypeReferences;
-import net.minecraft.unmapped.C_qfhcarfn;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_jmkyavdl}
@@ -27,7 +27,7 @@
     * @mapping {@literal named m_fsyhosak Lnet/minecraft/datafixer/fix/DragonFightFix;m_fsyhosak(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
    private static <T> Dynamic<T> m_fsyhosak(Dynamic<T> dynamic) {
-      return dynamic.update("ExitPortalLocation", C_qfhcarfn::m_jhmddjog);
+      return dynamic.update("ExitPortalLocation", DataFixUtil::m_jhmddjog);
    }
 
    /**
Only in namedSrc/net/minecraft/datafixer/fix: EmptyItemInHotbarFix.java
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.java namedSrc/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.java	2024-03-19 16:58:04.535252996 +0000
+++ namedSrc/net/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix.java	2024-03-19 16:56:55.271263353 +0000
@@ -4,8 +4,8 @@
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.serialization.Dynamic;
+import net.minecraft.datafixer.DataFixUtil;
 import net.minecraft.datafixer.TypeReferences;
-import net.minecraft.unmapped.C_qfhcarfn;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_nriknjji}
@@ -25,7 +25,7 @@
     * @mapping {@literal named renameFields Lnet/minecraft/datafixer/fix/EntityBrushableBlockFieldsRenameFix;renameFields(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
    public Dynamic<?> renameFields(Dynamic<?> dynamic) {
-      return C_qfhcarfn.m_mvjxeaky(C_qfhcarfn.m_mvjxeaky(dynamic, "loot_table", "LootTable"), "loot_table_seed", "LootTableSeed");
+      return DataFixUtil.m_mvjxeaky(DataFixUtil.m_mvjxeaky(dynamic, "loot_table", "LootTable"), "loot_table_seed", "LootTableSeed");
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.java namedSrc/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.java	2024-03-19 16:58:04.503252993 +0000
+++ namedSrc/net/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix.java	2024-03-19 16:56:55.211263347 +0000
@@ -4,8 +4,8 @@
 import com.mojang.datafixers.Typed;
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.serialization.Dynamic;
+import net.minecraft.datafixer.DataFixUtil;
 import net.minecraft.datafixer.TypeReferences;
-import net.minecraft.unmapped.C_qfhcarfn;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_zpzqnpki}
@@ -25,7 +25,7 @@
     * @mapping {@literal named rename Lnet/minecraft/datafixer/fix/EntityPaintingFieldsRenameFix;rename(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
    public Dynamic<?> rename(Dynamic<?> dynamic) {
-      return C_qfhcarfn.m_mvjxeaky(C_qfhcarfn.m_mvjxeaky(dynamic, "Motive", "variant"), "Facing", "facing");
+      return DataFixUtil.m_mvjxeaky(DataFixUtil.m_mvjxeaky(dynamic, "Motive", "variant"), "Facing", "facing");
    }
 
    /**
Only in namedSrc/net/minecraft/datafixer/fix: HorseArmorFix.java
Only in namedSrc/net/minecraft/datafixer/fix: HorseChestIndexingFix.java
Only in namedSrc/net/minecraft/datafixer/fix: ItemStackComponentizationFix.java
Only in namedSrc/net/minecraft/datafixer/fix: ItemStackComponentRemainderFix.java
Only in namedSrc/net/minecraft/datafixer/fix: LodestoneCompassComponentFix.java
Only in namedSrc/net/minecraft/datafixer/fix: MapBannerBlockPosFormatFix.java
Only in namedSrc/net/minecraft/datafixer/fix: PlayerHeadBlockProfileFix.java
Only in namedSrc/net/minecraft/datafixer/fix: RenameEnchantmentFix.java

github-actions · 2024-03-19T16:58:07Z

View the diff here (2/3):

diff -bur namedTargetSrc/net/minecraft/datafixer/fix/StatusEffectFix.java namedSrc/net/minecraft/datafixer/fix/StatusEffectFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/StatusEffectFix.java	2024-03-19 16:58:04.339252975 +0000
+++ namedSrc/net/minecraft/datafixer/fix/StatusEffectFix.java	2024-03-19 16:56:54.931263324 +0000
@@ -16,9 +16,9 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Stream;
+import net.minecraft.datafixer.DataFixUtil;
 import net.minecraft.datafixer.TypeReferences;
 import net.minecraft.datafixer.schema.IdentifierNormalizingSchema;
-import net.minecraft.unmapped.C_qfhcarfn;
 import net.minecraft.util.Util;
 
 /**
@@ -93,7 +93,7 @@
     */
    private static <T> Dynamic<T> m_kycutuup(Dynamic<T> obj, String string, Dynamic<T> dynamic, String string2) {
       Optional<Dynamic<T>> optional = m_ghxxnzjz(obj, string);
-      return C_qfhcarfn.m_sshutfth(dynamic, string, string2, optional);
+      return DataFixUtil.m_sshutfth(dynamic, string, string2, optional);
    }
 
    /**
@@ -110,13 +110,13 @@
     */
    private static <T> Dynamic<T> m_bbhfqrvt(Dynamic<T> dynamic) {
       dynamic = m_dodadddq(dynamic, "Id", "id");
-      dynamic = C_qfhcarfn.m_mvjxeaky(dynamic, "Ambient", "ambient");
-      dynamic = C_qfhcarfn.m_mvjxeaky(dynamic, "Amplifier", "amplifier");
-      dynamic = C_qfhcarfn.m_mvjxeaky(dynamic, "Duration", "duration");
-      dynamic = C_qfhcarfn.m_mvjxeaky(dynamic, "ShowParticles", "show_particles");
-      dynamic = C_qfhcarfn.m_mvjxeaky(dynamic, "ShowIcon", "show_icon");
+      dynamic = DataFixUtil.m_mvjxeaky(dynamic, "Ambient", "ambient");
+      dynamic = DataFixUtil.m_mvjxeaky(dynamic, "Amplifier", "amplifier");
+      dynamic = DataFixUtil.m_mvjxeaky(dynamic, "Duration", "duration");
+      dynamic = DataFixUtil.m_mvjxeaky(dynamic, "ShowParticles", "show_particles");
+      dynamic = DataFixUtil.m_mvjxeaky(dynamic, "ShowIcon", "show_icon");
       Optional<Dynamic<T>> optional = dynamic.get("HiddenEffect").result().map(StatusEffectFix::m_bbhfqrvt);
-      return C_qfhcarfn.m_sshutfth(dynamic, "HiddenEffect", "hidden_effect", optional);
+      return DataFixUtil.m_sshutfth(dynamic, "HiddenEffect", "hidden_effect", optional);
    }
 
    /**
@@ -125,7 +125,7 @@
     */
    private static <T> Dynamic<T> m_jmpqvnnk(Dynamic<T> dynamic, String string, String string2) {
       Optional<Dynamic<T>> optional = dynamic.get(string).asStreamOpt().result().map(stream -> dynamic.createList(stream.map(StatusEffectFix::m_bbhfqrvt)));
-      return C_qfhcarfn.m_sshutfth(dynamic, string, string2, optional);
+      return DataFixUtil.m_sshutfth(dynamic, string, string2, optional);
    }
 
    /**
@@ -135,7 +135,7 @@
    private static <T> Dynamic<T> m_rutigsbd(Dynamic<T> obj, Dynamic<T> dynamic) {
       dynamic = m_kycutuup(obj, "EffectId", dynamic, "id");
       Optional<Dynamic<T>> optional = obj.get("EffectDuration").result();
-      return C_qfhcarfn.m_sshutfth(dynamic, "EffectDuration", "duration", optional);
+      return DataFixUtil.m_sshutfth(dynamic, "EffectDuration", "duration", optional);
    }
 
    /**
@@ -233,7 +233,7 @@
     */
    private static <T> Dynamic<T> m_ylpmhcrq(Dynamic<T> dynamic) {
       Optional<Dynamic<T>> optional = dynamic.get("Effects").asStreamOpt().result().map(stream -> dynamic.createList(stream.map(StatusEffectFix::m_aekevbgy)));
-      return C_qfhcarfn.m_sshutfth(dynamic, "Effects", "effects", optional);
+      return DataFixUtil.m_sshutfth(dynamic, "Effects", "effects", optional);
    }
 
    /**
Only in namedSrc/net/minecraft/datafixer/fix: TippedArrowPotionToItemFix.java
Only in namedSrc/net/minecraft/datafixer/fix: WolfHealthFix.java
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema1022.java namedSrc/net/minecraft/datafixer/schema/Schema1022.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema1022.java	2024-03-19 16:58:04.327252973 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema1022.java	2024-03-19 16:56:54.907263322 +0000
@@ -6,8 +6,8 @@
 import com.mojang.datafixers.util.Pair;
 import java.util.Map;
 import java.util.function.Supplier;
+import net.minecraft.datafixer.DataFixUtil;
 import net.minecraft.datafixer.TypeReferences;
-import net.minecraft.unmapped.C_qfhcarfn;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_aqeheirb}
@@ -33,7 +33,7 @@
       schema.registerType(
          false,
          TypeReferences.PLAYER,
-         () -> C_qfhcarfn.m_lwiilffr(
+         () -> DataFixUtil.optionalFields(
                Pair.of("RootVehicle", DSL.optionalFields("Entity", TypeReferences.ENTITY_TREE.in(schema))),
                Pair.of("Inventory", DSL.list(TypeReferences.ITEM_STACK.in(schema))),
                Pair.of("EnderItems", DSL.list(TypeReferences.ITEM_STACK.in(schema))),
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema102.java namedSrc/net/minecraft/datafixer/schema/Schema102.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema102.java	2024-03-19 16:58:04.435252986 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema102.java	2024-03-19 16:56:55.095263338 +0000
@@ -7,8 +7,8 @@
 import com.mojang.datafixers.util.Pair;
 import java.util.Map;
 import java.util.function.Supplier;
+import net.minecraft.datafixer.DataFixUtil;
 import net.minecraft.datafixer.TypeReferences;
-import net.minecraft.unmapped.C_qfhcarfn;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_gqvnagij}
@@ -38,7 +38,7 @@
                   "id",
                   TypeReferences.ITEM_NAME.in(schema),
                   "tag",
-                  C_qfhcarfn.m_lwiilffr(
+                  DataFixUtil.optionalFields(
                      Pair.of("EntityTag", TypeReferences.ENTITY_TREE.in(schema)),
                      Pair.of("BlockEntityTag", TypeReferences.BLOCK_ENTITY.in(schema)),
                      Pair.of("CanDestroy", DSL.list(TypeReferences.BLOCK_NAME.in(schema))),
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema1451v6.java namedSrc/net/minecraft/datafixer/schema/Schema1451v6.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema1451v6.java	2024-03-19 16:58:04.447252986 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema1451v6.java	2024-03-19 16:56:55.111263340 +0000
@@ -13,8 +13,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Supplier;
+import net.minecraft.datafixer.DataFixUtil;
 import net.minecraft.datafixer.TypeReferences;
-import net.minecraft.unmapped.C_qfhcarfn;
 import net.minecraft.util.Identifier;
 
 /**
@@ -131,7 +131,7 @@
          TypeReferences.STATS,
          () -> DSL.optionalFields(
                "stats",
-               C_qfhcarfn.m_lwiilffr(
+               DataFixUtil.optionalFields(
                   Pair.of("minecraft:mined", DSL.compoundList(TypeReferences.BLOCK_NAME.in(schema), DSL.constType(DSL.intType()))),
                   Pair.of("minecraft:crafted", (TypeTemplate)supplier.get()),
                   Pair.of("minecraft:used", (TypeTemplate)supplier.get()),
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema1460.java namedSrc/net/minecraft/datafixer/schema/Schema1460.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema1460.java	2024-03-19 16:58:04.391252981 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema1460.java	2024-03-19 16:56:55.015263331 +0000
@@ -9,8 +9,8 @@
 import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import net.minecraft.datafixer.DataFixUtil;
 import net.minecraft.datafixer.TypeReferences;
-import net.minecraft.unmapped.C_qfhcarfn;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_zvehxbog}
@@ -288,7 +288,7 @@
       schema.registerType(
          false,
          TypeReferences.PLAYER,
-         () -> C_qfhcarfn.m_lwiilffr(
+         () -> DataFixUtil.optionalFields(
                Pair.of("RootVehicle", DSL.optionalFields("Entity", TypeReferences.ENTITY_TREE.in(schema))),
                Pair.of("Inventory", DSL.list(TypeReferences.ITEM_STACK.in(schema))),
                Pair.of("EnderItems", DSL.list(TypeReferences.ITEM_STACK.in(schema))),
@@ -332,7 +332,7 @@
                   "id",
                   TypeReferences.ITEM_NAME.in(schema),
                   "tag",
-                  C_qfhcarfn.m_lwiilffr(
+                  DataFixUtil.optionalFields(
                      Pair.of("EntityTag", TypeReferences.ENTITY_TREE.in(schema)),
                      Pair.of("BlockEntityTag", TypeReferences.BLOCK_ENTITY.in(schema)),
                      Pair.of("CanDestroy", DSL.list(TypeReferences.BLOCK_NAME.in(schema))),
@@ -369,7 +369,7 @@
          TypeReferences.STATS,
          () -> DSL.optionalFields(
                "stats",
-               C_qfhcarfn.m_lwiilffr(
+               DataFixUtil.optionalFields(
                   Pair.of("minecraft:mined", DSL.compoundList(TypeReferences.BLOCK_NAME.in(schema), DSL.constType(DSL.intType()))),
                   Pair.of("minecraft:crafted", (TypeTemplate)supplier.get()),
                   Pair.of("minecraft:used", (TypeTemplate)supplier.get()),
@@ -438,6 +438,6 @@
       schema.registerType(false, TypeReferences.POI_CHUNK, DSL::remainder);
       schema.registerType(false, TypeReferences.CHUNK_GENERATOR_SETTINGS, DSL::remainder);
       schema.registerType(false, TypeReferences.ENTITY_CHUNK, () -> DSL.optionalFields("Entities", DSL.list(TypeReferences.ENTITY_TREE.in(schema))));
-      schema.registerType(true, TypeReferences.f_etntycyl, DSL::remainder);
+      schema.registerType(true, TypeReferences.DATA_COMPONENTS, DSL::remainder);
    }
 }
Only in namedSrc/net/minecraft/datafixer/schema: Schema3807.java
Only in namedSrc/net/minecraft/datafixer/schema: Schema3808.java
Only in namedSrc/net/minecraft/datafixer/schema: Schema3808v1.java
Only in namedSrc/net/minecraft/datafixer/schema: Schema3816.java
Only in namedSrc/net/minecraft/datafixer/schema: Schema3818.java
Only in namedSrc/net/minecraft/datafixer/schema: Schema3818v3.java
Only in namedSrc/net/minecraft/datafixer/schema: Schema3818v4.java
Only in namedSrc/net/minecraft/datafixer/schema: Schema3822.java
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema704.java namedSrc/net/minecraft/datafixer/schema/Schema704.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema704.java	2024-03-19 16:58:04.375252980 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema704.java	2024-03-19 16:56:54.987263328 +0000
@@ -16,8 +16,8 @@
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import net.minecraft.datafixer.DataFixUtil;
 import net.minecraft.datafixer.TypeReferences;
-import net.minecraft.unmapped.C_qfhcarfn;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_tbgpzqax}
@@ -248,7 +248,7 @@
                   "id",
                   TypeReferences.ITEM_NAME.in(schema),
                   "tag",
-                  C_qfhcarfn.m_lwiilffr(
+                  DataFixUtil.optionalFields(
                      Pair.of("EntityTag", TypeReferences.ENTITY_TREE.in(schema)),
                      Pair.of("BlockEntityTag", TypeReferences.BLOCK_ENTITY.in(schema)),
                      Pair.of("CanDestroy", DSL.list(TypeReferences.BLOCK_NAME.in(schema))),
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema705.java namedSrc/net/minecraft/datafixer/schema/Schema705.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema705.java	2024-03-19 16:58:04.443252987 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema705.java	2024-03-19 16:56:55.103263339 +0000
@@ -12,8 +12,8 @@
 import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import net.minecraft.datafixer.DataFixUtil;
 import net.minecraft.datafixer.TypeReferences;
-import net.minecraft.unmapped.C_qfhcarfn;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_gguawzfn}
@@ -360,7 +360,7 @@
                   "id",
                   TypeReferences.ITEM_NAME.in(schema),
                   "tag",
-                  C_qfhcarfn.m_lwiilffr(
+                  DataFixUtil.optionalFields(
                      Pair.of("EntityTag", TypeReferences.ENTITY_TREE.in(schema)),
                      Pair.of("BlockEntityTag", TypeReferences.BLOCK_ENTITY.in(schema)),
                      Pair.of("CanDestroy", DSL.list(TypeReferences.BLOCK_NAME.in(schema))),
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema99.java namedSrc/net/minecraft/datafixer/schema/Schema99.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema99.java	2024-03-19 16:58:04.519252994 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema99.java	2024-03-19 16:56:55.235263350 +0000
@@ -13,8 +13,8 @@
 import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import net.minecraft.datafixer.DataFixUtil;
 import net.minecraft.datafixer.TypeReferences;
-import net.minecraft.unmapped.C_qfhcarfn;
 import org.slf4j.Logger;
 
 /**
@@ -357,7 +357,7 @@
                   "id",
                   DSL.or(DSL.constType(DSL.intType()), TypeReferences.ITEM_NAME.in(schema)),
                   "tag",
-                  C_qfhcarfn.m_lwiilffr(
+                  DataFixUtil.optionalFields(
                      Pair.of("EntityTag", TypeReferences.ENTITY_TREE.in(schema)),
                      Pair.of("BlockEntityTag", TypeReferences.BLOCK_ENTITY.in(schema)),
                      Pair.of("CanDestroy", DSL.list(TypeReferences.BLOCK_NAME.in(schema))),
@@ -401,7 +401,7 @@
       schema.registerType(false, TypeReferences.POI_CHUNK, DSL::remainder);
       schema.registerType(false, TypeReferences.CHUNK_GENERATOR_SETTINGS, DSL::remainder);
       schema.registerType(false, TypeReferences.ENTITY_CHUNK, () -> DSL.optionalFields("Entities", DSL.list(TypeReferences.ENTITY_TREE.in(schema))));
-      schema.registerType(true, TypeReferences.f_etntycyl, DSL::remainder);
+      schema.registerType(true, TypeReferences.DATA_COMPONENTS, DSL::remainder);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/datafixer/Schemas.java namedSrc/net/minecraft/datafixer/Schemas.java
--- namedTargetSrc/net/minecraft/datafixer/Schemas.java	2024-03-19 16:58:04.483252991 +0000
+++ namedSrc/net/minecraft/datafixer/Schemas.java	2024-03-19 16:56:55.175263344 +0000
@@ -25,10 +25,13 @@
 import net.minecraft.datafixer.fix.AdvancementCriteriaRenameFix;
 import net.minecraft.datafixer.fix.AdvancementRenameFix;
 import net.minecraft.datafixer.fix.AdvancementsFix;
+import net.minecraft.datafixer.fix.AreaEffectCloudPotionFix;
 import net.minecraft.datafixer.fix.ArrowPickupFix;
+import net.minecraft.datafixer.fix.BannerPatternFormatFix;
 import net.minecraft.datafixer.fix.BedBlockEntityFix;
 import net.minecraft.datafixer.fix.BedItemColorFix;
 import net.minecraft.datafixer.fix.BeeHivePoiRenameFix;
+import net.minecraft.datafixer.fix.BeehiveFieldRenameFix;
 import net.minecraft.datafixer.fix.BiomeFormatFix;
 import net.minecraft.datafixer.fix.BiomesFix;
 import net.minecraft.datafixer.fix.BitStorageAlignFix;
@@ -46,6 +49,7 @@
 import net.minecraft.datafixer.fix.BlockEntityUuidFix;
 import net.minecraft.datafixer.fix.BlockNameFix;
 import net.minecraft.datafixer.fix.BlockNameFlatteningFix;
+import net.minecraft.datafixer.fix.BlockPosFormatFix;
 import net.minecraft.datafixer.fix.BlockStateStructureTemplateFix;
 import net.minecraft.datafixer.fix.BookFilteredTextRemovalFix;
 import net.minecraft.datafixer.fix.BritishShorthairCatVariantRenameFix;
@@ -67,6 +71,7 @@
 import net.minecraft.datafixer.fix.DecoratedPotFieldRenameFix;
 import net.minecraft.datafixer.fix.DragonFightFix;
 import net.minecraft.datafixer.fix.DropInvalidSignDataFix;
+import net.minecraft.datafixer.fix.EmptyItemInHotbarFix;
 import net.minecraft.datafixer.fix.EntityArmorStandSilentFix;
 import net.minecraft.datafixer.fix.EntityBlockStateFix;
 import net.minecraft.datafixer.fix.EntityBrushableBlockFieldsRenameFix;
@@ -105,6 +110,8 @@
 import net.minecraft.datafixer.fix.GoatHornIdFix;
 import net.minecraft.datafixer.fix.HangingEntityFix;
 import net.minecraft.datafixer.fix.HeightmapRenamingFix;
+import net.minecraft.datafixer.fix.HorseArmorFix;
+import net.minecraft.datafixer.fix.HorseChestIndexingFix;
 import net.minecraft.datafixer.fix.IglooMetadataRemovalFix;
 import net.minecraft.datafixer.fix.ItemBannerColorFix;
 import net.minecraft.datafixer.fix.ItemCustomNameToComponentFix;
@@ -118,6 +125,7 @@
 import net.minecraft.datafixer.fix.ItemRemoveBlockEntityTagFix;
 import net.minecraft.datafixer.fix.ItemShulkerBoxColorFix;
 import net.minecraft.datafixer.fix.ItemSpawnEggFix;
+import net.minecraft.datafixer.fix.ItemStackComponentizationFix;
 import net.minecraft.datafixer.fix.ItemStackEnchantmentFix;
 import net.minecraft.datafixer.fix.ItemStackUuidFix;
 import net.minecraft.datafixer.fix.ItemWaterPotionFix;
@@ -128,6 +136,8 @@
 import net.minecraft.datafixer.fix.LevelDataGeneratorOptionsFix;
 import net.minecraft.datafixer.fix.LevelFlatGeneratorInfoFix;
 import net.minecraft.datafixer.fix.LevelLegacyWorldGenSettingsFix;
+import net.minecraft.datafixer.fix.LodestoneCompassComponentFix;
+import net.minecraft.datafixer.fix.MapBannerBlockPosFormatFix;
 import net.minecraft.datafixer.fix.MapIdFix;
 import net.minecraft.datafixer.fix.MemoryExpiryDataFix;
 import net.minecraft.datafixer.fix.MissingDimensionFix;
@@ -149,6 +159,7 @@
 import net.minecraft.datafixer.fix.OptionsProgrammerArtFix;
 import net.minecraft.datafixer.fix.OverreachingTickFix;
 import net.minecraft.datafixer.fix.PersistentStateUuidFix;
+import net.minecraft.datafixer.fix.PlayerHeadBlockProfileFix;
 import net.minecraft.datafixer.fix.PlayerUuidFix;
 import net.minecraft.datafixer.fix.PointOfInterestRemovalFix;
 import net.minecraft.datafixer.fix.PointOfInterestReorganizationFix;
@@ -163,6 +174,7 @@
 import net.minecraft.datafixer.fix.RemoveFeatureFlagFix;
 import net.minecraft.datafixer.fix.RemoveGolemGossipFix;
 import net.minecraft.datafixer.fix.RemovePoiValidTagFix;
+import net.minecraft.datafixer.fix.RenameEnchantmentFix;
 import net.minecraft.datafixer.fix.RenameItemStackAttributesFix;
 import net.minecraft.datafixer.fix.RenameScoreboardDisplaySlotFix;
 import net.minecraft.datafixer.fix.SignFilteredTextRemovalFix;
@@ -176,6 +188,7 @@
 import net.minecraft.datafixer.fix.StructureSeparationDataFix;
 import net.minecraft.datafixer.fix.StructuresBecomeConfiguredFix;
 import net.minecraft.datafixer.fix.TeamDisplayNameFix;
+import net.minecraft.datafixer.fix.TippedArrowPotionToItemFix;
 import net.minecraft.datafixer.fix.UntaggedSpawnerFix;
 import net.minecraft.datafixer.fix.UpdateSignBlockEntityNbtFix;
 import net.minecraft.datafixer.fix.VillagerFollowRangeFix;
@@ -185,6 +198,7 @@
 import net.minecraft.datafixer.fix.VillagerXpRebuildFix;
 import net.minecraft.datafixer.fix.WallPropertyFix;
 import net.minecraft.datafixer.fix.WeaponSmithChestLootTableFix;
+import net.minecraft.datafixer.fix.WolfHealthFix;
 import net.minecraft.datafixer.fix.WorldGenSettingsDisallowOldCustomWorldsFix;
 import net.minecraft.datafixer.fix.WorldGenSettingsHeightAndBiomeFix;
 import net.minecraft.datafixer.fix.WorldUuidFix;
@@ -264,6 +278,14 @@
 import net.minecraft.datafixer.schema.Schema3685;
 import net.minecraft.datafixer.schema.Schema3689;
 import net.minecraft.datafixer.schema.Schema3799;
+import net.minecraft.datafixer.schema.Schema3807;
+import net.minecraft.datafixer.schema.Schema3808;
+import net.minecraft.datafixer.schema.Schema3808v1;
+import net.minecraft.datafixer.schema.Schema3816;
+import net.minecraft.datafixer.schema.Schema3818;
+import net.minecraft.datafixer.schema.Schema3818v3;
+import net.minecraft.datafixer.schema.Schema3818v4;
+import net.minecraft.datafixer.schema.Schema3822;
 import net.minecraft.datafixer.schema.Schema501;
 import net.minecraft.datafixer.schema.Schema700;
 import net.minecraft.datafixer.schema.Schema701;
@@ -273,28 +295,6 @@
 import net.minecraft.datafixer.schema.Schema705;
 import net.minecraft.datafixer.schema.Schema808;
 import net.minecraft.datafixer.schema.Schema99;
-import net.minecraft.unmapped.C_avvashtl;
-import net.minecraft.unmapped.C_cgbvaywy;
-import net.minecraft.unmapped.C_cvvawujf;
-import net.minecraft.unmapped.C_dglojnba;
-import net.minecraft.unmapped.C_dhuhcmez;
-import net.minecraft.unmapped.C_fqylcxas;
-import net.minecraft.unmapped.C_fstrwsah;
-import net.minecraft.unmapped.C_heyovgvd;
-import net.minecraft.unmapped.C_hhpdildx;
-import net.minecraft.unmapped.C_hwhlokhq;
-import net.minecraft.unmapped.C_lntklpwx;
-import net.minecraft.unmapped.C_lpsiuxzn;
-import net.minecraft.unmapped.C_nhmdchrs;
-import net.minecraft.unmapped.C_ozobotfj;
-import net.minecraft.unmapped.C_ozrqvrww;
-import net.minecraft.unmapped.C_pquflbdq;
-import net.minecraft.unmapped.C_tjddwqjd;
-import net.minecraft.unmapped.C_trahsecz;
-import net.minecraft.unmapped.C_vislmlyi;
-import net.minecraft.unmapped.C_vvigtzbk;
-import net.minecraft.unmapped.C_yecitbgf;
-import net.minecraft.unmapped.C_yfddtnnr;
 import net.minecraft.util.Util;
 
 /**
@@ -1293,46 +1293,46 @@
       UnaryOperator<String> unaryOperator3 = replacing(Map.of("minecraft:scute", "minecraft:turtle_scute"));
       builder.addFixer(ItemNameFix.create(schema200, "Rename scute item to turtle_scute", unaryOperator3));
       Schema schema201 = builder.addSchema(3803, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new C_lpsiuxzn(schema201, "Rename sweeping enchant to sweeping_edge", Map.of("minecraft:sweeping", "minecraft:sweeping_edge")));
-      Schema schema202 = builder.addSchema(3807, C_heyovgvd::new);
+      builder.addFixer(new RenameEnchantmentFix(schema201, "Rename sweeping enchant to sweeping_edge", Map.of("minecraft:sweeping", "minecraft:sweeping_edge")));
+      Schema schema202 = builder.addSchema(3807, Schema3807::new);
       builder.addFixer(new ChoiceTypesFix(schema202, "Added Vault", TypeReferences.BLOCK_ENTITY));
       Schema schema203 = builder.addSchema(3807, 1, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new C_ozrqvrww(schema203));
-      Schema schema204 = builder.addSchema(3808, C_yecitbgf::new);
-      builder.addFixer(new C_ozobotfj(schema204, "minecraft:horse", "ArmorItem"));
-      Schema schema205 = builder.addSchema(3808, 1, C_trahsecz::new);
-      builder.addFixer(new C_ozobotfj(schema205, "minecraft:llama", "DecorItem"));
+      builder.addFixer(new MapBannerBlockPosFormatFix(schema203));
+      Schema schema204 = builder.addSchema(3808, Schema3808::new);
+      builder.addFixer(new HorseArmorFix(schema204, "minecraft:horse", "ArmorItem"));
+      Schema schema205 = builder.addSchema(3808, 1, Schema3808v1::new);
+      builder.addFixer(new HorseArmorFix(schema205, "minecraft:llama", "DecorItem"));
       Schema schema206 = builder.addSchema(3809, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new C_avvashtl(schema206));
+      builder.addFixer(new HorseChestIndexingFix(schema206));
       Schema schema207 = builder.addSchema(3812, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new C_hwhlokhq(schema207));
+      builder.addFixer(new WolfHealthFix(schema207));
       Schema schema208 = builder.addSchema(3813, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new C_lntklpwx(schema208));
+      builder.addFixer(new BlockPosFormatFix(schema208));
       Schema schema209 = builder.addSchema(3814, EMPTY_IDENTIFIER_NORMALIZE);
       builder.addFixer(
          new RenameItemStackAttributesFix(
             schema209, "Rename jump strength attribute", replacing("minecraft:horse.jump_strength", "minecraft:generic.jump_strength")
          )
       );
-      Schema schema210 = builder.addSchema(3816, C_dhuhcmez::new);
+      Schema schema210 = builder.addSchema(3816, Schema3816::new);
       builder.addFixer(new ChoiceTypesFix(schema210, "Added Bogged", TypeReferences.ENTITY));
-      Schema schema211 = builder.addSchema(3818, C_cvvawujf::new);
-      builder.addFixer(new C_vvigtzbk(schema211));
-      builder.addFixer(new C_cgbvaywy(schema211));
+      Schema schema211 = builder.addSchema(3818, Schema3818::new);
+      builder.addFixer(new BeehiveFieldRenameFix(schema211));
+      builder.addFixer(new EmptyItemInHotbarFix(schema211));
       Schema schema212 = builder.addSchema(3818, 1, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new C_dglojnba(schema212));
+      builder.addFixer(new BannerPatternFormatFix(schema212));
       Schema schema213 = builder.addSchema(3818, 2, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new C_fqylcxas(schema213));
-      Schema schema214 = builder.addSchema(3818, 3, C_vislmlyi::new);
-      builder.addFixer(new WriteAndReadFix(schema214, "Inject data component types", TypeReferences.f_etntycyl));
-      Schema schema215 = builder.addSchema(3818, 4, C_pquflbdq::new);
-      builder.addFixer(new C_yfddtnnr(schema215));
+      builder.addFixer(new TippedArrowPotionToItemFix(schema213));
+      Schema schema214 = builder.addSchema(3818, 3, Schema3818v3::new);
+      builder.addFixer(new WriteAndReadFix(schema214, "Inject data component types", TypeReferences.DATA_COMPONENTS));
+      Schema schema215 = builder.addSchema(3818, 4, Schema3818v4::new);
+      builder.addFixer(new ItemStackComponentizationFix(schema215));
       Schema schema216 = builder.addSchema(3818, 5, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new C_hhpdildx(schema216));
+      builder.addFixer(new AreaEffectCloudPotionFix(schema216));
       Schema schema217 = builder.addSchema(3820, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new C_fstrwsah(schema217));
-      builder.addFixer(new C_nhmdchrs(schema217));
-      Schema schema218 = builder.addSchema(3822, C_tjddwqjd::new);
+      builder.addFixer(new PlayerHeadBlockProfileFix(schema217));
+      builder.addFixer(new LodestoneCompassComponentFix(schema217));
+      Schema schema218 = builder.addSchema(3822, Schema3822::new);
       builder.addFixer(new ChoiceTypesFix(schema218, "Added Breeze Rod and Mace", TypeReferences.ENTITY));
    }
 
diff -bur namedTargetSrc/net/minecraft/datafixer/TypeReferences.java namedSrc/net/minecraft/datafixer/TypeReferences.java
--- namedTargetSrc/net/minecraft/datafixer/TypeReferences.java	2024-03-19 16:58:04.371252978 +0000
+++ namedSrc/net/minecraft/datafixer/TypeReferences.java	2024-03-19 16:56:54.979263328 +0000
@@ -140,9 +140,10 @@
     */
    public static final TypeReference FLAT_BLOCK_STATE = () -> "flat_block_state";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_etntycyl Lnet/minecraft/unmapped/C_rodgceaz;f_etntycyl:Lcom/mojang/datafixers/DSL$TypeReference;}
+    * @mapping {@literal named DATA_COMPONENTS Lnet/minecraft/datafixer/TypeReferences;DATA_COMPONENTS:Lcom/mojang/datafixers/DSL$TypeReference;}
     */
-   public static final TypeReference f_etntycyl = () -> "data_components";
+   public static final TypeReference DATA_COMPONENTS = () -> "data_components";
    /**
     * A type reference which refers to an entity's identifier.
     * 
Only in namedSrc/net/minecraft/entity/ai/brain/sensor: ArmadilloScareDetectedSensor.java
Only in namedSrc/net/minecraft/entity/ai/brain/sensor: BreezeAttackEntitySensor.java
Only in namedSrc/net/minecraft/entity/ai/brain/sensor: FrogAttackablesSensor.java
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/sensor/SensorType.java namedSrc/net/minecraft/entity/ai/brain/sensor/SensorType.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/sensor/SensorType.java	2024-03-19 16:58:04.307252971 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/SensorType.java	2024-03-19 16:56:54.879263320 +0000
@@ -12,9 +12,6 @@
 import net.minecraft.entity.passive.SnifferBrain;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
-import net.minecraft.unmapped.C_hmcnoqun;
-import net.minecraft.unmapped.C_hxzxrfua;
-import net.minecraft.unmapped.C_pykemoio;
 import net.minecraft.util.Identifier;
 
 /**
@@ -78,9 +75,9 @@
     * @mapping {@literal hashed f_mjfmwrrh Lnet/minecraft/unmapped/C_usxopklv;f_mjfmwrrh:Lnet/minecraft/unmapped/C_usxopklv;}
     * @mapping {@literal named ARMADILLO_SCARE_DETECTED Lnet/minecraft/entity/ai/brain/sensor/SensorType;ARMADILLO_SCARE_DETECTED:Lnet/minecraft/entity/ai/brain/sensor/SensorType;}
     */
-   public static final SensorType<C_pykemoio<ArmadilloEntity>> ARMADILLO_SCARE_DETECTED = register(
+   public static final SensorType<ArmadilloScareDetectedSensor<ArmadilloEntity>> ARMADILLO_SCARE_DETECTED = register(
       "armadillo_scare_detected",
-      () -> new C_pykemoio(5, ArmadilloEntity::isScaredOf, ArmadilloEntity::m_gfpmjxza, MemoryModuleType.DANGER_DETECTED_RECENTLY, 80)
+      () -> new ArmadilloScareDetectedSensor(5, ArmadilloEntity::isScaredOf, ArmadilloEntity::m_gfpmjxza, MemoryModuleType.DANGER_DETECTED_RECENTLY, 80)
    );
    /**
     * @mapping {@literal hashed f_exgymxyt Lnet/minecraft/unmapped/C_usxopklv;f_exgymxyt:Lnet/minecraft/unmapped/C_usxopklv;}
@@ -144,7 +141,7 @@
     * @mapping {@literal hashed f_ridzbcij Lnet/minecraft/unmapped/C_usxopklv;f_ridzbcij:Lnet/minecraft/unmapped/C_usxopklv;}
     * @mapping {@literal named FROG_ATTACKABLES Lnet/minecraft/entity/ai/brain/sensor/SensorType;FROG_ATTACKABLES:Lnet/minecraft/entity/ai/brain/sensor/SensorType;}
     */
-   public static final SensorType<C_hxzxrfua> FROG_ATTACKABLES = register("frog_attackables", C_hxzxrfua::new);
+   public static final SensorType<FrogAttackablesSensor> FROG_ATTACKABLES = register("frog_attackables", FrogAttackablesSensor::new);
    /**
     * @mapping {@literal hashed f_dwratoxr Lnet/minecraft/unmapped/C_usxopklv;f_dwratoxr:Lnet/minecraft/unmapped/C_usxopklv;}
     * @mapping {@literal named IS_IN_WATER Lnet/minecraft/entity/ai/brain/sensor/SensorType;IS_IN_WATER:Lnet/minecraft/entity/ai/brain/sensor/SensorType;}
@@ -166,7 +163,7 @@
     * @mapping {@literal hashed f_mfggdbiq Lnet/minecraft/unmapped/C_usxopklv;f_mfggdbiq:Lnet/minecraft/unmapped/C_usxopklv;}
     * @mapping {@literal named BREEZE_ATTACK_ENTITY_SENSOR Lnet/minecraft/entity/ai/brain/sensor/SensorType;BREEZE_ATTACK_ENTITY_SENSOR:Lnet/minecraft/entity/ai/brain/sensor/SensorType;}
     */
-   public static final SensorType<C_hmcnoqun> BREEZE_ATTACK_ENTITY_SENSOR = register("breeze_attack_entity_sensor", C_hmcnoqun::new);
+   public static final SensorType<BreezeAttackEntitySensor> BREEZE_ATTACK_ENTITY_SENSOR = register("breeze_attack_entity_sensor", BreezeAttackEntitySensor::new);
    /**
     * @mapping {@literal hashed f_nzahvobi Lnet/minecraft/unmapped/C_usxopklv;f_nzahvobi:Ljava/util/function/Supplier;}
     * @mapping {@literal named factory Lnet/minecraft/entity/ai/brain/sensor/SensorType;factory:Ljava/util/function/Supplier;}
diff -bur namedTargetSrc/net/minecraft/entity/attribute/AttributeContainer.java namedSrc/net/minecraft/entity/attribute/AttributeContainer.java
--- namedTargetSrc/net/minecraft/entity/attribute/AttributeContainer.java	2024-03-19 16:58:04.475252990 +0000
+++ namedSrc/net/minecraft/entity/attribute/AttributeContainer.java	2024-03-19 16:56:55.167263345 +0000
@@ -171,7 +171,7 @@
          String string = lv.getString("Name");
          Identifier lv2 = Identifier.tryParse(string);
          if (lv2 != null) {
-            Util.ifPresentOrElse(Registries.ENTITY_ATTRIBUTE.m_nxhthmir(lv2), arg2 -> {
+            Util.ifPresentOrElse(Registries.ENTITY_ATTRIBUTE.getHolder(lv2), arg2 -> {
                EntityAttributeInstance lvx = this.getInstance(arg2);
                if (lvx != null) {
                   lvx.readNbt(lv);
diff -bur namedTargetSrc/net/minecraft/entity/damage/DamageTypes.java namedSrc/net/minecraft/entity/damage/DamageTypes.java
--- namedTargetSrc/net/minecraft/entity/damage/DamageTypes.java	2024-03-19 16:58:04.371252978 +0000
+++ namedSrc/net/minecraft/entity/damage/DamageTypes.java	2024-03-19 16:56:54.983263329 +0000
@@ -1,8 +1,8 @@
 package net.minecraft.entity.damage;
 
+import net.minecraft.registry.BootstrapContext;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
-import net.minecraft.unmapped.C_hqoyyfco;
 import net.minecraft.util.Identifier;
 
 /**
@@ -243,55 +243,57 @@
 
    /**
     * @mapping {@literal hashed m_nauykwwd Lnet/minecraft/unmapped/C_wshykkvq;m_nauykwwd(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
-    * @mapping {@literal named bootstrap Lnet/minecraft/entity/damage/DamageTypes;bootstrap(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
+    * @mapping {@literal named bootstrap Lnet/minecraft/entity/damage/DamageTypes;bootstrap(Lnet/minecraft/registry/BootstrapContext;)V}
     */
-   static void bootstrap(C_hqoyyfco<DamageType> arg) {
-      arg.m_pymxizhb(IN_FIRE, new DamageType("inFire", 0.1F, DamageEffects.BURNING));
-      arg.m_pymxizhb(LIGHTNING_BOLT, new DamageType("lightningBolt", 0.1F));
-      arg.m_pymxizhb(ON_FIRE, new DamageType("onFire", 0.0F, DamageEffects.BURNING));
-      arg.m_pymxizhb(LAVA, new DamageType("lava", 0.1F, DamageEffects.BURNING));
-      arg.m_pymxizhb(HOT_FLOOR, new DamageType("hotFloor", 0.1F, DamageEffects.BURNING));
-      arg.m_pymxizhb(IN_WALL, new DamageType("inWall", 0.0F));
-      arg.m_pymxizhb(CRAMMING, new DamageType("cramming", 0.0F));
-      arg.m_pymxizhb(DROWN, new DamageType("drown", 0.0F, DamageEffects.DROWNING));
-      arg.m_pymxizhb(STARVE, new DamageType("starve", 0.0F));
-      arg.m_pymxizhb(CACTUS, new DamageType("cactus", 0.1F));
-      arg.m_pymxizhb(FALL, new DamageType("fall", DamageScalingType.WHEN_CAUSED_BY_LIVING_NON_PLAYER, 0.0F, DamageEffects.HURT, DeathMessageType.FALL_VARIANTS));
-      arg.m_pymxizhb(FLY_INTO_WALL, new DamageType("flyIntoWall", 0.0F));
-      arg.m_pymxizhb(OUT_OF_WORLD, new DamageType("outOfWorld", 0.0F));
-      arg.m_pymxizhb(GENERIC, new DamageType("generic", 0.0F));
-      arg.m_pymxizhb(MAGIC, new DamageType("magic", 0.0F));
-      arg.m_pymxizhb(WITHER, new DamageType("wither", 0.0F));
-      arg.m_pymxizhb(DRAGON_BREATH, new DamageType("dragonBreath", 0.0F));
-      arg.m_pymxizhb(DRY_OUT, new DamageType("dryout", 0.1F));
-      arg.m_pymxizhb(SWEET_BERRY_BUSH, new DamageType("sweetBerryBush", 0.1F, DamageEffects.POKING));
-      arg.m_pymxizhb(FREEZE, new DamageType("freeze", 0.0F, DamageEffects.FREEZING));
-      arg.m_pymxizhb(STALAGMITE, new DamageType("stalagmite", 0.0F));
-      arg.m_pymxizhb(FALLING_BLOCK, new DamageType("fallingBlock", 0.1F));
-      arg.m_pymxizhb(FALLING_ANVIL, new DamageType("anvil", 0.1F));
-      arg.m_pymxizhb(FALLING_STALACTITE, new DamageType("fallingStalactite", 0.1F));
-      arg.m_pymxizhb(STING, new DamageType("sting", 0.1F));
-      arg.m_pymxizhb(MOB_ATTACK, new DamageType("mob", 0.1F));
-      arg.m_pymxizhb(MOB_ATTACK_NO_AGGRO, new DamageType("mob", 0.1F));
-      arg.m_pymxizhb(PLAYER_ATTACK, new DamageType("player", 0.1F));
-      arg.m_pymxizhb(ARROW, new DamageType("arrow", 0.1F));
-      arg.m_pymxizhb(TRIDENT, new DamageType("trident", 0.1F));
-      arg.m_pymxizhb(MOB_PROJECTILE, new DamageType("mob", 0.1F));
-      arg.m_pymxizhb(LLAMA_SPIT, new DamageType("mob", 0.1F));
-      arg.m_pymxizhb(FIREWORKS, new DamageType("fireworks", 0.1F));
-      arg.m_pymxizhb(UNATTRIBUTED_FIREBALL, new DamageType("onFire", 0.1F, DamageEffects.BURNING));
-      arg.m_pymxizhb(FIREBALL, new DamageType("fireball", 0.1F, DamageEffects.BURNING));
-      arg.m_pymxizhb(WITHER_SKULL, new DamageType("witherSkull", 0.1F));
-      arg.m_pymxizhb(THROWN, new DamageType("thrown", 0.1F));
-      arg.m_pymxizhb(INDIRECT_MAGIC, new DamageType("indirectMagic", 0.0F));
-      arg.m_pymxizhb(THORNS, new DamageType("thorns", 0.1F, DamageEffects.THORNS));
-      arg.m_pymxizhb(EXPLOSION, new DamageType("explosion", DamageScalingType.ALWAYS, 0.1F));
-      arg.m_pymxizhb(PLAYER_EXPLOSION, new DamageType("explosion.player", DamageScalingType.ALWAYS, 0.1F));
-      arg.m_pymxizhb(SONIC_BOOM, new DamageType("sonic_boom", DamageScalingType.ALWAYS, 0.0F));
-      arg.m_pymxizhb(
+   static void bootstrap(BootstrapContext<DamageType> context) {
+      context.register(IN_FIRE, new DamageType("inFire", 0.1F, DamageEffects.BURNING));
+      context.register(LIGHTNING_BOLT, new DamageType("lightningBolt", 0.1F));
+      context.register(ON_FIRE, new DamageType("onFire", 0.0F, DamageEffects.BURNING));
+      context.register(LAVA, new DamageType("lava", 0.1F, DamageEffects.BURNING));
+      context.register(HOT_FLOOR, new DamageType("hotFloor", 0.1F, DamageEffects.BURNING));
+      context.register(IN_WALL, new DamageType("inWall", 0.0F));
+      context.register(CRAMMING, new DamageType("cramming", 0.0F));
+      context.register(DROWN, new DamageType("drown", 0.0F, DamageEffects.DROWNING));
+      context.register(STARVE, new DamageType("starve", 0.0F));
+      context.register(CACTUS, new DamageType("cactus", 0.1F));
+      context.register(
+         FALL, new DamageType("fall", DamageScalingType.WHEN_CAUSED_BY_LIVING_NON_PLAYER, 0.0F, DamageEffects.HURT, DeathMessageType.FALL_VARIANTS)
+      );
+      context.register(FLY_INTO_WALL, new DamageType("flyIntoWall", 0.0F));
+      context.register(OUT_OF_WORLD, new DamageType("outOfWorld", 0.0F));
+      context.register(GENERIC, new DamageType("generic", 0.0F));
+      context.register(MAGIC, new DamageType("magic", 0.0F));
+      context.register(WITHER, new DamageType("wither", 0.0F));
+      context.register(DRAGON_BREATH, new DamageType("dragonBreath", 0.0F));
+      context.register(DRY_OUT, new DamageType("dryout", 0.1F));
+      context.register(SWEET_BERRY_BUSH, new DamageType("sweetBerryBush", 0.1F, DamageEffects.POKING));
+      context.register(FREEZE, new DamageType("freeze", 0.0F, DamageEffects.FREEZING));
+      context.register(STALAGMITE, new DamageType("stalagmite", 0.0F));
+      context.register(FALLING_BLOCK, new DamageType("fallingBlock", 0.1F));
+      context.register(FALLING_ANVIL, new DamageType("anvil", 0.1F));
+      context.register(FALLING_STALACTITE, new DamageType("fallingStalactite", 0.1F));
+      context.register(STING, new DamageType("sting", 0.1F));
+      context.register(MOB_ATTACK, new DamageType("mob", 0.1F));
+      context.register(MOB_ATTACK_NO_AGGRO, new DamageType("mob", 0.1F));
+      context.register(PLAYER_ATTACK, new DamageType("player", 0.1F));
+      context.register(ARROW, new DamageType("arrow", 0.1F));
+      context.register(TRIDENT, new DamageType("trident", 0.1F));
+      context.register(MOB_PROJECTILE, new DamageType("mob", 0.1F));
+      context.register(LLAMA_SPIT, new DamageType("mob", 0.1F));
+      context.register(FIREWORKS, new DamageType("fireworks", 0.1F));
+      context.register(UNATTRIBUTED_FIREBALL, new DamageType("onFire", 0.1F, DamageEffects.BURNING));
+      context.register(FIREBALL, new DamageType("fireball", 0.1F, DamageEffects.BURNING));
+      context.register(WITHER_SKULL, new DamageType("witherSkull", 0.1F));
+      context.register(THROWN, new DamageType("thrown", 0.1F));
+      context.register(INDIRECT_MAGIC, new DamageType("indirectMagic", 0.0F));
+      context.register(THORNS, new DamageType("thorns", 0.1F, DamageEffects.THORNS));
+      context.register(EXPLOSION, new DamageType("explosion", DamageScalingType.ALWAYS, 0.1F));
+      context.register(PLAYER_EXPLOSION, new DamageType("explosion.player", DamageScalingType.ALWAYS, 0.1F));
+      context.register(SONIC_BOOM, new DamageType("sonic_boom", DamageScalingType.ALWAYS, 0.0F));
+      context.register(
          BAD_RESPAWN_POINT, new DamageType("badRespawnPoint", DamageScalingType.ALWAYS, 0.1F, DamageEffects.HURT, DeathMessageType.INTENTIONAL_GAME_DESIGN)
       );
-      arg.m_pymxizhb(OUTSIDE_BORDER, new DamageType("outsideBorder", 0.0F));
-      arg.m_pymxizhb(GENERIC_KILL, new DamageType("genericKill", 0.0F));
+      context.register(OUTSIDE_BORDER, new DamageType("outsideBorder", 0.0F));
+      context.register(GENERIC_KILL, new DamageType("genericKill", 0.0F));
    }
 }
Only in namedSrc/net/minecraft/entity/damage: OneTwentyOneDamageTypes.java
diff -bur namedTargetSrc/net/minecraft/entity/vehicle/ChestBoatEntity.java namedSrc/net/minecraft/entity/vehicle/ChestBoatEntity.java
--- namedTargetSrc/net/minecraft/entity/vehicle/ChestBoatEntity.java	2024-03-19 16:58:04.383252980 +0000
+++ namedSrc/net/minecraft/entity/vehicle/ChestBoatEntity.java	2024-03-19 16:56:54.995263329 +0000
@@ -108,9 +108,9 @@
     * Mapping not found
     */
    @Override
-   public void killAndDropSelf(DamageSource source) {
+   public void killAndDropSelf(DamageSource damageSource) {
       this.killAndDropItem(this.asItem());
-      this.drop(source, this.getWorld(), this);
+      this.drop(damageSource, this.getWorld(), this);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/vehicle/StorageMinecartEntity.java namedSrc/net/minecraft/entity/vehicle/StorageMinecartEntity.java
--- namedTargetSrc/net/minecraft/entity/vehicle/StorageMinecartEntity.java	2024-03-19 16:58:04.543252998 +0000
+++ namedSrc/net/minecraft/entity/vehicle/StorageMinecartEntity.java	2024-03-19 16:56:55.287263355 +0000
@@ -59,9 +59,9 @@
     * Mapping not found
     */
    @Override
-   public void killAndDropSelf(DamageSource source) {
-      super.killAndDropSelf(source);
-      this.drop(source, this.getWorld(), this);
+   public void killAndDropSelf(DamageSource damageSource) {
+      super.killAndDropSelf(damageSource);
+      this.drop(damageSource, this.getWorld(), this);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/vehicle/TntMinecartEntity.java namedSrc/net/minecraft/entity/vehicle/TntMinecartEntity.java
--- namedTargetSrc/net/minecraft/entity/vehicle/TntMinecartEntity.java	2024-03-19 16:58:04.343252976 +0000
+++ namedSrc/net/minecraft/entity/vehicle/TntMinecartEntity.java	2024-03-19 16:56:54.935263325 +0000
@@ -108,9 +108,9 @@
     * Mapping not found
     */
    @Override
-   public void killAndDropSelf(DamageSource source) {
+   public void killAndDropSelf(DamageSource damageSource) {
       double d = this.getVelocity().horizontalLengthSquared();
-      if (!shouldDetonateFrom(source) && !(d >= 0.01F)) {
+      if (!shouldDetonateFrom(damageSource) && !(d >= 0.01F)) {
          this.killAndDropItem(this.asItem());
       } else {
          if (this.fuseTicks < 0) {
diff -bur namedTargetSrc/net/minecraft/entity/vehicle/VehicleEntity.java namedSrc/net/minecraft/entity/vehicle/VehicleEntity.java
--- namedTargetSrc/net/minecraft/entity/vehicle/VehicleEntity.java	2024-03-19 16:58:04.323252974 +0000
+++ namedSrc/net/minecraft/entity/vehicle/VehicleEntity.java	2024-03-19 16:56:54.903263321 +0000
@@ -154,7 +154,7 @@
     * @mapping {@literal hashed m_tqtorwvl Lnet/minecraft/unmapped/C_ogoqhclb;m_tqtorwvl(Lnet/minecraft/unmapped/C_sbxfkpyv;)V}
     * @mapping {@literal named killAndDropSelf Lnet/minecraft/entity/vehicle/VehicleEntity;killAndDropSelf(Lnet/minecraft/entity/damage/DamageSource;)V}
     */
-   protected void killAndDropSelf(DamageSource source) {
+   protected void killAndDropSelf(DamageSource damageSource) {
       this.killAndDropItem(this.asItem());
    }
 
diff -bur namedTargetSrc/net/minecraft/item/BannerPatterns.java namedSrc/net/minecraft/item/BannerPatterns.java
--- namedTargetSrc/net/minecraft/item/BannerPatterns.java	2024-03-19 16:58:04.395252982 +0000
+++ namedSrc/net/minecraft/item/BannerPatterns.java	2024-03-19 16:56:55.023263332 +0000
@@ -1,9 +1,9 @@
 package net.minecraft.item;
 
 import net.minecraft.block.entity.BannerPattern;
+import net.minecraft.registry.BootstrapContext;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
-import net.minecraft.unmapped.C_hqoyyfco;
 import net.minecraft.util.Identifier;
 
 /**
@@ -237,57 +237,57 @@
 
    /**
     * @mapping {@literal hashed m_shrfwjxe Lnet/minecraft/unmapped/C_lmlxpsml;m_shrfwjxe(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
-    * @mapping {@literal named initialize Lnet/minecraft/item/BannerPatterns;initialize(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
+    * @mapping {@literal named initialize Lnet/minecraft/item/BannerPatterns;initialize(Lnet/minecraft/registry/BootstrapContext;)V}
     */
-   public static void initialize(C_hqoyyfco<BannerPattern> arg) {
-      m_iuxajiyk(arg, BASE);
-      m_iuxajiyk(arg, SQUARE_BOTTOM_LEFT);
-      m_iuxajiyk(arg, SQUARE_BOTTOM_RIGHT);
-      m_iuxajiyk(arg, SQUARE_TOP_LEFT);
-      m_iuxajiyk(arg, SQUARE_TOP_RIGHT);
-      m_iuxajiyk(arg, STRIPE_BOTTOM);
-      m_iuxajiyk(arg, STRIPE_TOP);
-      m_iuxajiyk(arg, STRIPE_LEFT);
-      m_iuxajiyk(arg, STRIPE_RIGHT);
-      m_iuxajiyk(arg, STRIPE_CENTER);
-      m_iuxajiyk(arg, STRIPE_MIDDLE);
-      m_iuxajiyk(arg, STRIPE_DOWNRIGHT);
-      m_iuxajiyk(arg, STRIPE_DOWNLEFT);
-      m_iuxajiyk(arg, SMALL_STRIPES);
-      m_iuxajiyk(arg, CROSS);
-      m_iuxajiyk(arg, STRAIGHT_CROSS);
-      m_iuxajiyk(arg, TRIANGLE_BOTTOM);
-      m_iuxajiyk(arg, TRIANGLE_TOP);
-      m_iuxajiyk(arg, TRIANGLES_BOTTOM);
-      m_iuxajiyk(arg, TRIANGLES_TOP);
-      m_iuxajiyk(arg, DIAGONAL_LEFT);
-      m_iuxajiyk(arg, DIAGONAL_UP_RIGHT);
-      m_iuxajiyk(arg, DIAGONAL_UP_LEFT);
-      m_iuxajiyk(arg, DIAGONAL_RIGHT);
-      m_iuxajiyk(arg, CIRCLE);
-      m_iuxajiyk(arg, RHOMBUS);
-      m_iuxajiyk(arg, HALF_VERTICAL);
-      m_iuxajiyk(arg, HALF_HORIZONTAL);
-      m_iuxajiyk(arg, HALF_VERTICAL_RIGHT);
-      m_iuxajiyk(arg, HALF_HORIZONTAL_BOTTOM);
-      m_iuxajiyk(arg, BORDER);
-      m_iuxajiyk(arg, CURLY_BORDER);
-      m_iuxajiyk(arg, GRADIENT);
-      m_iuxajiyk(arg, GRADIENT_UP);
-      m_iuxajiyk(arg, BRICKS);
-      m_iuxajiyk(arg, GLOBE);
-      m_iuxajiyk(arg, CREEPER);
-      m_iuxajiyk(arg, SKULL);
-      m_iuxajiyk(arg, FLOWER);
-      m_iuxajiyk(arg, MOJANG);
-      m_iuxajiyk(arg, PIGLIN);
+   public static void initialize(BootstrapContext<BannerPattern> pattern) {
+      register(pattern, BASE);
+      register(pattern, SQUARE_BOTTOM_LEFT);
+      register(pattern, SQUARE_BOTTOM_RIGHT);
+      register(pattern, SQUARE_TOP_LEFT);
+      register(pattern, SQUARE_TOP_RIGHT);
+      register(pattern, STRIPE_BOTTOM);
+      register(pattern, STRIPE_TOP);
+      register(pattern, STRIPE_LEFT);
+      register(pattern, STRIPE_RIGHT);
+      register(pattern, STRIPE_CENTER);
+      register(pattern, STRIPE_MIDDLE);
+      register(pattern, STRIPE_DOWNRIGHT);
+      register(pattern, STRIPE_DOWNLEFT);
+      register(pattern, SMALL_STRIPES);
+      register(pattern, CROSS);
+      register(pattern, STRAIGHT_CROSS);
+      register(pattern, TRIANGLE_BOTTOM);
+      register(pattern, TRIANGLE_TOP);
+      register(pattern, TRIANGLES_BOTTOM);
+      register(pattern, TRIANGLES_TOP);
+      register(pattern, DIAGONAL_LEFT);
+      register(pattern, DIAGONAL_UP_RIGHT);
+      register(pattern, DIAGONAL_UP_LEFT);
+      register(pattern, DIAGONAL_RIGHT);
+      register(pattern, CIRCLE);
+      register(pattern, RHOMBUS);
+      register(pattern, HALF_VERTICAL);
+      register(pattern, HALF_HORIZONTAL);
+      register(pattern, HALF_VERTICAL_RIGHT);
+      register(pattern, HALF_HORIZONTAL_BOTTOM);
+      register(pattern, BORDER);
+      register(pattern, CURLY_BORDER);
+      register(pattern, GRADIENT);
+      register(pattern, GRADIENT_UP);
+      register(pattern, BRICKS);
+      register(pattern, GLOBE);
+      register(pattern, CREEPER);
+      register(pattern, SKULL);
+      register(pattern, FLOWER);
+      register(pattern, MOJANG);
+      register(pattern, PIGLIN);
    }
 
    /**
     * @mapping {@literal hashed m_iuxajiyk Lnet/minecraft/unmapped/C_lmlxpsml;m_iuxajiyk(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;)V}
-    * @mapping {@literal named m_iuxajiyk Lnet/minecraft/item/BannerPatterns;m_iuxajiyk(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/registry/RegistryKey;)V}
+    * @mapping {@literal named register Lnet/minecraft/item/BannerPatterns;register(Lnet/minecraft/registry/BootstrapContext;Lnet/minecraft/registry/RegistryKey;)V}
     */
-   public static void m_iuxajiyk(C_hqoyyfco<BannerPattern> arg, RegistryKey<BannerPattern> registryKey) {
-      arg.m_pymxizhb(registryKey, new BannerPattern(registryKey.getValue(), "block.minecraft.banner." + registryKey.getValue().toShortTranslationKey()));
+   public static void register(BootstrapContext<BannerPattern> pattern, RegistryKey<BannerPattern> registryKey) {
+      pattern.register(registryKey, new BannerPattern(registryKey.getValue(), "block.minecraft.banner." + registryKey.getValue().toShortTranslationKey()));
    }
 }
diff -bur namedTargetSrc/net/minecraft/item/trim/ArmorTrimMaterials.java namedSrc/net/minecraft/item/trim/ArmorTrimMaterials.java
--- namedTargetSrc/net/minecraft/item/trim/ArmorTrimMaterials.java	2024-03-19 16:58:04.547252997 +0000
+++ namedSrc/net/minecraft/item/trim/ArmorTrimMaterials.java	2024-03-19 16:56:55.291263355 +0000
@@ -7,13 +7,13 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.registry.BootstrapContext;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_hqoyyfco;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 
@@ -75,9 +75,9 @@
 
    /**
     * @mapping {@literal hashed m_yhwgdlmi Lnet/minecraft/unmapped/C_txvwkqwx;m_yhwgdlmi(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
-    * @mapping {@literal named bootstrapVanilla Lnet/minecraft/item/trim/ArmorTrimMaterials;bootstrapVanilla(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
+    * @mapping {@literal named bootstrapVanilla Lnet/minecraft/item/trim/ArmorTrimMaterials;bootstrapVanilla(Lnet/minecraft/registry/BootstrapContext;)V}
     */
-   public static void bootstrapVanilla(C_hqoyyfco<ArmorTrimMaterial> trimMaterials) {
+   public static void bootstrapVanilla(BootstrapContext<ArmorTrimMaterial> trimMaterials) {
       register(trimMaterials, QUARTZ, Items.QUARTZ, Style.EMPTY.withColor(14931140), 0.1F);
       register(trimMaterials, IRON, Items.IRON_INGOT, Style.EMPTY.withColor(15527148), 0.2F, Map.of(ArmorMaterials.IRON, "iron_darker"));
       register(trimMaterials, NETHERITE, Items.NETHERITE_INGOT, Style.EMPTY.withColor(6445145), 0.3F, Map.of(ArmorMaterials.NETHERITE, "netherite_darker"));
@@ -103,20 +103,20 @@
 
    /**
     * @mapping {@literal hashed m_kkcwbibv Lnet/minecraft/unmapped/C_txvwkqwx;m_kkcwbibv(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_cpwnhism;F)V}
-    * @mapping {@literal named register Lnet/minecraft/item/trim/ArmorTrimMaterials;register(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;F)V}
+    * @mapping {@literal named register Lnet/minecraft/item/trim/ArmorTrimMaterials;register(Lnet/minecraft/registry/BootstrapContext;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;F)V}
     */
    private static void register(
-      C_hqoyyfco<ArmorTrimMaterial> trimMaterials, RegistryKey<ArmorTrimMaterial> registryKey, Item item, Style style, float itemModelIndex
+      BootstrapContext<ArmorTrimMaterial> trimMaterials, RegistryKey<ArmorTrimMaterial> registryKey, Item item, Style style, float itemModelIndex
    ) {
       register(trimMaterials, registryKey, item, style, itemModelIndex, Map.of());
    }
 
    /**
     * @mapping {@literal hashed m_ggcdyhpf Lnet/minecraft/unmapped/C_txvwkqwx;m_ggcdyhpf(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_cpwnhism;FLjava/util/Map;)V}
-    * @mapping {@literal named register Lnet/minecraft/item/trim/ArmorTrimMaterials;register(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;FLjava/util/Map;)V}
+    * @mapping {@literal named register Lnet/minecraft/item/trim/ArmorTrimMaterials;register(Lnet/minecraft/registry/BootstrapContext;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/item/Item;Lnet/minecraft/text/Style;FLjava/util/Map;)V}
     */
    private static void register(
-      C_hqoyyfco<ArmorTrimMaterial> trimMaterials,
+      BootstrapContext<ArmorTrimMaterial> trimMaterials,
       RegistryKey<ArmorTrimMaterial> registryKey,
       Item item,
       Style style,
@@ -130,7 +130,7 @@
          Text.translatable(Util.createTranslationKey("trim_material", registryKey.getValue())).fillStyle(style),
          materials
       );
-      trimMaterials.m_pymxizhb(registryKey, lv);
+      trimMaterials.register(registryKey, lv);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/item/trim/ArmorTrimPatterns.java namedSrc/net/minecraft/item/trim/ArmorTrimPatterns.java
--- namedTargetSrc/net/minecraft/item/trim/ArmorTrimPatterns.java	2024-03-19 16:58:04.523252996 +0000
+++ namedSrc/net/minecraft/item/trim/ArmorTrimPatterns.java	2024-03-19 16:56:55.243263351 +0000
@@ -4,13 +4,13 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.registry.BootstrapContext;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_hqoyyfco;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 
@@ -112,9 +112,9 @@
 
    /**
     * @mapping {@literal hashed m_hmydulmo Lnet/minecraft/unmapped/C_vdhaofle;m_hmydulmo(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
-    * @mapping {@literal named bootstrapVanilla Lnet/minecraft/item/trim/ArmorTrimPatterns;bootstrapVanilla(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
+    * @mapping {@literal named bootstrapVanilla Lnet/minecraft/item/trim/ArmorTrimPatterns;bootstrapVanilla(Lnet/minecraft/registry/BootstrapContext;)V}
     */
-   public static void bootstrapVanilla(C_hqoyyfco<ArmorTrimPattern> patterns) {
+   public static void bootstrapVanilla(BootstrapContext<ArmorTrimPattern> patterns) {
       register(patterns, Items.SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE, SENTRY);
       register(patterns, Items.DUNE_ARMOR_TRIM_SMITHING_TEMPLATE, DUNE);
       register(patterns, Items.COAST_ARMOR_TRIM_SMITHING_TEMPLATE, COAST);
@@ -146,13 +146,13 @@
 
    /**
     * @mapping {@literal hashed m_mamumeet Lnet/minecraft/unmapped/C_vdhaofle;m_mamumeet(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_xhhleach;)V}
-    * @mapping {@literal named register Lnet/minecraft/item/trim/ArmorTrimPatterns;register(Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/item/Item;Lnet/minecraft/registry/RegistryKey;)V}
+    * @mapping {@literal named register Lnet/minecraft/item/trim/ArmorTrimPatterns;register(Lnet/minecraft/registry/BootstrapContext;Lnet/minecraft/item/Item;Lnet/minecraft/registry/RegistryKey;)V}
     */
-   public static void register(C_hqoyyfco<ArmorTrimPattern> patterns, Item templateItem, RegistryKey<ArmorTrimPattern> key) {
+   public static void register(BootstrapContext<ArmorTrimPattern> patterns, Item templateItem, RegistryKey<ArmorTrimPattern> key) {
       ArmorTrimPattern lv = new ArmorTrimPattern(
          key.getValue(), Registries.ITEM.wrapAsHolder(templateItem), Text.translatable(Util.createTranslationKey("trim_pattern", key.getValue())), false
       );
-      patterns.m_pymxizhb(key, lv);
+      patterns.register(key, lv);
    }
 
    /**
Only in namedSrc/net/minecraft/item/trim: OneTwentyOneTrimPatterns.java
diff -bur namedTargetSrc/net/minecraft/loot/entry/LeafEntry.java namedSrc/net/minecraft/loot/entry/LeafEntry.java
--- namedTargetSrc/net/minecraft/loot/entry/LeafEntry.java	2024-03-19 16:58:04.475252990 +0000
+++ namedSrc/net/minecraft/loot/entry/LeafEntry.java	2024-03-19 16:56:55.163263343 +0000
@@ -89,7 +89,7 @@
             Codecs.createStrictOptionalField(Codec.INT, "quality", 0).forGetter(arg -> arg.quality)
          )
          .and(m_fztvyapn(instance).t1())
-         .and(Codecs.createStrictOptionalField(LootFunctionTypes.f_hcnwqyvm.listOf(), "functions", List.of()).forGetter(arg -> arg.functions));
+         .and(Codecs.createStrictOptionalField(LootFunctionTypes.CODEC.listOf(), "functions", List.of()).forGetter(arg -> arg.functions));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/loot/function/ApplyBonusLootFunction.java namedSrc/net/minecraft/loot/function/ApplyBonusLootFunction.java
--- namedTargetSrc/net/minecraft/loot/function/ApplyBonusLootFunction.java	2024-03-19 16:58:04.419252984 +0000
+++ namedSrc/net/minecraft/loot/function/ApplyBonusLootFunction.java	2024-03-19 16:56:55.063263335 +0000
@@ -51,9 +51,10 @@
       "formula", "parameters", f_ljdofuio, ApplyBonusLootFunction.Formula::getId, ApplyBonusLootFunction.C_jvsyolwg::codec
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_xeglxauo Lnet/minecraft/unmapped/C_mxqfevzh;f_xeglxauo:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/loot/function/ApplyBonusLootFunction;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<ApplyBonusLootFunction> f_xeglxauo = RecordCodecBuilder.create(
+   public static final Codec<ApplyBonusLootFunction> CODEC = RecordCodecBuilder.create(
       instance -> m_hfvcjbcy(instance)
             .<Holder<Enchantment>, ApplyBonusLootFunction.Formula>and(
                instance.group(
Only in namedSrc/net/minecraft/loot/function: CopyComponentsLootFunction.java
Only in namedSrc/net/minecraft/loot/function: CopyCustomDataLootFunction.java
diff -bur namedTargetSrc/net/minecraft/loot/function/EnchantRandomlyLootFunction.java namedSrc/net/minecraft/loot/function/EnchantRandomlyLootFunction.java
--- namedTargetSrc/net/minecraft/loot/function/EnchantRandomlyLootFunction.java	2024-03-19 16:58:04.399252981 +0000
+++ namedSrc/net/minecraft/loot/function/EnchantRandomlyLootFunction.java	2024-03-19 16:56:55.027263333 +0000
@@ -31,18 +31,20 @@
     */
    private static final Logger LOGGER = LogUtils.getLogger();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_qkktzcyr Lnet/minecraft/unmapped/C_mcyropux;f_qkktzcyr:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named ENCHANTMENT_HOLDER_CODEC Lnet/minecraft/loot/function/EnchantRandomlyLootFunction;ENCHANTMENT_HOLDER_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   private static final Codec<HolderSet<Enchantment>> f_qkktzcyr = Registries.ENCHANTMENT
+   private static final Codec<HolderSet<Enchantment>> ENCHANTMENT_HOLDER_CODEC = Registries.ENCHANTMENT
       .holderByNameCodec()
       .listOf()
       .xmap(HolderSet::createDirect, arg -> arg.stream().toList());
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bwriysqi Lnet/minecraft/unmapped/C_mcyropux;f_bwriysqi:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/loot/function/EnchantRandomlyLootFunction;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<EnchantRandomlyLootFunction> f_bwriysqi = RecordCodecBuilder.create(
+   public static final Codec<EnchantRandomlyLootFunction> CODEC = RecordCodecBuilder.create(
       instance -> m_hfvcjbcy(instance)
-            .and(Codecs.createStrictOptionalField(f_qkktzcyr, "enchantments").forGetter(arg -> arg.enchantments))
+            .and(Codecs.createStrictOptionalField(ENCHANTMENT_HOLDER_CODEC, "enchantments").forGetter(arg -> arg.enchantments))
             .apply(instance, EnchantRandomlyLootFunction::new)
    );
    /**

github-actions · 2024-03-19T16:58:08Z

View the diff here (3/3):

diff -bur namedTargetSrc/net/minecraft/loot/function/LootFunctionTypes.java namedSrc/net/minecraft/loot/function/LootFunctionTypes.java
--- namedTargetSrc/net/minecraft/loot/function/LootFunctionTypes.java	2024-03-19 16:58:04.399252981 +0000
+++ namedSrc/net/minecraft/loot/function/LootFunctionTypes.java	2024-03-19 16:56:55.027263333 +0000
@@ -7,16 +7,6 @@
 import net.minecraft.loot.context.LootContext;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
-import net.minecraft.unmapped.C_dpxzhowh;
-import net.minecraft.unmapped.C_gsgjanri;
-import net.minecraft.unmapped.C_hgtsxeep;
-import net.minecraft.unmapped.C_kkafruck;
-import net.minecraft.unmapped.C_ldqxohxy;
-import net.minecraft.unmapped.C_mbgfajkg;
-import net.minecraft.unmapped.C_ndfnieah;
-import net.minecraft.unmapped.C_qtpcfbnm;
-import net.minecraft.unmapped.C_sxzxxsuj;
-import net.minecraft.unmapped.C_wvihlkry;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.dynamic.Codecs;
 
@@ -31,15 +21,17 @@
     */
    public static final BiFunction<ItemStack, LootContext, ItemStack> NOOP = (stack, context) -> stack;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_uxadbhqb Lnet/minecraft/unmapped/C_daukiiao;f_uxadbhqb:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named BASE_CODEC Lnet/minecraft/loot/function/LootFunctionTypes;BASE_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   private static final Codec<LootFunction> f_uxadbhqb = Registries.LOOT_FUNCTION_TYPE
+   private static final Codec<LootFunction> BASE_CODEC = Registries.LOOT_FUNCTION_TYPE
       .getCodec()
       .dispatch("function", LootFunction::getType, LootFunctionType::codec);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_hcnwqyvm Lnet/minecraft/unmapped/C_daukiiao;f_hcnwqyvm:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/loot/function/LootFunctionTypes;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<LootFunction> f_hcnwqyvm = Codecs.createLazy(() -> Codecs.either(f_uxadbhqb, C_ndfnieah.f_kakimbcn));
+   public static final Codec<LootFunction> CODEC = Codecs.createLazy(() -> Codecs.either(BASE_CODEC, SequenceLootFunction.INLINE_CODEC));
    /**
     * @mapping {@literal hashed f_iapviynd Lnet/minecraft/unmapped/C_daukiiao;f_iapviynd:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named SET_COUNT Lnet/minecraft/loot/function/LootFunctionTypes;SET_COUNT:Lnet/minecraft/loot/function/LootFunctionType;}
@@ -54,7 +46,7 @@
     * @mapping {@literal hashed f_pkjxjkza Lnet/minecraft/unmapped/C_daukiiao;f_pkjxjkza:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named ENCHANT_RANDOMLY Lnet/minecraft/loot/function/LootFunctionTypes;ENCHANT_RANDOMLY:Lnet/minecraft/loot/function/LootFunctionType;}
     */
-   public static final LootFunctionType ENCHANT_RANDOMLY = register("enchant_randomly", EnchantRandomlyLootFunction.f_bwriysqi);
+   public static final LootFunctionType ENCHANT_RANDOMLY = register("enchant_randomly", EnchantRandomlyLootFunction.CODEC);
    /**
     * @mapping {@literal hashed f_sjlumail Lnet/minecraft/unmapped/C_daukiiao;f_sjlumail:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named SET_ENCHANTMENTS Lnet/minecraft/loot/function/LootFunctionTypes;SET_ENCHANTMENTS:Lnet/minecraft/loot/function/LootFunctionType;}
@@ -64,12 +56,12 @@
     * @mapping {@literal hashed f_jpkxpyrk Lnet/minecraft/unmapped/C_daukiiao;f_jpkxpyrk:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named SET_CUSTOM_DATA Lnet/minecraft/loot/function/LootFunctionTypes;SET_CUSTOM_DATA:Lnet/minecraft/loot/function/LootFunctionType;}
     */
-   public static final LootFunctionType SET_CUSTOM_DATA = register("set_custom_data", C_sxzxxsuj.CODEC);
+   public static final LootFunctionType SET_CUSTOM_DATA = register("set_custom_data", SetCustomDataLootFunction.CODEC);
    /**
     * @mapping {@literal hashed f_uxjbzbsk Lnet/minecraft/unmapped/C_daukiiao;f_uxjbzbsk:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named SET_COMPONENTS Lnet/minecraft/loot/function/LootFunctionTypes;SET_COMPONENTS:Lnet/minecraft/loot/function/LootFunctionType;}
     */
-   public static final LootFunctionType SET_COMPONENTS = register("set_components", C_dpxzhowh.CODEC);
+   public static final LootFunctionType SET_COMPONENTS = register("set_components", SetComponentsLootFunction.CODEC);
    /**
     * @mapping {@literal hashed f_gylsuntf Lnet/minecraft/unmapped/C_daukiiao;f_gylsuntf:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named FURNACE_SMELT Lnet/minecraft/loot/function/LootFunctionTypes;FURNACE_SMELT:Lnet/minecraft/loot/function/LootFunctionType;}
@@ -104,7 +96,7 @@
     * @mapping {@literal hashed f_rkpybjib Lnet/minecraft/unmapped/C_daukiiao;f_rkpybjib:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named SET_STEW_EFFECT Lnet/minecraft/loot/function/LootFunctionTypes;SET_STEW_EFFECT:Lnet/minecraft/loot/function/LootFunctionType;}
     */
-   public static final LootFunctionType SET_STEW_EFFECT = register("set_stew_effect", SetStewEffectLootFunction.f_tjmdlomo);
+   public static final LootFunctionType SET_STEW_EFFECT = register("set_stew_effect", SetStewEffectLootFunction.CODEC);
    /**
     * @mapping {@literal hashed f_vqkwmvtw Lnet/minecraft/unmapped/C_daukiiao;f_vqkwmvtw:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named COPY_NAME Lnet/minecraft/loot/function/LootFunctionTypes;COPY_NAME:Lnet/minecraft/loot/function/LootFunctionType;}
@@ -124,7 +116,7 @@
     * @mapping {@literal hashed f_mehkhxfv Lnet/minecraft/unmapped/C_daukiiao;f_mehkhxfv:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named APPLY_BONUS Lnet/minecraft/loot/function/LootFunctionTypes;APPLY_BONUS:Lnet/minecraft/loot/function/LootFunctionType;}
     */
-   public static final LootFunctionType APPLY_BONUS = register("apply_bonus", ApplyBonusLootFunction.f_xeglxauo);
+   public static final LootFunctionType APPLY_BONUS = register("apply_bonus", ApplyBonusLootFunction.CODEC);
    /**
     * @mapping {@literal hashed f_ekrijfqv Lnet/minecraft/unmapped/C_daukiiao;f_ekrijfqv:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named SET_LOOT_TABLE Lnet/minecraft/loot/function/LootFunctionTypes;SET_LOOT_TABLE:Lnet/minecraft/loot/function/LootFunctionType;}
@@ -149,7 +141,7 @@
     * @mapping {@literal hashed f_kkdvfnxn Lnet/minecraft/unmapped/C_daukiiao;f_kkdvfnxn:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named COPY_CUSTOM_DATA Lnet/minecraft/loot/function/LootFunctionTypes;COPY_CUSTOM_DATA:Lnet/minecraft/loot/function/LootFunctionType;}
     */
-   public static final LootFunctionType COPY_CUSTOM_DATA = register("copy_custom_data", C_hgtsxeep.CODEC);
+   public static final LootFunctionType COPY_CUSTOM_DATA = register("copy_custom_data", CopyCustomDataLootFunction.CODEC);
    /**
     * @mapping {@literal hashed f_gqbxufie Lnet/minecraft/unmapped/C_daukiiao;f_gqbxufie:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named COPY_STATE Lnet/minecraft/loot/function/LootFunctionTypes;COPY_STATE:Lnet/minecraft/loot/function/LootFunctionType;}
@@ -179,37 +171,37 @@
     * @mapping {@literal hashed f_edolzxte Lnet/minecraft/unmapped/C_daukiiao;f_edolzxte:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named SEQUENCE Lnet/minecraft/loot/function/LootFunctionTypes;SEQUENCE:Lnet/minecraft/loot/function/LootFunctionType;}
     */
-   public static final LootFunctionType SEQUENCE = register("sequence", C_ndfnieah.f_chvgkosj);
+   public static final LootFunctionType SEQUENCE = register("sequence", SequenceLootFunction.CODEC);
    /**
     * @mapping {@literal hashed f_atpilkgd Lnet/minecraft/unmapped/C_daukiiao;f_atpilkgd:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named COPY_COMPONENTS Lnet/minecraft/loot/function/LootFunctionTypes;COPY_COMPONENTS:Lnet/minecraft/loot/function/LootFunctionType;}
     */
-   public static final LootFunctionType COPY_COMPONENTS = register("copy_components", C_mbgfajkg.CODEC);
+   public static final LootFunctionType COPY_COMPONENTS = register("copy_components", CopyComponentsLootFunction.CODEC);
    /**
     * @mapping {@literal hashed f_lawmgqns Lnet/minecraft/unmapped/C_daukiiao;f_lawmgqns:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named SET_FIREWORKS Lnet/minecraft/loot/function/LootFunctionTypes;SET_FIREWORKS:Lnet/minecraft/loot/function/LootFunctionType;}
     */
-   public static final LootFunctionType SET_FIREWORKS = register("set_fireworks", C_ldqxohxy.CODEC);
+   public static final LootFunctionType SET_FIREWORKS = register("set_fireworks", SetFireworksLootFunction.CODEC);
    /**
     * @mapping {@literal hashed f_lnjnunhy Lnet/minecraft/unmapped/C_daukiiao;f_lnjnunhy:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named SET_FIREWORK_EXPLOSION Lnet/minecraft/loot/function/LootFunctionTypes;SET_FIREWORK_EXPLOSION:Lnet/minecraft/loot/function/LootFunctionType;}
     */
-   public static final LootFunctionType SET_FIREWORK_EXPLOSION = register("set_firework_explosion", C_wvihlkry.CODEC);
+   public static final LootFunctionType SET_FIREWORK_EXPLOSION = register("set_firework_explosion", SetFireworkExplosionLootFunction.CODEC);
    /**
     * @mapping {@literal hashed f_egxcvbyw Lnet/minecraft/unmapped/C_daukiiao;f_egxcvbyw:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named SET_BOOK_COVER Lnet/minecraft/loot/function/LootFunctionTypes;SET_BOOK_COVER:Lnet/minecraft/loot/function/LootFunctionType;}
     */
-   public static final LootFunctionType SET_BOOK_COVER = register("set_book_cover", C_gsgjanri.CODEC);
+   public static final LootFunctionType SET_BOOK_COVER = register("set_book_cover", SetBookCoverLootFunction.CODEC);
    /**
     * @mapping {@literal hashed f_lounqrub Lnet/minecraft/unmapped/C_daukiiao;f_lounqrub:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named SET_WRITTEN_BOOK_PAGES Lnet/minecraft/loot/function/LootFunctionTypes;SET_WRITTEN_BOOK_PAGES:Lnet/minecraft/loot/function/LootFunctionType;}
     */
-   public static final LootFunctionType SET_WRITTEN_BOOK_PAGES = register("set_written_book_pages", C_kkafruck.CODEC);
+   public static final LootFunctionType SET_WRITTEN_BOOK_PAGES = register("set_written_book_pages", SetWrittenBookPagesLootFunction.CODEC);
    /**
     * @mapping {@literal hashed f_fmotljoa Lnet/minecraft/unmapped/C_daukiiao;f_fmotljoa:Lnet/minecraft/unmapped/C_jjwwswyo;}
     * @mapping {@literal named SET_WRITABLE_BOOK_PAGES Lnet/minecraft/loot/function/LootFunctionTypes;SET_WRITABLE_BOOK_PAGES:Lnet/minecraft/loot/function/LootFunctionType;}
     */
-   public static final LootFunctionType SET_WRITABLE_BOOK_PAGES = register("set_writable_book_pages", C_qtpcfbnm.CODEC);
+   public static final LootFunctionType SET_WRITABLE_BOOK_PAGES = register("set_writable_book_pages", SetWritableBookPagesLootFunction.CODEC);
 
    /**
     * @mapping {@literal hashed m_pqvcpkan Lnet/minecraft/unmapped/C_daukiiao;m_pqvcpkan(Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_jjwwswyo;}
Only in namedSrc/net/minecraft/loot/function: SequenceLootFunction.java
Only in namedSrc/net/minecraft/loot/function: SetBookCoverLootFunction.java
Only in namedSrc/net/minecraft/loot/function: SetComponentsLootFunction.java
Only in namedSrc/net/minecraft/loot/function: SetCustomDataLootFunction.java
Only in namedSrc/net/minecraft/loot/function: SetFireworkExplosionLootFunction.java
Only in namedSrc/net/minecraft/loot/function: SetFireworksLootFunction.java
diff -bur namedTargetSrc/net/minecraft/loot/function/SetStewEffectLootFunction.java namedSrc/net/minecraft/loot/function/SetStewEffectLootFunction.java
--- namedTargetSrc/net/minecraft/loot/function/SetStewEffectLootFunction.java	2024-03-19 16:58:04.479252990 +0000
+++ namedSrc/net/minecraft/loot/function/SetStewEffectLootFunction.java	2024-03-19 16:56:55.171263345 +0000
@@ -45,9 +45,10 @@
       }
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_tjmdlomo Lnet/minecraft/unmapped/C_jktghael;f_tjmdlomo:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/loot/function/SetStewEffectLootFunction;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<SetStewEffectLootFunction> f_tjmdlomo = RecordCodecBuilder.create(
+   public static final Codec<SetStewEffectLootFunction> CODEC = RecordCodecBuilder.create(
       instance -> m_hfvcjbcy(instance)
             .and(Codecs.createStrictOptionalField(f_icrcoqso, "effects", List.of()).forGetter(arg -> arg.f_eqbofuad))
             .apply(instance, SetStewEffectLootFunction::new)
Only in namedSrc/net/minecraft/loot/function: SetWritableBookPagesLootFunction.java
Only in namedSrc/net/minecraft/loot/function: SetWrittenBookPagesLootFunction.java
diff -bur namedTargetSrc/net/minecraft/loot/LootDataType.java namedSrc/net/minecraft/loot/LootDataType.java
--- namedTargetSrc/net/minecraft/loot/LootDataType.java	2024-03-19 16:58:04.383252980 +0000
+++ namedSrc/net/minecraft/loot/LootDataType.java	2024-03-19 16:56:55.003263330 +0000
@@ -33,7 +33,7 @@
     * @mapping {@literal hashed f_dqzoxwli Lnet/minecraft/unmapped/C_gvzqwcwq;f_dqzoxwli:Lnet/minecraft/unmapped/C_gvzqwcwq;}
     * @mapping {@literal named ITEM_MODIFIERS Lnet/minecraft/loot/LootDataType;ITEM_MODIFIERS:Lnet/minecraft/loot/LootDataType;}
     */
-   public static final LootDataType<LootFunction> ITEM_MODIFIERS = new LootDataType<>(LootFunctionTypes.f_hcnwqyvm, "item_modifiers", createSimpleValidator());
+   public static final LootDataType<LootFunction> ITEM_MODIFIERS = new LootDataType<>(LootFunctionTypes.CODEC, "item_modifiers", createSimpleValidator());
    /**
     * @mapping {@literal hashed f_ixselpox Lnet/minecraft/unmapped/C_gvzqwcwq;f_ixselpox:Lnet/minecraft/unmapped/C_gvzqwcwq;}
     * @mapping {@literal named LOOT_TABLES Lnet/minecraft/loot/LootDataType;LOOT_TABLES:Lnet/minecraft/loot/LootDataType;}
diff -bur namedTargetSrc/net/minecraft/loot/LootPool.java namedSrc/net/minecraft/loot/LootPool.java
--- namedTargetSrc/net/minecraft/loot/LootPool.java	2024-03-19 16:58:04.515252994 +0000
+++ namedSrc/net/minecraft/loot/LootPool.java	2024-03-19 16:56:55.231263350 +0000
@@ -40,7 +40,7 @@
       instance -> instance.group(
                LootPoolEntryTypes.CODEC.listOf().fieldOf("entries").forGetter(arg -> arg.entries),
                Codecs.createStrictOptionalField(LootConditionTypes.CODEC.listOf(), "conditions", List.of()).forGetter(arg -> arg.conditions),
-               Codecs.createStrictOptionalField(LootFunctionTypes.f_hcnwqyvm.listOf(), "functions", List.of()).forGetter(arg -> arg.functions),
+               Codecs.createStrictOptionalField(LootFunctionTypes.CODEC.listOf(), "functions", List.of()).forGetter(arg -> arg.functions),
                LootNumberProviderTypes.CODEC.fieldOf("rolls").forGetter(arg -> arg.rolls),
                LootNumberProviderTypes.CODEC.fieldOf("bonus_rolls").orElse(ConstantLootNumberProvider.create(0.0F)).forGetter(arg -> arg.bonusRolls)
             )
diff -bur namedTargetSrc/net/minecraft/loot/LootTable.java namedSrc/net/minecraft/loot/LootTable.java
--- namedTargetSrc/net/minecraft/loot/LootTable.java	2024-03-19 16:58:04.443252987 +0000
+++ namedSrc/net/minecraft/loot/LootTable.java	2024-03-19 16:56:55.107263339 +0000
@@ -61,7 +61,7 @@
                LootContextTypes.CODEC.optionalFieldOf("type", GENERIC).forGetter(arg -> arg.type),
                Codecs.createStrictOptionalField(Identifier.CODEC, "random_sequence").forGetter(arg -> arg.randomSequenceId),
                Codecs.createStrictOptionalField(LootPool.CODEC.listOf(), "pools", List.of()).forGetter(arg -> arg.pools),
-               Codecs.createStrictOptionalField(LootFunctionTypes.f_hcnwqyvm.listOf(), "functions", List.of()).forGetter(arg -> arg.functions)
+               Codecs.createStrictOptionalField(LootFunctionTypes.CODEC.listOf(), "functions", List.of()).forGetter(arg -> arg.functions)
             )
             .apply(instance, LootTable::new)
    );
Only in namedSrc/net/minecraft/network/configuration: SynchronizeRegistriesConfigurationTask.java
diff -bur namedTargetSrc/net/minecraft/network/message/MessageType.java namedSrc/net/minecraft/network/message/MessageType.java
--- namedTargetSrc/net/minecraft/network/message/MessageType.java	2024-03-19 16:58:04.355252977 +0000
+++ namedSrc/net/minecraft/network/message/MessageType.java	2024-03-19 16:56:54.955263326 +0000
@@ -7,6 +7,7 @@
 import net.minecraft.network.RegistryByteBuf;
 import net.minecraft.network.codec.PacketCodec;
 import net.minecraft.network.codec.PacketCodecs;
+import net.minecraft.registry.BootstrapContext;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.Registry;
@@ -15,7 +16,6 @@
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.Text;
 import net.minecraft.text.TextCodecs;
-import net.minecraft.unmapped.C_hqoyyfco;
 import net.minecraft.util.Identifier;
 
 /**
@@ -84,28 +84,26 @@
 
    /**
     * @mapping {@literal hashed m_ndtnzjcd Lnet/minecraft/unmapped/C_hasnsypd;m_ndtnzjcd(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
-    * @mapping {@literal named bootstrap Lnet/minecraft/network/message/MessageType;bootstrap(Lnet/minecraft/unmapped/C_hqoyyfco;)V}
+    * @mapping {@literal named bootstrap Lnet/minecraft/network/message/MessageType;bootstrap(Lnet/minecraft/registry/BootstrapContext;)V}
     */
-   public static void bootstrap(C_hqoyyfco<MessageType> messageTypes) {
-      messageTypes.m_pymxizhb(CHAT, new MessageType(WITH_SENDER, MessageStyle.withSender("chat.type.text.narrate")));
-      messageTypes.m_pymxizhb(
-         SAY_COMMAND, new MessageType(MessageStyle.withSender("chat.type.announcement"), MessageStyle.withSender("chat.type.text.narrate"))
-      );
-      messageTypes.m_pymxizhb(
+   public static void bootstrap(BootstrapContext<MessageType> messageTypes) {
+      messageTypes.register(CHAT, new MessageType(WITH_SENDER, MessageStyle.withSender("chat.type.text.narrate")));
+      messageTypes.register(SAY_COMMAND, new MessageType(MessageStyle.withSender("chat.type.announcement"), MessageStyle.withSender("chat.type.text.narrate")));
+      messageTypes.register(
          COMMAND_INCOMING,
          new MessageType(MessageStyle.incomingDirectMessage("commands.message.display.incoming"), MessageStyle.withSender("chat.type.text.narrate"))
       );
-      messageTypes.m_pymxizhb(
+      messageTypes.register(
          COMMAND_OUTGOING,
          new MessageType(MessageStyle.outgoingDirectMessage("commands.message.display.outgoing"), MessageStyle.withSender("chat.type.text.narrate"))
       );
-      messageTypes.m_pymxizhb(
+      messageTypes.register(
          TEAM_COMMAND_INCOMING, new MessageType(MessageStyle.withinTeam("chat.type.team.text"), MessageStyle.withSender("chat.type.text.narrate"))
       );
-      messageTypes.m_pymxizhb(
+      messageTypes.register(
          TEAM_COMMAND_OUTGOING, new MessageType(MessageStyle.withinTeam("chat.type.team.sent"), MessageStyle.withSender("chat.type.text.narrate"))
       );
-      messageTypes.m_pymxizhb(EMOTE_COMMAND, new MessageType(MessageStyle.withSender("chat.type.emote"), MessageStyle.withSender("chat.type.emote")));
+      messageTypes.register(EMOTE_COMMAND, new MessageType(MessageStyle.withSender("chat.type.emote"), MessageStyle.withSender("chat.type.emote")));
    }
 
    /**
Only in namedSrc/net/minecraft/predicate/entity: LightningBoltPredicate.java
Only in namedSrc/net/minecraft/registry: BootstrapContext.java
diff -bur namedTargetSrc/net/minecraft/registry/OneTwentyOneBuiltinRegistries.java namedSrc/net/minecraft/registry/OneTwentyOneBuiltinRegistries.java
--- namedTargetSrc/net/minecraft/registry/OneTwentyOneBuiltinRegistries.java	2024-03-19 16:58:04.315252973 +0000
+++ namedSrc/net/minecraft/registry/OneTwentyOneBuiltinRegistries.java	2024-03-19 16:56:54.891263321 +0000
@@ -1,12 +1,12 @@
 package net.minecraft.registry;
 
 import java.util.concurrent.CompletableFuture;
-import net.minecraft.unmapped.C_guijqoip;
-import net.minecraft.unmapped.C_jhvluwkz;
-import net.minecraft.unmapped.C_lgcxeygt;
-import net.minecraft.unmapped.C_omkffqzw;
-import net.minecraft.unmapped.C_rgqlhlfp;
-import net.minecraft.unmapped.C_wzgeixxv;
+import net.minecraft.block.entity.OneTwentyOneBannerPatterns;
+import net.minecraft.entity.damage.OneTwentyOneDamageTypes;
+import net.minecraft.item.trim.OneTwentyOneTrimPatterns;
+import net.minecraft.structure.OneTwentyOneStructureSets;
+import net.minecraft.structure.pool.OneTwentyOneStructurePools;
+import net.minecraft.structure.processor.OneTwentyOneStructureProcessors;
 import net.minecraft.unmapped.C_xonezqea;
 
 /**
@@ -19,13 +19,13 @@
     * @mapping {@literal named REGISTRY_BUILDER Lnet/minecraft/registry/OneTwentyOneBuiltinRegistries;REGISTRY_BUILDER:Lnet/minecraft/registry/RegistrySetBuilder;}
     */
    private static final RegistrySetBuilder REGISTRY_BUILDER = new RegistrySetBuilder()
-      .add(RegistryKeys.STRUCTURE_POOL, C_lgcxeygt::m_mfefjhwc)
+      .add(RegistryKeys.STRUCTURE_POOL, OneTwentyOneStructurePools::bootstrap)
       .add(RegistryKeys.STRUCTURE_FEATURE, C_xonezqea::m_nqyuerlc)
-      .add(RegistryKeys.STRUCTURE_SET, C_rgqlhlfp::m_wcldnkbl)
-      .add(RegistryKeys.STRUCTURE_PROCESSOR_LIST, C_jhvluwkz::m_rxuycdif)
-      .add(RegistryKeys.DAMAGE_TYPE, C_omkffqzw::m_kfrxkjka)
-      .add(RegistryKeys.BANNER_PATTERN, C_guijqoip::m_zoccrwav)
-      .add(RegistryKeys.TRIM_PATTERN, C_wzgeixxv::m_rulonzyk);
+      .add(RegistryKeys.STRUCTURE_SET, OneTwentyOneStructureSets::bootstrap)
+      .add(RegistryKeys.STRUCTURE_PROCESSOR_LIST, OneTwentyOneStructureProcessors::bootstrap)
+      .add(RegistryKeys.DAMAGE_TYPE, OneTwentyOneDamageTypes::bootstrap)
+      .add(RegistryKeys.BANNER_PATTERN, OneTwentyOneBannerPatterns::bootstrap)
+      .add(RegistryKeys.TRIM_PATTERN, OneTwentyOneTrimPatterns::bootstrap);
 
    /**
     * @mapping {@literal hashed m_tbyxecnl Lnet/minecraft/unmapped/C_xjgowndt;m_tbyxecnl(Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture;}


The remaining diff is too long!

-Original file line number
+Diff line change
@@ Expand Up / @@ -111,6 +111,7 @@ opdeop @@
     opped
     // dfu
+    componentization
     datafixer
     datafixing
     renamening
@@ Expand Down @@

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		CLASS net/minecraft/unmapped/C_guijqoip net/minecraft/block/entity/OneTwentyOneBannerPatterns
		METHOD m_zoccrwav bootstrap (Lnet/minecraft/unmapped/C_hqoyyfco;)V

-Original file line number
+Diff line change
@@ -0,0 +1,24 @@
+    CLASS net/minecraft/unmapped/C_tkoofxmf net/minecraft/client/gui/screen/BanScreenFactories
+    	FIELD f_nompjvqy TEMPORARY_BAN_TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
+    	FIELD f_okfwlrev NAME_BAN_TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
+    	FIELD f_ptgyazcd SKIN_BAN_TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
+    	FIELD f_shquzbmj PERMANENT_BAN_TITLE Lnet/minecraft/unmapped/C_rdaqiwdt;
+    	FIELD f_svznhwft SKIN_BAN_DESCRIPTION Lnet/minecraft/unmapped/C_rdaqiwdt;
+    	METHOD m_bkhgjebh createSkinBanScreen (Ljava/lang/Runnable;)Lnet/minecraft/unmapped/C_vpzsgabs;
+    		ARG 0 callback
+    	METHOD m_dmbefmvo getDescriptionText (Lcom/mojang/authlib/minecraft/BanDetails;)Lnet/minecraft/unmapped/C_rdaqiwdt;
+    		ARG 0 banDetails
+    	METHOD m_jdcanqoh getReasonText (Lcom/mojang/authlib/minecraft/BanDetails;)Lnet/minecraft/unmapped/C_rdaqiwdt;
+    		ARG 0 banDetails
+    	METHOD m_kkrfulue createUsernameBanScreen (Ljava/lang/String;Ljava/lang/Runnable;)Lnet/minecraft/unmapped/C_vpzsgabs;
+    		ARG 1 callback
+    	METHOD m_ntzfyzag getBanType (Lcom/mojang/authlib/minecraft/BanDetails;)Z
+    		ARG 0 banDetails
+    	METHOD m_odezxkdz createBanScreen (Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lcom/mojang/authlib/minecraft/BanDetails;)Lnet/minecraft/unmapped/C_vpzsgabs;
+    		ARG 1 banDetails
+    	METHOD m_pbntgobw getBannedTitle (Lcom/mojang/authlib/minecraft/BanDetails;)Lnet/minecraft/unmapped/C_rdaqiwdt;
+    		ARG 0 banDetails
+    	METHOD m_xbymeuys getBanDuration (Lcom/mojang/authlib/minecraft/BanDetails;)Lnet/minecraft/unmapped/C_rdaqiwdt;
+    		ARG 0 banDetails
+    	METHOD m_ycbhwjwz getBanDurationText (Lcom/mojang/authlib/minecraft/BanDetails;)Lnet/minecraft/unmapped/C_rdaqiwdt;
+    		ARG 0 banDetails

-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    CLASS net/minecraft/unmapped/C_ddcesbvk net/minecraft/client/render/entity/BoggedEntityRenderer
+    	FIELD f_bcleisgn OVERLAY_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;
+    	FIELD f_dsudahle TEXTURE Lnet/minecraft/unmapped/C_ncpywfca;

-Original file line number
+Diff line change
@@ -1,2 +1,5 @@
     CLASS net/minecraft/unmapped/C_ctkzhiqu net/minecraft/client/render/entity/animation/ArmadilloEntityAnimations
+    	FIELD f_avlxnhtb UNROLLING Lnet/minecraft/unmapped/C_mnzbondw;
+    	FIELD f_bbyvliiy SCARED Lnet/minecraft/unmapped/C_mnzbondw;
     	FIELD f_kdacdgzm WALK Lnet/minecraft/unmapped/C_mnzbondw;
+    	FIELD f_sotwqpnh ROLLING Lnet/minecraft/unmapped/C_mnzbondw;

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

3 comments on commit `00dc8a6`

github-actions bot commented on `00dc8a6` Mar 19, 2024

github-actions bot commented on `00dc8a6` Mar 19, 2024

github-actions bot commented on `00dc8a6` Mar 19, 2024

-Original file line number
+Diff line change
@@ -0,0 +1,7 @@
+    CLASS net/minecraft/unmapped/C_lxpdzvpe net/minecraft/client/render/entity/feature/SkeletonOverlayFeatureRenderer
+    	FIELD f_msekwirk model Lnet/minecraft/unmapped/C_lhqnvntm;
+    	FIELD f_osomazip texture Lnet/minecraft/unmapped/C_ncpywfca;
+    	METHOD <init> (Lnet/minecraft/unmapped/C_mjeyymcw;Lnet/minecraft/unmapped/C_qncyfzro;Lnet/minecraft/unmapped/C_rghfgwax;Lnet/minecraft/unmapped/C_ncpywfca;)V
+    		ARG 2 modelLoader
+    		ARG 3 layer
+    		ARG 4 texture

-Original file line number
+Diff line change
@@ -0,0 +1,16 @@
+    CLASS net/minecraft/unmapped/C_qcaxblsy net/minecraft/client/render/entity/model/BreezeEntityModel
+    	FIELD f_crfmsyyc wind Lnet/minecraft/unmapped/C_rglqxnbw;
+    	FIELD f_fbxwkrrt windBottom Lnet/minecraft/unmapped/C_rglqxnbw;
+    	FIELD f_gidaxcft head Lnet/minecraft/unmapped/C_rglqxnbw;
+    	FIELD f_lgrdvvwu root Lnet/minecraft/unmapped/C_rglqxnbw;
+    	FIELD f_rrhlhyae windMid Lnet/minecraft/unmapped/C_rglqxnbw;
+    	FIELD f_tdgznihf eyes Lnet/minecraft/unmapped/C_rglqxnbw;
+    	FIELD f_xjifswvl rods Lnet/minecraft/unmapped/C_rglqxnbw;
+    	FIELD f_ziiweddz windTop Lnet/minecraft/unmapped/C_rglqxnbw;
+    	METHOD <init> (Lnet/minecraft/unmapped/C_rglqxnbw;)V
+    		ARG 1 root
+    	METHOD m_dfjyavaz getBodyRods ()Lnet/minecraft/unmapped/C_rglqxnbw;
+    	METHOD m_jfxtcafk getBodyEyes ()Lnet/minecraft/unmapped/C_rglqxnbw;
+    	METHOD m_mdluoqeq getTexturedModelData (II)Lnet/minecraft/unmapped/C_ybmhebgt;
+    	METHOD m_rbhceaic getBodyHead ()Lnet/minecraft/unmapped/C_rglqxnbw;
+    	METHOD m_tgpjmyzq getWind ()Lnet/minecraft/unmapped/C_rglqxnbw;

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_anbkwmoa SKELETON_OUTER_ARMOR Lnet/minecraft/unmapped/C_rghfgwax;
     	FIELD f_bjfsnbhp ZOMBIE_OUTER_ARMOR Lnet/minecraft/unmapped/C_rghfgwax;
     	FIELD f_brgczitv STRIDER_SADDLE Lnet/minecraft/unmapped/C_rghfgwax;
+    	FIELD f_btvjrcbe BOGGED_OUTER_ARMOR Lnet/minecraft/unmapped/C_rghfgwax;
     	FIELD f_cpmduxle MAIN Ljava/lang/String;
     	FIELD f_cujillju PIGLIN_INNER_ARMOR Lnet/minecraft/unmapped/C_rghfgwax;
     	FIELD f_djzfoqmf PIGLIN_BRUTE_INNER_ARMOR Lnet/minecraft/unmapped/C_rghfgwax;
@@ Expand Down Expand Up @@
     	FIELD f_uiqzmchr ZOMBIE_VILLAGER_INNER_ARMOR Lnet/minecraft/unmapped/C_rghfgwax;
     	FIELD f_urhvwxgy PIGLIN_OUTER_ARMOR Lnet/minecraft/unmapped/C_rghfgwax;
     	FIELD f_uwqpsglo WITHER_SKELETON_INNER_ARMOR Lnet/minecraft/unmapped/C_rghfgwax;
+    	FIELD f_vfxufezl BOGGED_OUTER Lnet/minecraft/unmapped/C_rghfgwax;
+    	FIELD f_vvapuulj BOGGED_INNER_ARMOR Lnet/minecraft/unmapped/C_rghfgwax;
     	FIELD f_wrrxqsac LLAMA_DECOR Lnet/minecraft/unmapped/C_rghfgwax;
     	FIELD f_wxeqdekc TROPICAL_FISH_LARGE_PATTERN Lnet/minecraft/unmapped/C_rghfgwax;
     	FIELD f_yckzdcej WITHER_SKELETON_OUTER_ARMOR Lnet/minecraft/unmapped/C_rghfgwax;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_rovodljg LEFT_FOOT Ljava/lang/String;
     	FIELD f_rpqxkvnu LEFT_CHEST Ljava/lang/String;
     	FIELD f_rrajhrdp RIGHT_WING Ljava/lang/String;
+    	FIELD f_rxrcytbt MUSHROOMS Ljava/lang/String;
     	FIELD f_szwtcajk LEFT_MID_LEG Ljava/lang/String;
     	FIELD f_tiocpyad RIGHT_HORN Ljava/lang/String;
     	FIELD f_tqzmekau LEFT_ARM Ljava/lang/String;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,2 +1,4 @@
     CLASS net/minecraft/unmapped/C_lhqnvntm net/minecraft/client/render/entity/model/SkeletonEntityModel
     	METHOD m_dvxjyfsj getTexturedModelData ()Lnet/minecraft/unmapped/C_ybmhebgt;
+    	METHOD m_xcazdwfc addLimbs (Lnet/minecraft/unmapped/C_lacpzcxf;)V
+    		ARG 0 data

-Original file line number
+Diff line change
@@ Expand Up @@
     	METHOD <init> (Lcom/mojang/serialization/Codec;Ljava/nio/channels/FileChannel;)V
     		ARG 1 codec
     		ARG 2 channel
+    	METHOD close close ()V
     	METHOD m_gtgtkpii open (Lcom/mojang/serialization/Codec;Ljava/nio/file/Path;)Lnet/minecraft/unmapped/C_wtehsvxb;
     		ARG 0 codec
     		ARG 1 path
@@ Expand Down @@

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_pfkoukpo net/minecraft/data/report/ItemListProvider

-Original file line number
+Diff line change
@@ -0,0 +1,4 @@
+    CLASS net/minecraft/unmapped/C_fhipkyzt net/minecraft/data/server/OneTwentyOneAdventureAdvancementsProvider
+    	METHOD m_acridfqq create (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/unmapped/C_ncoihxbl;
+    		ARG 0 output
+    		ARG 1 lookupProvider

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_lnzuulfo net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneChestLootTableProvider

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_kbczphds net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneEntityLootTableProvider

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_vvwjviqg net/minecraft/data/server/loot/one_twenty_one/OneTwentyOneShearingLootTableProvider

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_cmwiiqcn net/minecraft/data/server/loot_table/ShearingLootTableGenerator

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_jtuqxqpc net/minecraft/data/server/tag/one_twenty_one/OneTwentyOneBannerTagProvider

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_qugiptdx net/minecraft/data/server/tag/one_twenty_one/OneTwentyOneDamageTypeTagProvider

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_mmcppaqq net/minecraft/data/server/tag/one_twenty_one/OneTwentyOneEntityTypeTagProvider

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		CLASS net/minecraft/unmapped/C_qfhcarfn net/minecraft/datafixer/DataFixUtil
		METHOD m_lwiilffr optionalFields ([Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/types/templates/TypeTemplate;

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_dzejhezi BLOCK_STATE Lcom/mojang/datafixers/DSL$TypeReference;
     		COMMENT A type reference which refers to a block state.
     	FIELD f_eswwjwrw LEVEL Lcom/mojang/datafixers/DSL$TypeReference;
+    	FIELD f_etntycyl DATA_COMPONENTS Lcom/mojang/datafixers/DSL$TypeReference;
     	FIELD f_fipiwawr CHUNK_GENERATOR_SETTINGS Lcom/mojang/datafixers/DSL$TypeReference;
     		COMMENT A type reference which refers to chunk generator settings.
     	FIELD f_gcpbrldn ENTITY Lcom/mojang/datafixers/DSL$TypeReference;
@@ Expand Down @@

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_hhpdildx net/minecraft/datafixer/fix/AreaEffectCloudPotionFix

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_dglojnba net/minecraft/datafixer/fix/BannerPatternFormatFix

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_vvigtzbk net/minecraft/datafixer/fix/BeehiveFieldRenameFix

Commit

There are no files selected for viewing

3 comments on commit 00dc8a6

github-actions bot commented on 00dc8a6 Mar 19, 2024

Choose a reason for hiding this comment

github-actions bot commented on 00dc8a6 Mar 19, 2024

Choose a reason for hiding this comment

github-actions bot commented on 00dc8a6 Mar 19, 2024

Choose a reason for hiding this comment

3 comments on commit `00dc8a6`

github-actions bot commented on `00dc8a6` Mar 19, 2024

github-actions bot commented on `00dc8a6` Mar 19, 2024

github-actions bot commented on `00dc8a6` Mar 19, 2024

-Original file line number
+Diff line change
@@ Expand Up @@
     		ARG 0 oldSchema
     		ARG 1 name
     		ARG 2 rename
+    	METHOD makeRule makeRule ()Lcom/mojang/datafixers/TypeRewriteRule;

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_lntklpwx net/minecraft/datafixer/fix/BlockPosFormatFix

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_cgbvaywy net/minecraft/datafixer/fix/EmptyItemInHotbarFix

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_ozobotfj net/minecraft/datafixer/fix/HorseArmorFix

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_avvashtl net/minecraft/datafixer/fix/HorseChestIndexingFix

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    CLASS net/minecraft/unmapped/C_dxmxprhk net/minecraft/datafixer/fix/ItemStackComponentRemainderFix
+    	FIELD f_sfnhspmm oldComponentId Ljava/lang/String;
+    	FIELD f_tsvnmqvr name Ljava/lang/String;
+    	FIELD f_ytzdfflb newComponentId Ljava/lang/String;
+    	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;)V
+    		ARG 1 schema
+    		ARG 2 name
+    	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+    		ARG 1 schema
+    		ARG 2 name
+    		ARG 3 oldComponentId
+    		ARG 4 newComponentId
+    	METHOD m_ellancow fixComponent (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+    	METHOD makeRule makeRule ()Lcom/mojang/datafixers/TypeRewriteRule;

-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+    CLASS net/minecraft/unmapped/C_yfddtnnr net/minecraft/datafixer/fix/ItemStackComponentizationFix
+    	FIELD f_bkigsjbg POTION_ITEM_IDS Ljava/util/Set;
+    	FIELD f_ghmvdbpr COMMA_SPLITTER Lcom/google/common/base/Splitter;
+    	FIELD f_uaodxohr ENTITY_BUCKET_ITEM_IDS Ljava/util/Set;
+    	FIELD f_yzknnlmr RELEVANT_ENTITY_NBT_KEYS Ljava/util/List;
+    	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
+    		ARG 1 schema
+    	METHOD m_gujpxmba (Lnet/minecraft/unmapped/C_yfddtnnr$C_dhfttijx;Lcom/mojang/serialization/Dynamic;)V
+    		ARG 0 stackData
+    	CLASS C_dhfttijx StackData

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_nhmdchrs net/minecraft/datafixer/fix/LodestoneCompassComponentFix

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_ozrqvrww net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CLASS net/minecraft/unmapped/C_fstrwsah net/minecraft/datafixer/fix/PlayerHeadBlockProfileFix