More mappings (#570) · QuiltMC/quilt-mappings@f2fcee1

github-actions · 2024-04-02T00:31:37Z

With commit f2fcee1, 130 file(s) were updated with 778 line(s) added and 705 removed compared to the latest Quilt Mappings version.

View the diff here (1/3):

diff -bur namedTargetSrc/net/minecraft/advancement/Advancement.java namedSrc/net/minecraft/advancement/Advancement.java
--- namedTargetSrc/net/minecraft/advancement/Advancement.java	2024-04-02 00:31:35.617917213 +0000
+++ namedSrc/net/minecraft/advancement/Advancement.java	2024-04-02 00:30:22.429035538 +0000
@@ -146,11 +146,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mmibtmoe Lnet/minecraft/unmapped/C_kdwyuhdb;m_mmibtmoe(Lnet/minecraft/unmapped/C_jtpvewkp;Lnet/minecraft/unmapped/C_pzdchrcy$C_pbvqpmst;)V}
+    * @mapping {@literal named validate Lnet/minecraft/advancement/Advancement;validate(Lnet/minecraft/util/ErrorReporter;Lnet/minecraft/registry/HolderProvider$Provider;)V}
     */
-   public void m_mmibtmoe(ErrorReporter arg, HolderProvider.Provider arg2) {
+   public void validate(ErrorReporter errorReporter, HolderProvider.Provider lookup) {
       this.criteria.forEach((criterion, advancement) -> {
-         CriterionValidator lv = new CriterionValidator(arg.forChild(criterion), arg2);
+         CriterionValidator lv = new CriterionValidator(errorReporter.forChild(criterion), lookup);
          advancement.conditions().validate(lv);
       });
    }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/Criteria.java namedSrc/net/minecraft/advancement/criterion/Criteria.java
--- namedTargetSrc/net/minecraft/advancement/criterion/Criteria.java	2024-04-02 00:31:35.569916641 +0000
+++ namedSrc/net/minecraft/advancement/criterion/Criteria.java	2024-04-02 00:30:22.373034878 +0000
@@ -3,7 +3,6 @@
 import com.mojang.serialization.Codec;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
-import net.minecraft.unmapped.C_ggxgldwv;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_hmkjzbjo}
@@ -188,9 +187,10 @@
     */
    public static final LocationCriterionTrigger HERO_OF_THE_VILLAGE = register("hero_of_the_village", new LocationCriterionTrigger());
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_melyrayn Lnet/minecraft/unmapped/C_hmkjzbjo;f_melyrayn:Lnet/minecraft/unmapped/C_maikngon;}
+    * @mapping {@literal named VOLUNTARY_EXILE Lnet/minecraft/advancement/criterion/Criteria;VOLUNTARY_EXILE:Lnet/minecraft/advancement/criterion/LocationCriterionTrigger;}
     */
-   public static final LocationCriterionTrigger f_melyrayn = register("voluntary_exile", new LocationCriterionTrigger());
+   public static final LocationCriterionTrigger VOLUNTARY_EXILE = register("voluntary_exile", new LocationCriterionTrigger());
    /**
     * @mapping {@literal hashed f_bbejcplr Lnet/minecraft/unmapped/C_hmkjzbjo;f_bbejcplr:Lnet/minecraft/unmapped/C_guvqoceu;}
     * @mapping {@literal named SLIDE_DOWN_BLOCK Lnet/minecraft/advancement/criterion/Criteria;SLIDE_DOWN_BLOCK:Lnet/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger;}
@@ -297,13 +297,15 @@
     */
    public static final RecipeCraftedCriterionTrigger RECIPE_CRAFTED = register("recipe_crafted", new RecipeCraftedCriterionTrigger());
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ugbvqpld Lnet/minecraft/unmapped/C_hmkjzbjo;f_ugbvqpld:Lnet/minecraft/unmapped/C_thfyxhzz;}
+    * @mapping {@literal named CRAFTER_RECIPE_CRAFTED Lnet/minecraft/advancement/criterion/Criteria;CRAFTER_RECIPE_CRAFTED:Lnet/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger;}
     */
-   public static final RecipeCraftedCriterionTrigger f_ugbvqpld = register("crafter_recipe_crafted", new RecipeCraftedCriterionTrigger());
+   public static final RecipeCraftedCriterionTrigger CRAFTER_RECIPE_CRAFTED = register("crafter_recipe_crafted", new RecipeCraftedCriterionTrigger());
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yjeeyvuk Lnet/minecraft/unmapped/C_hmkjzbjo;f_yjeeyvuk:Lnet/minecraft/unmapped/C_ggxgldwv;}
+    * @mapping {@literal named FALL_AFTER_EXPLOSION Lnet/minecraft/advancement/criterion/Criteria;FALL_AFTER_EXPLOSION:Lnet/minecraft/advancement/criterion/FallAfterExplosionCriterionTrigger;}
     */
-   public static final C_ggxgldwv f_yjeeyvuk = register("fall_after_explosion", new C_ggxgldwv());
+   public static final FallAfterExplosionCriterionTrigger FALL_AFTER_EXPLOSION = register("fall_after_explosion", new FallAfterExplosionCriterionTrigger());
 
    /**
     * @mapping {@literal hashed m_iyxgljbn Lnet/minecraft/unmapped/C_hmkjzbjo;m_iyxgljbn(Ljava/lang/String;Lnet/minecraft/unmapped/C_mysyaxfs;)Lnet/minecraft/unmapped/C_mysyaxfs;}
Only in namedSrc/net/minecraft/advancement/criterion: FallAfterExplosionCriterionTrigger.java
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.java	2024-04-02 00:31:35.745918737 +0000
+++ namedSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.java	2024-04-02 00:30:22.581037328 +0000
@@ -73,10 +73,10 @@
 
       /**
        * @mapping {@literal hashed m_zrhvqutd Lnet/minecraft/unmapped/C_thfyxhzz$C_fznnyxkh;m_zrhvqutd(Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_rzypsigz;}
-       * @mapping {@literal named m_zrhvqutd Lnet/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger$Conditions;m_zrhvqutd(Lnet/minecraft/util/Identifier;)Lnet/minecraft/advancement/AdvancementCriterion;}
+       * @mapping {@literal named crafterCraftedItem Lnet/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger$Conditions;crafterCraftedItem(Lnet/minecraft/util/Identifier;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
-      public static AdvancementCriterion<RecipeCraftedCriterionTrigger.Conditions> m_zrhvqutd(Identifier recipeId) {
-         return Criteria.f_ugbvqpld.create(new RecipeCraftedCriterionTrigger.Conditions(Optional.empty(), recipeId, List.of()));
+      public static AdvancementCriterion<RecipeCraftedCriterionTrigger.Conditions> crafterCraftedItem(Identifier recipeId) {
+         return Criteria.CRAFTER_RECIPE_CRAFTED.create(new RecipeCraftedCriterionTrigger.Conditions(Optional.empty(), recipeId, List.of()));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/PlayerAdvancementTracker.java namedSrc/net/minecraft/advancement/PlayerAdvancementTracker.java
--- namedTargetSrc/net/minecraft/advancement/PlayerAdvancementTracker.java	2024-04-02 00:31:35.565916593 +0000
+++ namedSrc/net/minecraft/advancement/PlayerAdvancementTracker.java	2024-04-02 00:30:22.369034831 +0000
@@ -123,7 +123,7 @@
       this.owner = owner;
       this.tree = advancementLoader.getTree();
       int i = 1343;
-      this.codec = DataFixTypes.ADVANCEMENTS.m_uaejgwae(PlayerAdvancementTracker.Data.CODEC, dataFixer, 1343);
+      this.codec = DataFixTypes.ADVANCEMENTS.createDatafixCodec(PlayerAdvancementTracker.Data.CODEC, dataFixer, 1343);
       this.load(advancementLoader);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/CrafterBlock.java namedSrc/net/minecraft/block/CrafterBlock.java
--- namedTargetSrc/net/minecraft/block/CrafterBlock.java	2024-04-02 00:31:35.593916927 +0000
+++ namedSrc/net/minecraft/block/CrafterBlock.java	2024-04-02 00:30:22.401035208 +0000
@@ -310,7 +310,7 @@
          ItemDispenserBehavior.spawnItem(world, lv3, 6, lv, lv7);
 
          for (ServerPlayerEntity lv8 : world.getNonSpectatingEntities(ServerPlayerEntity.class, Box.of(lv6, 17.0, 17.0, 17.0))) {
-            Criteria.f_ugbvqpld.trigger(lv8, arg6.id(), blockEntity.getInvStack());
+            Criteria.CRAFTER_RECIPE_CRAFTED.trigger(lv8, arg6.id(), blockEntity.getInvStack());
          }
 
          world.syncWorldEvent(WorldEvents.CRAFTER_CRAFT, pos, 0);
diff -bur namedTargetSrc/net/minecraft/block/entity/BellBlockEntity.java namedSrc/net/minecraft/block/entity/BellBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BellBlockEntity.java	2024-04-02 00:31:35.813919547 +0000
+++ namedSrc/net/minecraft/block/entity/BellBlockEntity.java	2024-04-02 00:30:22.657038224 +0000
@@ -6,11 +6,11 @@
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.particle.EntityEffectParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.tag.EntityTypeTags;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_gjiczies;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Direction;
@@ -261,7 +261,9 @@
       
                for (int k = 0; k < j; k++) {
                   int l = mutableInt.addAndGet(5);
-                  world.addParticle(C_gjiczies.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, l), e, (double)((float)pos.getY() + 0.5F), g, 0.0, 0.0, 0.0);
+                  world.addParticle(
+                     EntityEffectParticleEffect.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, l), e, (double)((float)pos.getY() + 0.5F), g, 0.0, 0.0, 0.0
+                  );
                }
             }
          );
diff -bur namedTargetSrc/net/minecraft/client/gui/ParentElement.java namedSrc/net/minecraft/client/gui/ParentElement.java
--- namedTargetSrc/net/minecraft/client/gui/ParentElement.java	2024-04-02 00:31:35.645917546 +0000
+++ namedSrc/net/minecraft/client/gui/ParentElement.java	2024-04-02 00:30:22.461035915 +0000
@@ -147,7 +147,7 @@
     * Mapping not found
     */
    @Override
-   default void setFocused(boolean focused) {
+   default void setFocused(boolean bl) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java namedSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java	2024-04-02 00:31:35.757918880 +0000
+++ namedSrc/net/minecraft/client/gui/screen/realms/RealmsMainScreen.java	2024-04-02 00:30:22.593037470 +0000
@@ -1465,9 +1465,9 @@
        * Mapping not found
        */
       @Override
-      public void setFocused(boolean focused) {
-         super.setFocused(focused);
-         this.button.setFocused(focused);
+      public void setFocused(boolean bl) {
+         super.setFocused(bl);
+         this.button.setFocused(bl);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2024-04-02 00:31:35.785919213 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2024-04-02 00:30:22.625037846 +0000
@@ -440,8 +440,8 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
-      this.focused = focused;
+   public void setFocused(boolean bl) {
+      this.focused = bl;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/DraggingWidget.java namedSrc/net/minecraft/client/gui/widget/DraggingWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/DraggingWidget.java	2024-04-02 00:31:35.649917594 +0000
+++ namedSrc/net/minecraft/client/gui/widget/DraggingWidget.java	2024-04-02 00:30:22.469036009 +0000
@@ -120,7 +120,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
-      ParentElement.super.setFocused(focused);
+   public void setFocused(boolean bl) {
+      ParentElement.super.setFocused(bl);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/EditBoxWidget.java namedSrc/net/minecraft/client/gui/widget/EditBoxWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/EditBoxWidget.java	2024-04-02 00:31:35.737918642 +0000
+++ namedSrc/net/minecraft/client/gui/widget/EditBoxWidget.java	2024-04-02 00:30:22.573037234 +0000
@@ -341,9 +341,9 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
-      super.setFocused(focused);
-      if (focused) {
+   public void setFocused(boolean bl) {
+      super.setFocused(bl);
+      if (bl) {
          this.focusTime = Util.getMeasuringTimeMs();
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/HeaderBar.java namedSrc/net/minecraft/client/gui/widget/HeaderBar.java
--- namedTargetSrc/net/minecraft/client/gui/widget/HeaderBar.java	2024-04-02 00:31:35.833919785 +0000
+++ namedSrc/net/minecraft/client/gui/widget/HeaderBar.java	2024-04-02 00:30:22.685038554 +0000
@@ -122,10 +122,10 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
-      super.setFocused(focused);
+   public void setFocused(boolean bl) {
+      super.setFocused(bl);
       if (this.getFocused() != null) {
-         this.getFocused().setFocused(focused);
+         this.getFocused().setFocused(bl);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-04-02 00:31:35.557916498 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-04-02 00:30:22.361034737 +0000
@@ -871,7 +871,7 @@
        * @mapping {@literal named setFocused Lnet/minecraft/client/gui/widget/list/EntryListWidget$Entry;setFocused(Z)V}
        */
       @Override
-      public void setFocused(boolean focused) {
+      public void setFocused(boolean bl) {
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2024-04-02 00:31:35.649917594 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2024-04-02 00:30:22.469036009 +0000
@@ -292,7 +292,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
+   public void setFocused(boolean bl) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2024-04-02 00:31:35.789919261 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2024-04-02 00:30:22.633037941 +0000
@@ -645,7 +645,7 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
+   public void setFocused(boolean bl) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/SliderWidget.java namedSrc/net/minecraft/client/gui/widget/SliderWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/SliderWidget.java	2024-04-02 00:31:35.545916355 +0000
+++ namedSrc/net/minecraft/client/gui/widget/SliderWidget.java	2024-04-02 00:30:22.349034595 +0000
@@ -145,9 +145,9 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
-      super.setFocused(focused);
-      if (!focused) {
+   public void setFocused(boolean bl) {
+      super.setFocused(bl);
+      if (!bl) {
          this.mutable = false;
       } else {
          InputType lv = MinecraftClient.getInstance().getLastInputType();
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2024-04-02 00:31:35.581916784 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2024-04-02 00:30:22.389035066 +0000
@@ -734,10 +734,10 @@
     * Mapping not found
     */
    @Override
-   public void setFocused(boolean focused) {
-      if (this.focusUnlocked || focused) {
-         super.setFocused(focused);
-         if (focused) {
+   public void setFocused(boolean bl) {
+      if (this.focusUnlocked || bl) {
+         super.setFocused(bl);
+         if (bl) {
             this.f_ddgsctui = Util.getMeasuringTimeMs();
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java namedSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java	2024-04-02 00:31:35.549916403 +0000
+++ namedSrc/net/minecraft/client/network/ClientConfigurationNetworkHandler.java	2024-04-02 00:30:22.353034643 +0000
@@ -21,16 +21,16 @@
 import net.minecraft.network.packet.s2c.common.TagsSynchronizationS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.FinishConfigurationS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.RegistryDataS2CPacket;
+import net.minecraft.network.packet.s2c.configuration.ResetChatS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.SelectKnownPacksS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.SynchronizeEnabledFeatureFlagsS2CPacket;
 import net.minecraft.network.phase.PlayPhases;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.resource.AutoCloseableResourceManager;
 import net.minecraft.resource.ResourceFactory;
+import net.minecraft.resource.pack.KnownPack;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_jcuvnmyx;
-import net.minecraft.unmapped.C_kebqmtbz;
-import net.minecraft.unmapped.C_vuemjnoj;
 import net.minecraft.unmapped.C_wvzzfswm;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -148,7 +148,7 @@
          this.f_maiyfuqi = new C_wvzzfswm();
       }
 
-      List<C_kebqmtbz> list = this.f_maiyfuqi.m_freezzfp(packet.getKnownPacks());
+      List<KnownPack> list = this.f_maiyfuqi.m_freezzfp(packet.getKnownPacks());
       this.send(new SelectKnownPacksC2SPacket(list));
    }
 
@@ -156,7 +156,7 @@
     * Mapping not found
     */
    @Override
-   public void m_xpmvskpp(C_vuemjnoj arg) {
+   public void onResetChat(ResetChatS2CPacket packet) {
       this.f_npbcqpux = null;
    }
 
@@ -165,7 +165,7 @@
     */
    private <T> T m_pglrvykp(Function<ResourceFactory, T> function) {
       if (this.f_maiyfuqi == null) {
-         return (T)function.apply(ResourceFactory.f_ckpnwazu);
+         return (T)function.apply(ResourceFactory.EMPTY);
       } else {
          Object var3;
          try (AutoCloseableResourceManager lv = this.f_maiyfuqi.m_tgigfimw()) {
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-04-02 00:31:35.809919499 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-04-02 00:30:22.653038176 +0000
@@ -116,6 +116,7 @@
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.c2s.MessageAcknowledgmentC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatCommandC2SPacket;
+import net.minecraft.network.packet.c2s.play.ChatCommandSignedC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatSessionUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChunkBatchAcknowledgementC2SPacket;
@@ -280,7 +281,6 @@
 import net.minecraft.stat.StatHandler;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_hgofpcxx;
-import net.minecraft.unmapped.C_hnespdor;
 import net.minecraft.unmapped.C_jvzsxkum;
 import net.minecraft.unmapped.C_rrcmfgnk;
 import net.minecraft.unmapped.C_wkpqgkjo;
@@ -2914,7 +2914,7 @@
             MessageBody lvx = new MessageBody(string, instant, l, lv2.lastSeen());
             return this.messageChainPacker.pack(lvx);
          });
-         this.send(new C_hnespdor(command, instant, l, lv3, lv2.acknowledgment()));
+         this.send(new ChatCommandSignedC2SPacket(command, instant, l, lv3, lv2.acknowledgment()));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/particle/SpellParticle.java namedSrc/net/minecraft/client/particle/SpellParticle.java
--- namedTargetSrc/net/minecraft/client/particle/SpellParticle.java	2024-04-02 00:31:35.749918785 +0000
+++ namedSrc/net/minecraft/client/particle/SpellParticle.java	2024-04-02 00:30:22.585037375 +0000
@@ -6,7 +6,7 @@
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.particle.DefaultParticleType;
-import net.minecraft.unmapped.C_gjiczies;
+import net.minecraft.particle.EntityEffectParticleEffect;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.random.RandomGenerator;
 
@@ -92,7 +92,7 @@
     * @mapping {@literal named net/minecraft/client/particle/SpellParticle$C_xgeemgpq}
     */
    @Environment(EnvType.CLIENT)
-   public static class C_xgeemgpq implements ParticleFactory<C_gjiczies> {
+   public static class C_xgeemgpq implements ParticleFactory<EntityEffectParticleEffect> {
       /**
        * Mapping not found
        */
@@ -107,9 +107,9 @@
 
       /**
        * @mapping {@literal hashed createParticle Lnet/minecraft/unmapped/C_sscomrld$C_xgeemgpq;createParticle(Lnet/minecraft/unmapped/C_gjiczies;Lnet/minecraft/unmapped/C_ghdnlrrw;DDDDDD)Lnet/minecraft/unmapped/C_pfsoguef;}
-       * @mapping {@literal named createParticle Lnet/minecraft/client/particle/SpellParticle$C_xgeemgpq;createParticle(Lnet/minecraft/unmapped/C_gjiczies;Lnet/minecraft/client/world/ClientWorld;DDDDDD)Lnet/minecraft/client/particle/Particle;}
+       * @mapping {@literal named createParticle Lnet/minecraft/client/particle/SpellParticle$C_xgeemgpq;createParticle(Lnet/minecraft/particle/EntityEffectParticleEffect;Lnet/minecraft/client/world/ClientWorld;DDDDDD)Lnet/minecraft/client/particle/Particle;}
        */
-      public Particle createParticle(C_gjiczies arg, ClientWorld world, double d, double e, double f, double g, double h, double i) {
+      public Particle createParticle(EntityEffectParticleEffect arg, ClientWorld world, double d, double e, double f, double g, double h, double i) {
          Particle lv = new SpellParticle(world, d, e, f, g, h, i, this.f_idfsumtt);
          lv.setColor(arg.m_ttiphltz(), arg.m_pnqkildl(), arg.m_ihcdlzwk());
          lv.setColorAlpha(arg.m_dvvuftxj());
diff -bur namedTargetSrc/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.java namedSrc/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.java
--- namedTargetSrc/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.java	2024-04-02 00:31:35.813919547 +0000
+++ namedSrc/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.java	2024-04-02 00:30:22.657038224 +0000
@@ -15,14 +15,14 @@
 import net.minecraft.resource.pack.BuiltinPackProvider;
 import net.minecraft.resource.pack.DefaultPack;
 import net.minecraft.resource.pack.DefaultResourcePackBuilder;
+import net.minecraft.resource.pack.KnownPack;
+import net.minecraft.resource.pack.PackLocationInfo;
 import net.minecraft.resource.pack.PackProfile;
 import net.minecraft.resource.pack.PackSource;
 import net.minecraft.resource.pack.ResourcePack;
 import net.minecraft.resource.pack.metadata.BuiltinMetadata;
 import net.minecraft.resource.pack.metadata.PackResourceMetadataSection;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_kebqmtbz;
-import net.minecraft.unmapped.C_yebcvztn;
 import net.minecraft.unmapped.C_yzksgymh;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.path.SymlinkValidator;
@@ -61,10 +61,11 @@
       "programmer_art", Text.translatable("resourcePack.programmer_art.name"), "high_contrast", Text.translatable("resourcePack.high_contrast.name")
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_xtluyfeh Lnet/minecraft/unmapped/C_tbwfpyke;f_xtluyfeh:Lnet/minecraft/unmapped/C_yebcvztn;}
+    * @mapping {@literal named VANILLA_PACK_INFO Lnet/minecraft/client/resource/ClientBuiltinResourcePackProvider;VANILLA_PACK_INFO:Lnet/minecraft/resource/pack/PackLocationInfo;}
     */
-   private static final C_yebcvztn f_xtluyfeh = new C_yebcvztn(
-      "vanilla", Text.translatable("resourcePack.vanilla.name"), PackSource.PACK_SOURCE_BUILTIN, Optional.of(f_ogvtysbi)
+   private static final PackLocationInfo VANILLA_PACK_INFO = new PackLocationInfo(
+      "vanilla", Text.translatable("resourcePack.vanilla.name"), PackSource.PACK_SOURCE_BUILTIN, Optional.of(CORE_PACK_INFO)
    );
    /**
     * Mapping not found
@@ -97,10 +98,10 @@
 
    /**
     * @mapping {@literal hashed m_yfrhqxqn Lnet/minecraft/unmapped/C_tbwfpyke;m_yfrhqxqn(Ljava/lang/String;Lnet/minecraft/unmapped/C_rdaqiwdt;)Lnet/minecraft/unmapped/C_yebcvztn;}
-    * @mapping {@literal named m_yfrhqxqn Lnet/minecraft/client/resource/ClientBuiltinResourcePackProvider;m_yfrhqxqn(Ljava/lang/String;Lnet/minecraft/text/Text;)Lnet/minecraft/unmapped/C_yebcvztn;}
+    * @mapping {@literal named m_yfrhqxqn Lnet/minecraft/client/resource/ClientBuiltinResourcePackProvider;m_yfrhqxqn(Ljava/lang/String;Lnet/minecraft/text/Text;)Lnet/minecraft/resource/pack/PackLocationInfo;}
     */
-   private static C_yebcvztn m_yfrhqxqn(String string, Text title) {
-      return new C_yebcvztn(string, title, PackSource.PACK_SOURCE_BUILTIN, Optional.of(C_kebqmtbz.m_svzsbkpi(string)));
+   private static PackLocationInfo m_yfrhqxqn(String string, Text title) {
+      return new PackLocationInfo(string, title, PackSource.PACK_SOURCE_BUILTIN, Optional.of(KnownPack.createVanillaPack(string)));
    }
 
    /**
@@ -125,7 +126,7 @@
     */
    private static DefaultPack createVanillaResourcePack(Path externalAssetPath) {
       DefaultResourcePackBuilder lv = new DefaultResourcePackBuilder().withMetadata(BUILTIN_METADATA).withNamespaces("minecraft", "realms");
-      return lv.applyDevelopmentConfig().withDefaultPaths().withPath(ResourceType.CLIENT_RESOURCES, externalAssetPath).build(f_xtluyfeh);
+      return lv.applyDevelopmentConfig().withDefaultPaths().withPath(ResourceType.CLIENT_RESOURCES, externalAssetPath).build(VANILLA_PACK_INFO);
    }
 
    /**
@@ -143,7 +144,7 @@
    @Nullable
    @Override
    protected PackProfile createBuiltinPackProfile(ResourcePack resourcePack) {
-      return PackProfile.of(f_xtluyfeh, wrapToFactory(resourcePack), ResourceType.CLIENT_RESOURCES, f_rciswtsh);
+      return PackProfile.of(VANILLA_PACK_INFO, wrapToFactory(resourcePack), ResourceType.CLIENT_RESOURCES, f_rciswtsh);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/resource/RemoteResourcePackProvider.java namedSrc/net/minecraft/client/resource/RemoteResourcePackProvider.java
--- namedTargetSrc/net/minecraft/client/resource/RemoteResourcePackProvider.java	2024-04-02 00:31:35.753918832 +0000
+++ namedSrc/net/minecraft/client/resource/RemoteResourcePackProvider.java	2024-04-02 00:30:22.593037470 +0000
@@ -35,6 +35,7 @@
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.packet.c2s.common.ResourcePackStatusUpdateC2SPacket;
 import net.minecraft.resource.ResourceType;
+import net.minecraft.resource.pack.PackLocationInfo;
 import net.minecraft.resource.pack.PackProfile;
 import net.minecraft.resource.pack.PackProvider;
 import net.minecraft.resource.pack.PackSource;
@@ -45,7 +46,6 @@
 import net.minecraft.unmapped.C_qcnikyod;
 import net.minecraft.unmapped.C_tumlmgvl;
 import net.minecraft.unmapped.C_wbxficvd;
-import net.minecraft.unmapped.C_yebcvztn;
 import net.minecraft.unmapped.C_yzksgymh;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -389,10 +389,10 @@
       for (C_mjfziaze.C_dcfbmdob lv : Lists.reverse(list)) {
          String string = String.format(Locale.ROOT, "server/%08X/%s", this.f_rhyfckxd++, lv.id());
          Path path = lv.path();
-         C_yebcvztn lv2 = new C_yebcvztn(string, SERVER_RESOURCE_PACK_DESCRIPTION, this.f_hujhcick, Optional.empty());
+         PackLocationInfo lv2 = new PackLocationInfo(string, SERVER_RESOURCE_PACK_DESCRIPTION, this.f_hujhcick, Optional.empty());
          PackProfile.PackFactory lv3 = new ZipResourcePack.Factory(path);
          int i = SharedConstants.getGameVersion().getResourceVersion(ResourceType.CLIENT_RESOURCES);
-         PackProfile.C_pqanagva lv4 = PackProfile.m_pphzdvrq(lv2, lv3, i);
+         PackProfile.Metadata lv4 = PackProfile.loadMetadata(lv2, lv3, i);
          if (lv4 == null) {
             LOGGER.warn("Invalid pack metadata in {}, ignoring all", path);
             return null;
diff -bur namedTargetSrc/net/minecraft/command/argument/ParticleEffectArgumentType.java namedSrc/net/minecraft/command/argument/ParticleEffectArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/ParticleEffectArgumentType.java	2024-04-02 00:31:35.657917689 +0000
+++ namedSrc/net/minecraft/command/argument/ParticleEffectArgumentType.java	2024-04-02 00:30:22.477036103 +0000
@@ -110,8 +110,8 @@
     * @mapping {@literal hashed m_gdaxvlny Lnet/minecraft/unmapped/C_wvjakmzf;m_gdaxvlny(Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_qlzoaopu;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_nqucohct;}
     * @mapping {@literal named getParameters Lnet/minecraft/command/argument/ParticleEffectArgumentType;getParameters(Lcom/mojang/brigadier/StringReader;Lnet/minecraft/particle/ParticleType;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/ParticleEffect;}
     */
-   private static <T extends ParticleEffect> T getParameters(StringReader reader, ParticleType<T> arg, HolderLookup.Provider arg2) throws CommandSyntaxException {
-      return arg.getParametersFactory().m_kbqdvgnj(arg, reader, arg2);
+   private static <T extends ParticleEffect> T getParameters(StringReader reader, ParticleType<T> type, HolderLookup.Provider arg2) throws CommandSyntaxException {
+      return type.getParametersFactory().fromCommand(type, reader, arg2);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/one_twenty_one/OneTwentyOneAdventureTabAdvancementGenerator.java namedSrc/net/minecraft/data/server/advancement/one_twenty_one/OneTwentyOneAdventureTabAdvancementGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/one_twenty_one/OneTwentyOneAdventureTabAdvancementGenerator.java	2024-04-02 00:31:35.633917403 +0000
+++ namedSrc/net/minecraft/data/server/advancement/one_twenty_one/OneTwentyOneAdventureTabAdvancementGenerator.java	2024-04-02 00:30:22.449035774 +0000
@@ -8,6 +8,7 @@
 import net.minecraft.advancement.AdvancementHolder;
 import net.minecraft.advancement.AdvancementRewards;
 import net.minecraft.advancement.AdvancementType;
+import net.minecraft.advancement.criterion.FallAfterExplosionCriterionTrigger;
 import net.minecraft.advancement.criterion.ItemUsedOnLocationCriterionTrigger;
 import net.minecraft.advancement.criterion.LocationCriterionTrigger;
 import net.minecraft.advancement.criterion.OnKilledCriterionTrigger;
@@ -35,7 +36,6 @@
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.tag.DamageTypeTags;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_ggxgldwv;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.gen.structure.BuiltInStructures;
 
@@ -164,7 +164,7 @@
             true,
             false
          )
-         .putCriteria("crafter_crafted_crafter", RecipeCraftedCriterionTrigger.Conditions.m_zrhvqutd(new Identifier("minecraft:crafter")))
+         .putCriteria("crafter_crafted_crafter", RecipeCraftedCriterionTrigger.Conditions.crafterCraftedItem(new Identifier("minecraft:crafter")))
          .build(advancementConsumer, "adventure/crafters_crafting_crafters");
       Advancement.Builder.create()
          .parent(lv2)
@@ -180,7 +180,7 @@
          )
          .putCriteria(
             "who_needs_rockets",
-            C_ggxgldwv.C_lnhehbtr.m_btjdamgy(
+            FallAfterExplosionCriterionTrigger.Conditions.create(
                DistancePredicate.y(NumberRange.FloatRange.atLeast(7.0)), EntityPredicate.Builder.create().type(EntityType.WIND_CHARGE)
             )
          )
diff -bur namedTargetSrc/net/minecraft/datafixer/DataFixTypes.java namedSrc/net/minecraft/datafixer/DataFixTypes.java
--- namedTargetSrc/net/minecraft/datafixer/DataFixTypes.java	2024-04-02 00:31:35.669917832 +0000
+++ namedSrc/net/minecraft/datafixer/DataFixTypes.java	2024-04-02 00:30:22.493036292 +0000
@@ -142,18 +142,18 @@
 
    /**
     * @mapping {@literal hashed m_uaejgwae Lnet/minecraft/unmapped/C_ccrrfaqj;m_uaejgwae(Lcom/mojang/serialization/Codec;Lcom/mojang/datafixers/DataFixer;I)Lcom/mojang/serialization/Codec;}
-    * @mapping {@literal named m_uaejgwae Lnet/minecraft/datafixer/DataFixTypes;m_uaejgwae(Lcom/mojang/serialization/Codec;Lcom/mojang/datafixers/DataFixer;I)Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named createDatafixCodec Lnet/minecraft/datafixer/DataFixTypes;createDatafixCodec(Lcom/mojang/serialization/Codec;Lcom/mojang/datafixers/DataFixer;I)Lcom/mojang/serialization/Codec;}
     */
-   public <A> Codec<A> m_uaejgwae(Codec<A> codec, DataFixer dataFixer, int i) {
+   public <A> Codec<A> createDatafixCodec(Codec<A> codec, DataFixer dataFixer, int currentDataVersion) {
       return new Codec<A>() {
          /**
           * @mapping {@literal hashed encode Lnet/minecraft/unmapped/C_ccrrfaqj$C_alqyygvn;encode(Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;}
           * @mapping {@literal named encode Lnet/minecraft/datafixer/DataFixTypes$C_alqyygvn;encode(Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;}
           */
          @Override
-         public <T> DataResult<T> encode(A object, DynamicOps<T> ops, T object2) {
-            return codec.encode(object, ops, object2)
-               .flatMap(objectx -> ops.mergeToMap((T)objectx, ops.createString("DataVersion"), ops.createInt(DataFixTypes.getDataVersion())));
+         public <T> DataResult<T> encode(A input, DynamicOps<T> ops, T prefix) {
+            return codec.encode(input, ops, prefix)
+               .flatMap(object -> ops.mergeToMap((T)object, ops.createString("DataVersion"), ops.createInt(DataFixTypes.getDataVersion())));
          }
 
          /**
@@ -161,9 +161,9 @@
           * @mapping {@literal named decode Lnet/minecraft/datafixer/DataFixTypes$C_alqyygvn;decode(Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;}
           */
          @Override
-         public <T> DataResult<Pair<A, T>> decode(DynamicOps<T> ops, T object) {
-            int i = (Integer)ops.get(object, "DataVersion").flatMap(ops::getNumberValue).map(Number::intValue).result().orElse(i);
-            Dynamic<T> dynamic = new Dynamic<>(ops, ops.remove(object, "DataVersion"));
+         public <T> DataResult<Pair<A, T>> decode(DynamicOps<T> ops, T input) {
+            int i = (Integer)ops.get(input, "DataVersion").flatMap(ops::getNumberValue).map(Number::intValue).result().orElse(currentDataVersion);
+            Dynamic<T> dynamic = new Dynamic<>(ops, ops.remove(input, "DataVersion"));
             Dynamic<T> dynamic2 = DataFixTypes.this.updateDataFixer(dataFixer, dynamic, i);
             return codec.decode(dynamic2);
          }
diff -bur namedTargetSrc/net/minecraft/datafixer/DataFixUtil.java namedSrc/net/minecraft/datafixer/DataFixUtil.java
--- namedTargetSrc/net/minecraft/datafixer/DataFixUtil.java	2024-04-02 00:31:35.813919547 +0000
+++ namedSrc/net/minecraft/datafixer/DataFixUtil.java	2024-04-02 00:30:22.657038224 +0000
@@ -13,9 +13,9 @@
 public class DataFixUtil {
    /**
     * @mapping {@literal hashed m_jhmddjog Lnet/minecraft/unmapped/C_qfhcarfn;m_jhmddjog(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
-    * @mapping {@literal named m_jhmddjog Lnet/minecraft/datafixer/DataFixUtil;m_jhmddjog(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named fixBlockPos Lnet/minecraft/datafixer/DataFixUtil;fixBlockPos(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   public static Dynamic<?> m_jhmddjog(Dynamic<?> dynamic) {
+   public static Dynamic<?> fixBlockPos(Dynamic<?> dynamic) {
       Optional<Number> optional = dynamic.get("X").asNumber().result();
       Optional<Number> optional2 = dynamic.get("Y").asNumber().result();
       Optional<Number> optional3 = dynamic.get("Z").asNumber().result();
@@ -27,9 +27,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bclgngzq Lnet/minecraft/unmapped/C_qfhcarfn;m_bclgngzq(Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;}
+    * @mapping {@literal named cast Lnet/minecraft/datafixer/DataFixUtil;cast(Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;}
     */
-   public static <T, R> Typed<R> m_bclgngzq(Type<R> type, Typed<T> typed) {
+   public static <T, R> Typed<R> cast(Type<R> type, Typed<T> typed) {
       return new Typed<>(type, typed.getOps(), (R)typed.getValue());
    }
 }
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/AreaEffectCloudPotionFix.java namedSrc/net/minecraft/datafixer/fix/AreaEffectCloudPotionFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/AreaEffectCloudPotionFix.java	2024-04-02 00:31:35.793919308 +0000
+++ namedSrc/net/minecraft/datafixer/fix/AreaEffectCloudPotionFix.java	2024-04-02 00:30:22.637037988 +0000
@@ -25,14 +25,14 @@
     */
    @Override
    protected Typed<?> transform(Typed<?> inputType) {
-      return inputType.update(DSL.remainderFinder(), this::m_ievxdhik);
+      return inputType.update(DSL.remainderFinder(), this::fix);
    }
 
    /**
     * @mapping {@literal hashed m_ievxdhik Lnet/minecraft/unmapped/C_hhpdildx;m_ievxdhik(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
-    * @mapping {@literal named m_ievxdhik Lnet/minecraft/datafixer/fix/AreaEffectCloudPotionFix;m_ievxdhik(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named fix Lnet/minecraft/datafixer/fix/AreaEffectCloudPotionFix;fix(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   private <T> Dynamic<T> m_ievxdhik(Dynamic<T> dynamic) {
+   private <T> Dynamic<T> fix(Dynamic<T> dynamic) {
       Optional<Dynamic<T>> optional = dynamic.get("Color").result();
       Optional<Dynamic<T>> optional2 = dynamic.get("effects").result();
       Optional<Dynamic<T>> optional3 = dynamic.get("Potion").result();
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/BannerPatternFormatFix.java namedSrc/net/minecraft/datafixer/fix/BannerPatternFormatFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/BannerPatternFormatFix.java	2024-04-02 00:31:35.677917927 +0000
+++ namedSrc/net/minecraft/datafixer/fix/BannerPatternFormatFix.java	2024-04-02 00:30:22.501036386 +0000
@@ -14,9 +14,10 @@
  */
 public class BannerPatternFormatFix extends ChoiceFix {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ofediqax Lnet/minecraft/unmapped/C_dglojnba;f_ofediqax:Ljava/util/Map;}
+    * @mapping {@literal named OLD_TO_NEW_PATTERNS Lnet/minecraft/datafixer/fix/BannerPatternFormatFix;OLD_TO_NEW_PATTERNS:Ljava/util/Map;}
     */
-   private static final Map<String, String> f_ofediqax = Map.ofEntries(
+   private static final Map<String, String> OLD_TO_NEW_PATTERNS = Map.ofEntries(
       Map.entry("b", "minecraft:base"),
       Map.entry("bl", "minecraft:square_bottom_left"),
       Map.entry("br", "minecraft:square_bottom_right"),
@@ -73,37 +74,40 @@
     */
    @Override
    protected Typed<?> transform(Typed<?> inputType) {
-      return inputType.update(DSL.remainderFinder(), BannerPatternFormatFix::m_bdkitibn);
+      return inputType.update(DSL.remainderFinder(), BannerPatternFormatFix::replacePatterns);
    }
 
    /**
     * @mapping {@literal hashed m_bdkitibn Lnet/minecraft/unmapped/C_dglojnba;m_bdkitibn(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
-    * @mapping {@literal named m_bdkitibn Lnet/minecraft/datafixer/fix/BannerPatternFormatFix;m_bdkitibn(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named replacePatterns Lnet/minecraft/datafixer/fix/BannerPatternFormatFix;replacePatterns(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   private static Dynamic<?> m_bdkitibn(Dynamic<?> dynamic) {
-      return dynamic.renameAndFixField("Patterns", "patterns", dynamicx -> dynamicx.createList(dynamicx.asStream().map(BannerPatternFormatFix::m_hponfylw)));
+   private static Dynamic<?> replacePatterns(Dynamic<?> dynamic) {
+      return dynamic.renameAndFixField(
+         "Patterns", "patterns", dynamicx -> dynamicx.createList(dynamicx.asStream().map(BannerPatternFormatFix::replacePatternAndColor))
+      );
    }
 
    /**
     * @mapping {@literal hashed m_hponfylw Lnet/minecraft/unmapped/C_dglojnba;m_hponfylw(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
-    * @mapping {@literal named m_hponfylw Lnet/minecraft/datafixer/fix/BannerPatternFormatFix;m_hponfylw(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named replacePatternAndColor Lnet/minecraft/datafixer/fix/BannerPatternFormatFix;replacePatternAndColor(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   private static Dynamic<?> m_hponfylw(Dynamic<?> dynamic) {
+   private static Dynamic<?> replacePatternAndColor(Dynamic<?> dynamic) {
       dynamic = dynamic.renameAndFixField(
          "Pattern",
          "pattern",
          dynamicx -> DataFixUtils.orElse(
-               dynamicx.asString().map(string -> (String)f_ofediqax.getOrDefault(string, string)).map(dynamicx::createString).result(), dynamicx
+               dynamicx.asString().map(string -> (String)OLD_TO_NEW_PATTERNS.getOrDefault(string, string)).map(dynamicx::createString).result(), dynamicx
             )
       );
-      return dynamic.renameAndFixField("Color", "color", dynamicx -> dynamicx.createString(m_meylxmnz(dynamicx.asInt(0))));
+      return dynamic.renameAndFixField("Color", "color", dynamicx -> dynamicx.createString(getColor(dynamicx.asInt(0))));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_meylxmnz Lnet/minecraft/unmapped/C_dglojnba;m_meylxmnz(I)Ljava/lang/String;}
+    * @mapping {@literal named getColor Lnet/minecraft/datafixer/fix/BannerPatternFormatFix;getColor(I)Ljava/lang/String;}
     */
-   public static String m_meylxmnz(int i) {
-      return switch (i) {
+   public static String getColor(int color) {
+      return switch (color) {
          case 1 -> "orange";
          case 2 -> "magenta";
          case 3 -> "light_blue";
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/BeehiveFieldRenameFix.java namedSrc/net/minecraft/datafixer/fix/BeehiveFieldRenameFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/BeehiveFieldRenameFix.java	2024-04-02 00:31:35.701918213 +0000
+++ namedSrc/net/minecraft/datafixer/fix/BeehiveFieldRenameFix.java	2024-04-02 00:30:22.529036716 +0000
@@ -26,24 +26,25 @@
 
    /**
     * @mapping {@literal hashed m_ogmidexj Lnet/minecraft/unmapped/C_vvigtzbk;m_ogmidexj(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
-    * @mapping {@literal named m_ogmidexj Lnet/minecraft/datafixer/fix/BeehiveFieldRenameFix;m_ogmidexj(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named fixBeehive Lnet/minecraft/datafixer/fix/BeehiveFieldRenameFix;fixBeehive(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   private Dynamic<?> m_ogmidexj(Dynamic<?> dynamic) {
+   private Dynamic<?> fixBeehive(Dynamic<?> dynamic) {
       return dynamic.remove("Bees");
    }
 
    /**
     * @mapping {@literal hashed m_ocvytcpa Lnet/minecraft/unmapped/C_vvigtzbk;m_ocvytcpa(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
-    * @mapping {@literal named m_ocvytcpa Lnet/minecraft/datafixer/fix/BeehiveFieldRenameFix;m_ocvytcpa(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named fixBee Lnet/minecraft/datafixer/fix/BeehiveFieldRenameFix;fixBee(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   private Dynamic<?> m_ocvytcpa(Dynamic<?> dynamic) {
+   private Dynamic<?> fixBee(Dynamic<?> dynamic) {
       dynamic = dynamic.remove("EntityData");
       dynamic = dynamic.renameField("TicksInHive", "ticks_in_hive");
       return dynamic.renameField("MinOccupationTicks", "min_ticks_in_hive");
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed makeRule Lnet/minecraft/unmapped/C_vvigtzbk;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
+    * @mapping {@literal named makeRule Lnet/minecraft/datafixer/fix/BeehiveFieldRenameFix;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
     */
    @Override
    public TypeRewriteRule makeRule() {
@@ -59,13 +60,13 @@
          "BeehiveFieldRenameFix",
          type3,
          type4,
-         typed -> DataFixUtil.m_bclgngzq(
+         typed -> DataFixUtil.cast(
                type4,
                typed.updateTyped(
                   opticFinder,
-                  typedx -> typedx.update(DSL.remainderFinder(), this::m_ogmidexj)
+                  typedx -> typedx.update(DSL.remainderFinder(), this::fixBeehive)
                         .updateTyped(
-                           opticFinder2, typedxx -> typedxx.updateTyped(opticFinder3, typedxxx -> typedxxx.update(DSL.remainderFinder(), this::m_ocvytcpa))
+                           opticFinder2, typedxx -> typedxx.updateTyped(opticFinder3, typedxxx -> typedxxx.update(DSL.remainderFinder(), this::fixBee))
                         )
                )
             )
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/BlendingDataFix.java namedSrc/net/minecraft/datafixer/fix/BlendingDataFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/BlendingDataFix.java	2024-04-02 00:31:35.577916736 +0000
+++ namedSrc/net/minecraft/datafixer/fix/BlendingDataFix.java	2024-04-02 00:30:22.381034972 +0000
@@ -57,25 +57,25 @@
     * @mapping {@literal hashed m_foctrvhu Lnet/minecraft/unmapped/C_kjshtrfa;m_foctrvhu(Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/OptionalDynamic;)Lcom/mojang/serialization/Dynamic;}
     * @mapping {@literal named updateChunkNbt Lnet/minecraft/datafixer/fix/BlendingDataFix;updateChunkNbt(Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/OptionalDynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   private static Dynamic<?> updateChunkNbt(Dynamic<?> dynamic, OptionalDynamic<?> optionalDynamic) {
-      dynamic = dynamic.remove("blending_data");
-      boolean bl = "minecraft:overworld".equals(optionalDynamic.get("dimension").asString().result().orElse(""));
-      Optional<? extends Dynamic<?>> optional = dynamic.get("Status").result();
+   private static Dynamic<?> updateChunkNbt(Dynamic<?> chunk, OptionalDynamic<?> context) {
+      chunk = chunk.remove("blending_data");
+      boolean bl = "minecraft:overworld".equals(context.get("dimension").asString().result().orElse(""));
+      Optional<? extends Dynamic<?>> optional = chunk.get("Status").result();
       if (bl && optional.isPresent()) {
          String string = IdentifierNormalizingSchema.normalize(((Dynamic)optional.get()).asString("empty"));
-         Optional<? extends Dynamic<?>> optional2 = dynamic.get("below_zero_retrogen").result();
+         Optional<? extends Dynamic<?>> optional2 = chunk.get("below_zero_retrogen").result();
          if (!SKIP_BLENDING_STATUS.contains(string)) {
-            dynamic = updateBlendingData(dynamic, 384, -64);
+            chunk = updateBlendingData(chunk, 384, -64);
          } else if (optional2.isPresent()) {
             Dynamic<?> dynamic2 = (Dynamic<?>)optional2.get();
             String string2 = IdentifierNormalizingSchema.normalize(dynamic2.get("target_status").asString("empty"));
             if (!SKIP_BLENDING_STATUS.contains(string2)) {
-               dynamic = updateBlendingData(dynamic, 256, 0);
+               chunk = updateBlendingData(chunk, 256, 0);
             }
          }
       }
 
-      return dynamic;
+      return chunk;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/BlockNameFix.java namedSrc/net/minecraft/datafixer/fix/BlockNameFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/BlockNameFix.java	2024-04-02 00:31:35.565916593 +0000
+++ namedSrc/net/minecraft/datafixer/fix/BlockNameFix.java	2024-04-02 00:30:22.373034878 +0000
@@ -45,17 +45,18 @@
       if (!Objects.equals(type, type2)) {
          throw new IllegalStateException("block type is not what was expected.");
       } else {
-         TypeRewriteRule typeRewriteRule = this.fixTypeEverywhere(this.name + " for block", type2, ops -> pair -> pair.mapSecond(this::m_gfynbltp));
+         TypeRewriteRule typeRewriteRule = this.fixTypeEverywhere(this.name + " for block", type2, ops -> pair -> pair.mapSecond(this::renameBlock));
          TypeRewriteRule typeRewriteRule2 = this.fixTypeEverywhereTyped(
             this.name + " for block_state",
             this.getInputSchema().getType(TypeReferences.BLOCK_STATE),
-            typed -> typed.update(DSL.remainderFinder(), this::m_zyutiumf)
+            typed -> typed.update(DSL.remainderFinder(), this::fixBlockState)
          );
          TypeRewriteRule typeRewriteRule3 = this.fixTypeEverywhereTyped(
             this.name + " for flat_block_state",
             this.getInputSchema().getType(TypeReferences.FLAT_BLOCK_STATE),
             typed -> typed.update(
-                  DSL.remainderFinder(), dynamic -> DataFixUtils.orElse(dynamic.asString().result().map(this::m_yzgnosmh).map(dynamic::createString), dynamic)
+                  DSL.remainderFinder(),
+                  dynamic -> DataFixUtils.orElse(dynamic.asString().result().map(this::fixFlatBlockState).map(dynamic::createString), dynamic)
                )
          );
          return TypeRewriteRule.seq(typeRewriteRule, typeRewriteRule2, typeRewriteRule3);
@@ -64,20 +65,21 @@
 
    /**
     * @mapping {@literal hashed m_zyutiumf Lnet/minecraft/unmapped/C_wdyzpagx;m_zyutiumf(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
-    * @mapping {@literal named m_zyutiumf Lnet/minecraft/datafixer/fix/BlockNameFix;m_zyutiumf(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named fixBlockState Lnet/minecraft/datafixer/fix/BlockNameFix;fixBlockState(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   private Dynamic<?> m_zyutiumf(Dynamic<?> dynamic) {
+   private Dynamic<?> fixBlockState(Dynamic<?> dynamic) {
       Optional<String> optional = dynamic.get("Name").asString().result();
-      return optional.isPresent() ? dynamic.set("Name", dynamic.createString(this.m_gfynbltp((String)optional.get()))) : dynamic;
+      return optional.isPresent() ? dynamic.set("Name", dynamic.createString(this.renameBlock((String)optional.get()))) : dynamic;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yzgnosmh Lnet/minecraft/unmapped/C_wdyzpagx;m_yzgnosmh(Ljava/lang/String;)Ljava/lang/String;}
+    * @mapping {@literal named fixFlatBlockState Lnet/minecraft/datafixer/fix/BlockNameFix;fixFlatBlockState(Ljava/lang/String;)Ljava/lang/String;}
     */
-   private String m_yzgnosmh(String string) {
-      int i = string.indexOf(91);
-      int j = string.indexOf(123);
-      int k = string.length();
+   private String fixFlatBlockState(String block) {
+      int i = block.indexOf(91);
+      int j = block.indexOf(123);
+      int k = block.length();
       if (i > 0) {
          k = i;
       }
@@ -86,15 +88,16 @@
          k = Math.min(k, j);
       }
 
-      String string2 = string.substring(0, k);
-      String string3 = this.m_gfynbltp(string2);
-      return string3 + string.substring(k);
+      String string2 = block.substring(0, k);
+      String string3 = this.renameBlock(string2);
+      return string3 + block.substring(k);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_gfynbltp Lnet/minecraft/unmapped/C_wdyzpagx;m_gfynbltp(Ljava/lang/String;)Ljava/lang/String;}
+    * @mapping {@literal named renameBlock Lnet/minecraft/datafixer/fix/BlockNameFix;renameBlock(Ljava/lang/String;)Ljava/lang/String;}
     */
-   protected abstract String m_gfynbltp(String string);
+   protected abstract String renameBlock(String oldName);
 
    /**
     * @mapping {@literal hashed m_wotaakbv Lnet/minecraft/unmapped/C_wdyzpagx;m_wotaakbv(Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/DataFix;}
@@ -106,8 +109,8 @@
           * Mapping not found
           */
          @Override
-         protected String m_gfynbltp(String string) {
-            return (String)rename.apply(string);
+         protected String renameBlock(String oldName) {
+            return (String)rename.apply(oldName);
          }
       };
    }
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/BlockPosFormatFix.java namedSrc/net/minecraft/datafixer/fix/BlockPosFormatFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/BlockPosFormatFix.java	2024-04-02 00:31:35.693918117 +0000
+++ namedSrc/net/minecraft/datafixer/fix/BlockPosFormatFix.java	2024-04-02 00:30:22.517036574 +0000
@@ -22,9 +22,10 @@
  */
 public class BlockPosFormatFix extends DataFix {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_okkmsozd Lnet/minecraft/unmapped/C_lntklpwx;f_okkmsozd:Ljava/util/List;}
+    * @mapping {@literal named PATROL_TARGET_ENTITY_IDS Lnet/minecraft/datafixer/fix/BlockPosFormatFix;PATROL_TARGET_ENTITY_IDS:Ljava/util/List;}
     */
-   private static final List<String> f_okkmsozd = List.of(
+   private static final List<String> PATROL_TARGET_ENTITY_IDS = List.of(
       "minecraft:witch", "minecraft:ravager", "minecraft:pillager", "minecraft:illusioner", "minecraft:evoker", "minecraft:vindicator"
    );
 
@@ -37,12 +38,13 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ktyneubd Lnet/minecraft/unmapped/C_lntklpwx;m_ktyneubd(Lcom/mojang/datafixers/Typed;Ljava/util/Map;)Lcom/mojang/datafixers/Typed;}
+    * @mapping {@literal named fixBlockPosFormat Lnet/minecraft/datafixer/fix/BlockPosFormatFix;fixBlockPosFormat(Lcom/mojang/datafixers/Typed;Ljava/util/Map;)Lcom/mojang/datafixers/Typed;}
     */
-   private Typed<?> m_ktyneubd(Typed<?> typed, Map<String, String> map) {
+   private Typed<?> fixBlockPosFormat(Typed<?> typed, Map<String, String> oldToNewKey) {
       return typed.update(DSL.remainderFinder(), dynamic -> {
-         for (Entry<String, String> entry : map.entrySet()) {
-            dynamic = dynamic.renameAndFixField((String)entry.getKey(), (String)entry.getValue(), DataFixUtil::m_jhmddjog);
+         for (Entry<String, String> entry : oldToNewKey.entrySet()) {
+            dynamic = dynamic.renameAndFixField((String)entry.getKey(), (String)entry.getValue(), DataFixUtil::fixBlockPos);
          }
 
          return dynamic;
@@ -51,11 +53,11 @@
 
    /**
     * @mapping {@literal hashed m_mwdtslhk Lnet/minecraft/unmapped/C_lntklpwx;m_mwdtslhk(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
-    * @mapping {@literal named m_mwdtslhk Lnet/minecraft/datafixer/fix/BlockPosFormatFix;m_mwdtslhk(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named fixMapItemFrames Lnet/minecraft/datafixer/fix/BlockPosFormatFix;fixMapItemFrames(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   private <T> Dynamic<T> m_mwdtslhk(Dynamic<T> dynamic) {
+   private <T> Dynamic<T> fixMapItemFrames(Dynamic<T> dynamic) {
       return dynamic.update("frames", dynamicx -> dynamicx.createList(dynamicx.asStream().map(dynamicxx -> {
-            dynamicxx = dynamicxx.renameAndFixField("Pos", "pos", DataFixUtil::m_jhmddjog);
+            dynamicxx = dynamicxx.renameAndFixField("Pos", "pos", DataFixUtil::fixBlockPos);
             dynamicxx = dynamicxx.renameField("Rotation", "rotation");
             return dynamicxx.renameField("EntityId", "entity_id");
          }))).update("banners", dynamicx -> dynamicx.createList(dynamicx.asStream().map(dynamicxx -> {
@@ -66,18 +68,19 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed makeRule Lnet/minecraft/unmapped/C_lntklpwx;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
+    * @mapping {@literal named makeRule Lnet/minecraft/datafixer/fix/BlockPosFormatFix;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
     */
    @Override
    public TypeRewriteRule makeRule() {
       List<TypeRewriteRule> list = new ArrayList();
-      this.m_vwmshnpe(list);
-      this.m_ocrbhxpw(list);
+      this.addEntityRules(list);
+      this.addBlockEntityRules(list);
       list.add(
          this.fixTypeEverywhereTyped(
             "BlockPos format for map frames",
             this.getInputSchema().getType(TypeReferences.MAP_DATA),
-            typed -> typed.update(DSL.remainderFinder(), dynamic -> dynamic.update("data", this::m_mwdtslhk))
+            typed -> typed.update(DSL.remainderFinder(), dynamic -> dynamic.update("data", this::fixMapItemFrames))
          )
       );
       Type<?> type = this.getInputSchema().getType(TypeReferences.ITEM_STACK);
@@ -85,49 +88,52 @@
          this.fixTypeEverywhereTyped(
             "BlockPos format for compass target",
             type,
-            ItemNbtFix.m_dldfokfb(type, "minecraft:compass"::equals, dynamic -> dynamic.update("LodestonePos", DataFixUtil::m_jhmddjog))
+            ItemNbtFix.m_dldfokfb(type, "minecraft:compass"::equals, dynamic -> dynamic.update("LodestonePos", DataFixUtil::fixBlockPos))
          )
       );
       return TypeRewriteRule.seq(list);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vwmshnpe Lnet/minecraft/unmapped/C_lntklpwx;m_vwmshnpe(Ljava/util/List;)V}
+    * @mapping {@literal named addEntityRules Lnet/minecraft/datafixer/fix/BlockPosFormatFix;addEntityRules(Ljava/util/List;)V}
     */
-   private void m_vwmshnpe(List<TypeRewriteRule> list) {
-      list.add(this.m_yeyehovs(TypeReferences.ENTITY, "minecraft:bee", Map.of("HivePos", "hive_pos", "FlowerPos", "flower_pos")));
-      list.add(this.m_yeyehovs(TypeReferences.ENTITY, "minecraft:end_crystal", Map.of("BeamTarget", "beam_target")));
-      list.add(this.m_yeyehovs(TypeReferences.ENTITY, "minecraft:wandering_trader", Map.of("WanderTarget", "wander_target")));
+   private void addEntityRules(List<TypeRewriteRule> rules) {
+      rules.add(this.createEntityFixRule(TypeReferences.ENTITY, "minecraft:bee", Map.of("HivePos", "hive_pos", "FlowerPos", "flower_pos")));
+      rules.add(this.createEntityFixRule(TypeReferences.ENTITY, "minecraft:end_crystal", Map.of("BeamTarget", "beam_target")));
+      rules.add(this.createEntityFixRule(TypeReferences.ENTITY, "minecraft:wandering_trader", Map.of("WanderTarget", "wander_target")));
 
-      for (String string : f_okkmsozd) {
-         list.add(this.m_yeyehovs(TypeReferences.ENTITY, string, Map.of("PatrolTarget", "patrol_target")));
+      for (String string : PATROL_TARGET_ENTITY_IDS) {
+         rules.add(this.createEntityFixRule(TypeReferences.ENTITY, string, Map.of("PatrolTarget", "patrol_target")));
       }
 
-      list.add(
+      rules.add(
          this.fixTypeEverywhereTyped(
             "BlockPos format in Leash for mobs",
             this.getInputSchema().getType(TypeReferences.ENTITY),
-            typed -> typed.update(DSL.remainderFinder(), dynamic -> dynamic.renameAndFixField("Leash", "leash", DataFixUtil::m_jhmddjog))
+            typed -> typed.update(DSL.remainderFinder(), dynamic -> dynamic.renameAndFixField("Leash", "leash", DataFixUtil::fixBlockPos))
          )
       );
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ocrbhxpw Lnet/minecraft/unmapped/C_lntklpwx;m_ocrbhxpw(Ljava/util/List;)V}
+    * @mapping {@literal named addBlockEntityRules Lnet/minecraft/datafixer/fix/BlockPosFormatFix;addBlockEntityRules(Ljava/util/List;)V}
     */
-   private void m_ocrbhxpw(List<TypeRewriteRule> list) {
-      list.add(this.m_yeyehovs(TypeReferences.BLOCK_ENTITY, "minecraft:beehive", Map.of("FlowerPos", "flower_pos")));
-      list.add(this.m_yeyehovs(TypeReferences.BLOCK_ENTITY, "minecraft:end_gateway", Map.of("ExitPortal", "exit_portal")));
+   private void addBlockEntityRules(List<TypeRewriteRule> rules) {
+      rules.add(this.createEntityFixRule(TypeReferences.BLOCK_ENTITY, "minecraft:beehive", Map.of("FlowerPos", "flower_pos")));
+      rules.add(this.createEntityFixRule(TypeReferences.BLOCK_ENTITY, "minecraft:end_gateway", Map.of("ExitPortal", "exit_portal")));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yeyehovs Lnet/minecraft/unmapped/C_lntklpwx;m_yeyehovs(Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;Ljava/util/Map;)Lcom/mojang/datafixers/TypeRewriteRule;}
+    * @mapping {@literal named createEntityFixRule Lnet/minecraft/datafixer/fix/BlockPosFormatFix;createEntityFixRule(Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;Ljava/util/Map;)Lcom/mojang/datafixers/TypeRewriteRule;}
     */
-   private TypeRewriteRule m_yeyehovs(TypeReference typeReference, String string, Map<String, String> map) {
-      String string2 = "BlockPos format in " + map.keySet() + " for " + string + " (" + typeReference.typeName() + ")";
-      OpticFinder<?> opticFinder = DSL.namedChoice(string, this.getInputSchema().getChoiceType(typeReference, string));
+   private TypeRewriteRule createEntityFixRule(TypeReference typeReference, String id, Map<String, String> oldToNewKey) {
+      String string2 = "BlockPos format in " + oldToNewKey.keySet() + " for " + id + " (" + typeReference.typeName() + ")";
+      OpticFinder<?> opticFinder = DSL.namedChoice(id, this.getInputSchema().getChoiceType(typeReference, id));
       return this.fixTypeEverywhereTyped(
-         string2, this.getInputSchema().getType(typeReference), typed -> typed.updateTyped(opticFinder, typedx -> this.m_ktyneubd(typedx, map))
+         string2, this.getInputSchema().getType(typeReference), typed -> typed.updateTyped(opticFinder, typedx -> this.fixBlockPosFormat(typedx, oldToNewKey))
       );
    }
 }

github-actions · 2024-04-02T00:31:38Z

View the diff here (2/3):

diff -bur namedTargetSrc/net/minecraft/datafixer/fix/CauldronRenameFix.java namedSrc/net/minecraft/datafixer/fix/CauldronRenameFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/CauldronRenameFix.java	2024-04-02 00:31:35.833919785 +0000
+++ namedSrc/net/minecraft/datafixer/fix/CauldronRenameFix.java	2024-04-02 00:30:22.685038554 +0000
@@ -17,8 +17,8 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_vbhondoh;<init>(Lcom/mojang/datafixers/schemas/Schema;Z)V}
     * @mapping {@literal named <init> Lnet/minecraft/datafixer/fix/CauldronRenameFix;<init>(Lcom/mojang/datafixers/schemas/Schema;Z)V}
     */
-   public CauldronRenameFix(Schema outputSchema, boolean bl) {
-      super(outputSchema, bl);
+   public CauldronRenameFix(Schema outputSchema, boolean changesType) {
+      super(outputSchema, changesType);
    }
 
    /**
@@ -38,7 +38,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed makeRule Lnet/minecraft/unmapped/C_vbhondoh;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
+    * @mapping {@literal named makeRule Lnet/minecraft/datafixer/fix/CauldronRenameFix;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
     */
    @Override
    protected TypeRewriteRule makeRule() {
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/ChoiceWriteReadFix.java namedSrc/net/minecraft/datafixer/fix/ChoiceWriteReadFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/ChoiceWriteReadFix.java	2024-04-02 00:31:35.589916879 +0000
+++ namedSrc/net/minecraft/datafixer/fix/ChoiceWriteReadFix.java	2024-04-02 00:30:22.397035160 +0000
@@ -40,15 +40,16 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_gydoytis;<init>(Lcom/mojang/datafixers/schemas/Schema;ZLjava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)V}
     * @mapping {@literal named <init> Lnet/minecraft/datafixer/fix/ChoiceWriteReadFix;<init>(Lcom/mojang/datafixers/schemas/Schema;ZLjava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)V}
     */
-   public ChoiceWriteReadFix(Schema schema, boolean bl, String name, TypeReference type, String choiceName) {
-      super(schema, bl);
+   public ChoiceWriteReadFix(Schema schema, boolean changesType, String name, TypeReference type, String choiceName) {
+      super(schema, changesType);
       this.name = name;
       this.type = type;
       this.choiceName = choiceName;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed makeRule Lnet/minecraft/unmapped/C_gydoytis;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
+    * @mapping {@literal named makeRule Lnet/minecraft/datafixer/fix/ChoiceWriteReadFix;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
     */
    @Override
    public TypeRewriteRule makeRule() {
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.java namedSrc/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.java	2024-04-02 00:31:35.617917213 +0000
+++ namedSrc/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.java	2024-04-02 00:30:22.429035538 +0000
@@ -277,16 +277,16 @@
     * @mapping {@literal hashed m_gqnkferc Lnet/minecraft/unmapped/C_vixveote;m_gqnkferc(Lcom/mojang/serialization/Dynamic;Ljava/util/Set;)Lcom/mojang/serialization/Dynamic;}
     * @mapping {@literal named predictChunkStatusBeforeSurface Lnet/minecraft/datafixer/fix/ChunkHeightAndBiomeFix;predictChunkStatusBeforeSurface(Lcom/mojang/serialization/Dynamic;Ljava/util/Set;)Lcom/mojang/serialization/Dynamic;}
     */
-   private Dynamic<?> predictChunkStatusBeforeSurface(Dynamic<?> dynamic, Set<String> set) {
+   private Dynamic<?> predictChunkStatusBeforeSurface(Dynamic<?> dynamic, Set<String> blocks) {
       return dynamic.update("Status", dynamicx -> {
          String string = dynamicx.asString("empty");
          if (STATUS_IS_OR_AFTER_SURFACE.contains(string)) {
             return dynamicx;
          } else {
-            set.remove("minecraft:air");
-            boolean bl = !set.isEmpty();
-            set.removeAll(BLOCKS_BEFORE_FEATURE_STATUS);
-            boolean bl2 = !set.isEmpty();
+            blocks.remove("minecraft:air");
+            boolean bl = !blocks.isEmpty();
+            blocks.removeAll(BLOCKS_BEFORE_FEATURE_STATUS);
+            boolean bl2 = !blocks.isEmpty();
             if (bl2) {
                return dynamicx.createString("liquid_carvers");
             } else if ("noise".equals(string) || bl) {
@@ -302,11 +302,11 @@
     * @mapping {@literal hashed m_zlioptox Lnet/minecraft/unmapped/C_vixveote;m_zlioptox(Lcom/mojang/serialization/Dynamic;ZILorg/apache/commons/lang3/mutable/MutableBoolean;)[Lcom/mojang/serialization/Dynamic;}
     * @mapping {@literal named getBiomeContainers Lnet/minecraft/datafixer/fix/ChunkHeightAndBiomeFix;getBiomeContainers(Lcom/mojang/serialization/Dynamic;ZILorg/apache/commons/lang3/mutable/MutableBoolean;)[Lcom/mojang/serialization/Dynamic;}
     */
-   private static Dynamic<?>[] getBiomeContainers(Dynamic<?> dynamic, boolean isOverworld, int i, MutableBoolean mutableBoolean) {
+   private static Dynamic<?>[] getBiomeContainers(Dynamic<?> dynamic, boolean isOverworld, int i, MutableBoolean heightAlreadyUpdated) {
       Dynamic<?>[] dynamics = new Dynamic[isOverworld ? 24 : 16];
       int[] is = (int[])dynamic.get("Biomes").asIntStreamOpt().result().map(IntStream::toArray).orElse(null);
       if (is != null && is.length == 1536) {
-         mutableBoolean.setValue(true);
+         heightAlreadyUpdated.setValue(true);
 
          for (int j = 0; j < 24; j++) {
             int k = j;
@@ -341,8 +341,8 @@
     * @mapping {@literal hashed m_jsgzpkef Lnet/minecraft/unmapped/C_vixveote;m_jsgzpkef([II)I}
     * @mapping {@literal named getOldBiomeId Lnet/minecraft/datafixer/fix/ChunkHeightAndBiomeFix;getOldBiomeId([II)I}
     */
-   private static int getOldBiomeId(int[] biomes, int i) {
-      return biomes[i] & 0xFF;
+   private static int getOldBiomeId(int[] biomes, int index) {
+      return biomes[index] & 0xFF;
    }
 
    /**
@@ -350,31 +350,35 @@
     * @mapping {@literal named updateChunkTag Lnet/minecraft/datafixer/fix/ChunkHeightAndBiomeFix;updateChunkTag(Lcom/mojang/serialization/Dynamic;ZZZLjava/util/function/Supplier;)Lcom/mojang/serialization/Dynamic;}
     */
    private static Dynamic<?> updateChunkTag(
-      Dynamic<?> dynamic, boolean bl, boolean bl2, boolean bl3, Supplier<ProtoChunkTickListFix.SimplePalettedContainer> supplier
+      Dynamic<?> level,
+      boolean isOverworld,
+      boolean heightAlreadyUpdated,
+      boolean atNoiseStatus,
+      Supplier<ProtoChunkTickListFix.SimplePalettedContainer> supplier
    ) {
-      dynamic = dynamic.remove("Biomes");
-      if (!bl) {
-         return updateCarvingMasks(dynamic, 16, 0);
-      } else if (bl2) {
-         return updateCarvingMasks(dynamic, 24, 0);
+      level = level.remove("Biomes");
+      if (!isOverworld) {
+         return updateCarvingMasks(level, 16, 0);
+      } else if (heightAlreadyUpdated) {
+         return updateCarvingMasks(level, 24, 0);
       } else {
-         dynamic = updateHeightmaps(dynamic);
-         dynamic = addPaddingEntries(dynamic, "LiquidsToBeTicked");
-         dynamic = addPaddingEntries(dynamic, "PostProcessing");
-         dynamic = addPaddingEntries(dynamic, "ToBeTicked");
-         dynamic = updateCarvingMasks(dynamic, 24, 4);
-         dynamic = dynamic.update("UpgradeData", ChunkHeightAndBiomeFix::shiftUpgradeData);
-         if (!bl3) {
-            return dynamic;
+         level = updateHeightmaps(level);
+         level = addPaddingEntries(level, "LiquidsToBeTicked");
+         level = addPaddingEntries(level, "PostProcessing");
+         level = addPaddingEntries(level, "ToBeTicked");
+         level = updateCarvingMasks(level, 24, 4);
+         level = level.update("UpgradeData", ChunkHeightAndBiomeFix::shiftUpgradeData);
+         if (!atNoiseStatus) {
+            return level;
          } else {
-            Optional<? extends Dynamic<?>> optional = dynamic.get("Status").result();
+            Optional<? extends Dynamic<?>> optional = level.get("Status").result();
             if (optional.isPresent()) {
                Dynamic<?> dynamic2 = (Dynamic<?>)optional.get();
                String string = dynamic2.asString("");
                if (!"empty".equals(string)) {
-                  dynamic = dynamic.set(
+                  level = level.set(
                      "blending_data",
-                     dynamic.createMap(ImmutableMap.of(dynamic.createString("old_noise"), dynamic.createBoolean(STATUS_IS_OR_AFTER_NOISE.contains(string))))
+                     level.createMap(ImmutableMap.of(level.createString("old_noise"), level.createBoolean(STATUS_IS_OR_AFTER_NOISE.contains(string))))
                   );
                   ProtoChunkTickListFix.SimplePalettedContainer lv = (ProtoChunkTickListFix.SimplePalettedContainer)supplier.get();
                   if (lv != null) {
@@ -395,27 +399,27 @@
                      }
 
                      if (bl4 && bitSet.cardinality() != bitSet.size()) {
-                        Dynamic<?> dynamic4 = "full".equals(string) ? dynamic.createString("heightmaps") : dynamic2;
-                        dynamic = dynamic.set(
+                        Dynamic<?> dynamic4 = "full".equals(string) ? level.createString("heightmaps") : dynamic2;
+                        level = level.set(
                            "below_zero_retrogen",
-                           dynamic.createMap(
+                           level.createMap(
                               ImmutableMap.of(
-                                 dynamic.createString("target_status"),
+                                 level.createString("target_status"),
                                  dynamic4,
-                                 dynamic.createString("missing_bedrock"),
-                                 dynamic.createLongList(LongStream.of(bitSet.toLongArray()))
+                                 level.createString("missing_bedrock"),
+                                 level.createLongList(LongStream.of(bitSet.toLongArray()))
                               )
                            )
                         );
-                        dynamic = dynamic.set("Status", dynamic.createString("empty"));
+                        level = level.set("Status", level.createString("empty"));
                      }
 
-                     dynamic = dynamic.set("isLightOn", dynamic.createBoolean(false));
+                     level = level.set("isLightOn", level.createBoolean(false));
                   }
                }
             }
 
-            return dynamic;
+            return level;
          }
       }
    }
@@ -444,15 +448,15 @@
     * @mapping {@literal hashed m_iczggqwx Lnet/minecraft/unmapped/C_vixveote;m_iczggqwx(Lcom/mojang/serialization/Dynamic;II)Lcom/mojang/serialization/Dynamic;}
     * @mapping {@literal named updateCarvingMasks Lnet/minecraft/datafixer/fix/ChunkHeightAndBiomeFix;updateCarvingMasks(Lcom/mojang/serialization/Dynamic;II)Lcom/mojang/serialization/Dynamic;}
     */
-   private static Dynamic<?> updateCarvingMasks(Dynamic<?> dynamic, int i, int j) {
-      Dynamic<?> dynamic2 = dynamic.get("CarvingMasks").orElseEmptyMap();
+   private static Dynamic<?> updateCarvingMasks(Dynamic<?> level, int sectionsPerChunk, int oldBottomSectionY) {
+      Dynamic<?> dynamic2 = level.get("CarvingMasks").orElseEmptyMap();
       dynamic2 = dynamic2.updateMapValues(pair -> {
          long[] ls = BitSet.valueOf(((Dynamic)pair.getSecond()).asByteBuffer().array()).toLongArray();
-         long[] ms = new long[64 * i];
-         System.arraycopy(ls, 0, ms, 64 * j, ls.length);
-         return Pair.of((Dynamic)pair.getFirst(), dynamic.createLongList(LongStream.of(ms)));
+         long[] ms = new long[64 * sectionsPerChunk];
+         System.arraycopy(ls, 0, ms, 64 * oldBottomSectionY, ls.length);
+         return Pair.of((Dynamic)pair.getFirst(), level.createLongList(LongStream.of(ms)));
       });
-      return dynamic.set("CarvingMasks", dynamic2);
+      return level.set("CarvingMasks", dynamic2);
    }
 
    /**
@@ -517,18 +521,18 @@
     * @mapping {@literal hashed m_vhkegrfg Lnet/minecraft/unmapped/C_vixveote;m_vhkegrfg(Lcom/mojang/serialization/Dynamic;Lit/unimi/dsi/fastutil/ints/Int2IntFunction;)Lcom/mojang/serialization/Dynamic;}
     * @mapping {@literal named createBiomeContainer Lnet/minecraft/datafixer/fix/ChunkHeightAndBiomeFix;createBiomeContainer(Lcom/mojang/serialization/Dynamic;Lit/unimi/dsi/fastutil/ints/Int2IntFunction;)Lcom/mojang/serialization/Dynamic;}
     */
-   private static Dynamic<?> createBiomeContainer(Dynamic<?> dynamic, Int2IntFunction int2IntFunction) {
+   private static Dynamic<?> createBiomeContainer(Dynamic<?> level, Int2IntFunction biomeGetter) {
       Int2IntMap int2IntMap = new Int2IntLinkedOpenHashMap();
 
       for (int i = 0; i < 64; i++) {
-         int j = int2IntFunction.applyAsInt(i);
+         int j = biomeGetter.applyAsInt(i);
          if (!int2IntMap.containsKey(j)) {
             int2IntMap.put(j, int2IntMap.size());
          }
       }
 
-      Dynamic<?> dynamic2 = dynamic.createList(
-         int2IntMap.keySet().stream().map(integer -> dynamic.createString(RAW_BIOME_IDS.getOrDefault(integer.intValue(), "minecraft:plains")))
+      Dynamic<?> dynamic2 = level.createList(
+         int2IntMap.keySet().stream().map(integer -> level.createString(RAW_BIOME_IDS.getOrDefault(integer.intValue(), "minecraft:plains")))
       );
       int k = ceilLog2(int2IntMap.size());
       if (k == 0) {
@@ -541,7 +545,7 @@
          int o = 0;
 
          for (int p = 0; p < 64; p++) {
-            int q = int2IntFunction.applyAsInt(p);
+            int q = biomeGetter.applyAsInt(p);
             ls[n] |= (long)int2IntMap.get(q) << o;
             o += k;
             if (o + k > 64) {
@@ -550,7 +554,7 @@
             }
          }
 
-         Dynamic<?> dynamic3 = dynamic.createLongList(Arrays.stream(ls));
+         Dynamic<?> dynamic3 = level.createLongList(Arrays.stream(ls));
          return createPalettedContainer(dynamic2, dynamic3);
       }
    }
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.java namedSrc/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.java	2024-04-02 00:31:35.645917546 +0000
+++ namedSrc/net/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix.java	2024-04-02 00:30:22.461035915 +0000
@@ -139,19 +139,20 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed makeRule Lnet/minecraft/unmapped/C_sdmawoan;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
+    * @mapping {@literal named makeRule Lnet/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
     */
    @Override
    public TypeRewriteRule makeRule() {
       Type<?> type = this.getInputSchema().getType(TypeReferences.STRUCTURE_FEATURE);
-      return this.fixTypeEverywhereTyped("ChunkStructuresTemplateRenameFix", type, typed -> typed.update(DSL.remainderFinder(), this::m_cfrmgpfl));
+      return this.fixTypeEverywhereTyped("ChunkStructuresTemplateRenameFix", type, typed -> typed.update(DSL.remainderFinder(), this::fixChildren));
    }
 
    /**
     * @mapping {@literal hashed m_cfrmgpfl Lnet/minecraft/unmapped/C_sdmawoan;m_cfrmgpfl(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
-    * @mapping {@literal named m_cfrmgpfl Lnet/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix;m_cfrmgpfl(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named fixChildren Lnet/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix;fixChildren(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   private Dynamic<?> m_cfrmgpfl(Dynamic<?> dynamic) {
+   private Dynamic<?> fixChildren(Dynamic<?> dynamic) {
       return dynamic.update("Children", dynamic2 -> dynamic.createList(dynamic2.asStream().map(dynamic2x -> this.fix(dynamic, dynamic2x))));
    }
 
@@ -159,16 +160,16 @@
     * @mapping {@literal hashed m_njyurnhv Lnet/minecraft/unmapped/C_sdmawoan;m_njyurnhv(Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     * @mapping {@literal named fix Lnet/minecraft/datafixer/fix/ChunkStructuresTemplateRenameFix;fix(Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   private Dynamic<?> fix(Dynamic<?> dynamic, Dynamic<?> dynamic2) {
-      String string = dynamic.get("id").asString("");
+   private Dynamic<?> fix(Dynamic<?> oldStructure, Dynamic<?> newStructure) {
+      String string = oldStructure.get("id").asString("");
       if (STRUCTURES.containsKey(string)) {
          Pair<String, ImmutableMap<String, String>> pair = STRUCTURES.get(string);
-         if (pair.getFirst().equals(dynamic2.get("id").asString(""))) {
-            String string2 = dynamic2.get("Template").asString("");
-            dynamic2 = dynamic2.set("Template", dynamic2.createString(pair.getSecond().getOrDefault(string2, string2)));
+         if (pair.getFirst().equals(newStructure.get("id").asString(""))) {
+            String string2 = newStructure.get("Template").asString("");
+            newStructure = newStructure.set("Template", newStructure.createString(pair.getSecond().getOrDefault(string2, string2)));
          }
       }
 
-      return dynamic2;
+      return newStructure;
    }
 }
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/DragonFightFix.java namedSrc/net/minecraft/datafixer/fix/DragonFightFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/DragonFightFix.java	2024-04-02 00:31:35.617917213 +0000
+++ namedSrc/net/minecraft/datafixer/fix/DragonFightFix.java	2024-04-02 00:30:22.429035538 +0000
@@ -24,14 +24,15 @@
 
    /**
     * @mapping {@literal hashed m_fsyhosak Lnet/minecraft/unmapped/C_jmkyavdl;m_fsyhosak(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
-    * @mapping {@literal named m_fsyhosak Lnet/minecraft/datafixer/fix/DragonFightFix;m_fsyhosak(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named fixExitPortalLocation Lnet/minecraft/datafixer/fix/DragonFightFix;fixExitPortalLocation(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   private static <T> Dynamic<T> m_fsyhosak(Dynamic<T> dynamic) {
-      return dynamic.update("ExitPortalLocation", DataFixUtil::m_jhmddjog);
+   private static <T> Dynamic<T> fixExitPortalLocation(Dynamic<T> dynamic) {
+      return dynamic.update("ExitPortalLocation", DataFixUtil::fixBlockPos);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed makeRule Lnet/minecraft/unmapped/C_jmkyavdl;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
+    * @mapping {@literal named makeRule Lnet/minecraft/datafixer/fix/DragonFightFix;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
     */
    @Override
    protected TypeRewriteRule makeRule() {
@@ -42,7 +43,7 @@
                   return dynamic;
                } else {
                   Dynamic<?> dynamic2 = dynamic.get("DimensionData").get("1").get("DragonFight").orElseEmptyMap();
-                  return dynamic.set("DragonFight", m_fsyhosak(dynamic2));
+                  return dynamic.set("DragonFight", fixExitPortalLocation(dynamic2));
                }
             })
       );
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/EntityBlockStateFix.java namedSrc/net/minecraft/datafixer/fix/EntityBlockStateFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/EntityBlockStateFix.java	2024-04-02 00:31:35.753918832 +0000
+++ namedSrc/net/minecraft/datafixer/fix/EntityBlockStateFix.java	2024-04-02 00:30:22.589037423 +0000
@@ -345,15 +345,15 @@
     * @mapping {@literal hashed m_dvjudfum Lnet/minecraft/unmapped/C_wsjsaipu;m_dvjudfum(Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;}
     * @mapping {@literal named updateFallingBlock Lnet/minecraft/datafixer/fix/EntityBlockStateFix;updateFallingBlock(Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;}
     */
-   private Typed<?> updateFallingBlock(Typed<?> typed) {
+   private Typed<?> updateFallingBlock(Typed<?> fallingBlock) {
       Type<Either<Pair<String, Either<Integer, String>>, Unit>> type = DSL.optional(
          DSL.field("Block", DSL.named(TypeReferences.BLOCK_NAME.typeName(), DSL.or(DSL.intType(), IdentifierNormalizingSchema.getIdentifierType())))
       );
       Type<Either<Pair<String, Dynamic<?>>, Unit>> type2 = DSL.optional(
          DSL.field("BlockState", DSL.named(TypeReferences.BLOCK_STATE.typeName(), DSL.remainderType()))
       );
-      Dynamic<?> dynamic = typed.get(DSL.remainderFinder());
-      return typed.update(type.finder(), type2, either -> {
+      Dynamic<?> dynamic = fallingBlock.get(DSL.remainderFinder());
+      return fallingBlock.update(type.finder(), type2, either -> {
          int i = either.<Integer>map(pair -> ((Either)pair.getSecond()).map(integer -> integer, EntityBlockStateFix::getNumericalBlockId), unit -> {
             Optional<Number> optional = dynamic.get("TileID").asNumber().result();
             return (Integer)optional.map(Number::intValue).orElseGet(() -> dynamic.get("Tile").asByte((byte)0) & 0xFF);
@@ -367,13 +367,13 @@
     * @mapping {@literal hashed m_deapfidx Lnet/minecraft/unmapped/C_wsjsaipu;m_deapfidx(Lcom/mojang/datafixers/Typed;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/datafixers/Typed;}
     * @mapping {@literal named mergeIdAndData Lnet/minecraft/datafixer/fix/EntityBlockStateFix;mergeIdAndData(Lcom/mojang/datafixers/Typed;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/datafixers/Typed;}
     */
-   private Typed<?> mergeIdAndData(Typed<?> typed, String oldIdKey, String oldDataKey, String newStateKey) {
+   private Typed<?> mergeIdAndData(Typed<?> entity, String oldIdKey, String oldDataKey, String newStateKey) {
       Type<Pair<String, Either<Integer, String>>> type = DSL.field(
          oldIdKey, DSL.named(TypeReferences.BLOCK_NAME.typeName(), DSL.or(DSL.intType(), IdentifierNormalizingSchema.getIdentifierType()))
       );
       Type<Pair<String, Dynamic<?>>> type2 = DSL.field(newStateKey, DSL.named(TypeReferences.BLOCK_STATE.typeName(), DSL.remainderType()));
-      Dynamic<?> dynamic = typed.getOrCreate(DSL.remainderFinder());
-      return typed.update(type.finder(), type2, pair -> {
+      Dynamic<?> dynamic = entity.getOrCreate(DSL.remainderFinder());
+      return entity.update(type.finder(), type2, pair -> {
          int i = ((Either)pair.getSecond()).<Integer>map(integer -> integer, EntityBlockStateFix::getNumericalBlockId);
          int j = dynamic.get(oldDataKey).asInt(0) & 15;
          return Pair.of(TypeReferences.BLOCK_STATE.typeName(), BlockStateFlattening.lookupState(i << 4 | j));
@@ -384,9 +384,9 @@
     * @mapping {@literal hashed m_dtukmext Lnet/minecraft/unmapped/C_wsjsaipu;m_dtukmext(Lcom/mojang/datafixers/Typed;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/Typed;}
     * @mapping {@literal named useFunction Lnet/minecraft/datafixer/fix/EntityBlockStateFix;useFunction(Lcom/mojang/datafixers/Typed;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/Typed;}
     */
-   private Typed<?> useFunction(Typed<?> typed, String entityId, Function<Typed<?>, Typed<?>> function) {
+   private Typed<?> useFunction(Typed<?> entity, String entityId, Function<Typed<?>, Typed<?>> function) {
       Type<?> type = this.getInputSchema().getChoiceType(TypeReferences.ENTITY, entityId);
       Type<?> type2 = this.getOutputSchema().getChoiceType(TypeReferences.ENTITY, entityId);
-      return typed.updateTyped(DSL.namedChoice(entityId, type), type2, function);
+      return entity.updateTyped(DSL.namedChoice(entityId, type), type2, function);
    }
 }
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.java namedSrc/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.java	2024-04-02 00:31:35.741918689 +0000
+++ namedSrc/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.java	2024-04-02 00:30:22.577037281 +0000
@@ -31,7 +31,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed makeRule Lnet/minecraft/unmapped/C_wiukkyve;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
+    * @mapping {@literal named makeRule Lnet/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
     */
    @Override
    public TypeRewriteRule makeRule() {
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.java namedSrc/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.java	2024-04-02 00:31:35.777919118 +0000
+++ namedSrc/net/minecraft/datafixer/fix/EntityItemFrameDirectionFix.java	2024-04-02 00:30:22.621037799 +0000
@@ -39,8 +39,8 @@
     * @mapping {@literal hashed m_ypyjymwd Lnet/minecraft/unmapped/C_wfiwebvm;m_ypyjymwd(B)B}
     * @mapping {@literal named updateDirection Lnet/minecraft/datafixer/fix/EntityItemFrameDirectionFix;updateDirection(B)B}
     */
-   private static byte updateDirection(byte b) {
-      switch (b) {
+   private static byte updateDirection(byte oldDirection) {
+      switch (oldDirection) {
          case 0:
             return 3;
          case 1:
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.java namedSrc/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.java	2024-04-02 00:31:35.669917832 +0000
+++ namedSrc/net/minecraft/datafixer/fix/EntityProjectileOwnerFix.java	2024-04-02 00:30:22.493036292 +0000
@@ -26,7 +26,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed makeRule Lnet/minecraft/unmapped/C_huibxlze;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
+    * @mapping {@literal named makeRule Lnet/minecraft/datafixer/fix/EntityProjectileOwnerFix;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
     */
    @Override
    protected TypeRewriteRule makeRule() {
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix.java namedSrc/net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix.java	2024-04-02 00:31:35.553916451 +0000
+++ namedSrc/net/minecraft/datafixer/fix/EntityRedundantChanceTagsFix.java	2024-04-02 00:30:22.357034690 +0000
@@ -29,7 +29,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed makeRule Lnet/minecraft/unmapped/C_mngpolcv;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
+    * @mapping {@literal named makeRule Lnet/minecraft/datafixer/fix/EntityRedundantChanceTagsFix;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
     */
    @Override
    public TypeRewriteRule makeRule() {
@@ -52,9 +53,9 @@
     * @mapping {@literal hashed m_ubeenhuz Lnet/minecraft/unmapped/C_mngpolcv;m_ubeenhuz(Lcom/mojang/serialization/OptionalDynamic;I)Z}
     * @mapping {@literal named hasZeroDropChance Lnet/minecraft/datafixer/fix/EntityRedundantChanceTagsFix;hasZeroDropChance(Lcom/mojang/serialization/OptionalDynamic;I)Z}
     */
-   private static boolean hasZeroDropChance(OptionalDynamic<?> optionalDynamic, int i) {
-      return (Boolean)optionalDynamic.flatMap(FLOAT_LIST_CODEC::parse)
-         .map(list -> list.size() == i && list.stream().allMatch(arg -> arg == 0.0F))
+   private static boolean hasZeroDropChance(OptionalDynamic<?> listTag, int expectedLength) {
+      return (Boolean)listTag.flatMap(FLOAT_LIST_CODEC::parse)
+         .map(list -> list.size() == expectedLength && list.stream().allMatch(arg -> arg == 0.0F))
          .result()
          .orElse(false);
    }
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/EntityTransformFix.java namedSrc/net/minecraft/datafixer/fix/EntityTransformFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/EntityTransformFix.java	2024-04-02 00:31:35.537916260 +0000
+++ namedSrc/net/minecraft/datafixer/fix/EntityTransformFix.java	2024-04-02 00:30:22.333034407 +0000
@@ -32,7 +32,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed makeRule Lnet/minecraft/unmapped/C_zpcbgswn;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
+    * @mapping {@literal named makeRule Lnet/minecraft/datafixer/fix/EntityTransformFix;makeRule()Lcom/mojang/datafixers/TypeRewriteRule;}
     */
    @Override
    public TypeRewriteRule makeRule() {
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/ItemStackComponentizationFix.java namedSrc/net/minecraft/datafixer/fix/ItemStackComponentizationFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/ItemStackComponentizationFix.java	2024-04-02 00:31:35.825919689 +0000
+++ namedSrc/net/minecraft/datafixer/fix/ItemStackComponentizationFix.java	2024-04-02 00:30:22.669038365 +0000
@@ -305,7 +305,7 @@
             arg.m_sojvtnlk("minecraft:banner_patterns", dynamic.get("patterns"));
             Optional<Number> optional3 = dynamic.get("Base").asNumber().result();
             if (optional3.isPresent()) {
-               arg.m_pbxtucbk("minecraft:base_color", dynamic.createString(BannerPatternFormatFix.m_meylxmnz(((Number)optional3.get()).intValue())));
+               arg.m_pbxtucbk("minecraft:base_color", dynamic.createString(BannerPatternFormatFix.getColor(((Number)optional3.get()).intValue())));
             }
 
             yield dynamic.remove("patterns").remove("Base");
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix.java namedSrc/net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix.java	2024-04-02 00:31:35.833919785 +0000
+++ namedSrc/net/minecraft/datafixer/fix/MapBannerBlockPosFormatFix.java	2024-04-02 00:30:22.685038554 +0000
@@ -26,7 +26,7 @@
     * @mapping {@literal named m_udcuwwdr Lnet/minecraft/datafixer/fix/MapBannerBlockPosFormatFix;m_udcuwwdr(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
    private static <T> Dynamic<T> m_udcuwwdr(Dynamic<T> dynamic) {
-      return dynamic.update("banners", dynamicx -> dynamicx.createList(dynamicx.asStream().map(dynamicxx -> dynamicxx.update("Pos", DataFixUtil::m_jhmddjog))));
+      return dynamic.update("banners", dynamicx -> dynamicx.createList(dynamicx.asStream().map(dynamicxx -> dynamicxx.update("Pos", DataFixUtil::fixBlockPos))));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/StatsCounterFix.java namedSrc/net/minecraft/datafixer/fix/StatsCounterFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/StatsCounterFix.java	2024-04-02 00:31:35.737918642 +0000
+++ namedSrc/net/minecraft/datafixer/fix/StatsCounterFix.java	2024-04-02 00:30:22.573037234 +0000
@@ -26,9 +26,10 @@
  */
 public class StatsCounterFix extends DataFix {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_fvogauph Lnet/minecraft/unmapped/C_kbydvftx;f_fvogauph:Ljava/util/Set;}
+    * @mapping {@literal named SPECIAL_OBJECTIVE_CRITERIA Lnet/minecraft/datafixer/fix/StatsCounterFix;SPECIAL_OBJECTIVE_CRITERIA:Ljava/util/Set;}
     */
-   private static final Set<String> f_fvogauph = Set.of(
+   private static final Set<String> SPECIAL_OBJECTIVE_CRITERIA = Set.of(
       "dummy",
       "trigger",
       "deathCount",
@@ -321,11 +322,11 @@
       return this.fixTypeEverywhereTyped("ObjectiveStatFix", type, type2, typed -> {
          Dynamic<?> dynamic = typed.get(DSL.remainderFinder());
          Dynamic<?> dynamic2 = dynamic.update("CriteriaName", dynamicx -> DataFixUtils.orElse(dynamicx.asString().result().map(string -> {
-               if (f_fvogauph.contains(string)) {
+               if (SPECIAL_OBJECTIVE_CRITERIA.contains(string)) {
                   return string;
                } else {
                   StatsCounterFix.C_oravclkl lv = m_markxyem(string);
-                  return lv == null ? "dummy" : Schema1451v6.m_hkflhbit(lv.type) + ":" + Schema1451v6.m_hkflhbit(lv.typeKey);
+                  return lv == null ? "dummy" : Schema1451v6.toDottedNamespace(lv.type) + ":" + Schema1451v6.toDottedNamespace(lv.typeKey);
                }
             }).map(dynamicx::createString), dynamicx));
          return Util.readTypedOrThrow(type2, dynamic2);
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/UpdateSignBlockEntityNbtFix.java namedSrc/net/minecraft/datafixer/fix/UpdateSignBlockEntityNbtFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/UpdateSignBlockEntityNbtFix.java	2024-04-02 00:31:35.745918737 +0000
+++ namedSrc/net/minecraft/datafixer/fix/UpdateSignBlockEntityNbtFix.java	2024-04-02 00:30:22.581037328 +0000
@@ -17,13 +17,15 @@
  */
 public class UpdateSignBlockEntityNbtFix extends ChoiceFix {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jhypaqpp Lnet/minecraft/unmapped/C_wohefauc;f_jhypaqpp:Ljava/lang/String;}
+    * @mapping {@literal named FILTERED_CORRECT Lnet/minecraft/datafixer/fix/UpdateSignBlockEntityNbtFix;FILTERED_CORRECT:Ljava/lang/String;}
     */
-   public static final String f_jhypaqpp = "_filtered_correct";
+   public static final String FILTERED_CORRECT = "_filtered_correct";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jtmmrdrg Lnet/minecraft/unmapped/C_wohefauc;f_jtmmrdrg:Ljava/lang/String;}
+    * @mapping {@literal named DEFAULT_COLOR Lnet/minecraft/datafixer/fix/UpdateSignBlockEntityNbtFix;DEFAULT_COLOR:Ljava/lang/String;}
     */
-   private static final String f_jtmmrdrg = "black";
+   private static final String DEFAULT_COLOR = "black";
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wohefauc;<init>(Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;)V}
@@ -37,15 +39,15 @@
     * @mapping {@literal hashed m_gvtcdrcb Lnet/minecraft/unmapped/C_wohefauc;m_gvtcdrcb(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     * @mapping {@literal named updateSignNbt Lnet/minecraft/datafixer/fix/UpdateSignBlockEntityNbtFix;updateSignNbt(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   private static <T> Dynamic<T> updateSignNbt(Dynamic<T> dynamic) {
-      return dynamic.set("front_text", m_qwusixbw(dynamic)).set("back_text", m_iwkbfoid(dynamic)).set("is_waxed", dynamic.createBoolean(false));
+   private static <T> Dynamic<T> updateSignNbt(Dynamic<T> signData) {
+      return signData.set("front_text", fixFrontText(signData)).set("back_text", fixBackText(signData)).set("is_waxed", signData.createBoolean(false));
    }
 
    /**
     * @mapping {@literal hashed m_qwusixbw Lnet/minecraft/unmapped/C_wohefauc;m_qwusixbw(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
-    * @mapping {@literal named m_qwusixbw Lnet/minecraft/datafixer/fix/UpdateSignBlockEntityNbtFix;m_qwusixbw(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named fixFrontText Lnet/minecraft/datafixer/fix/UpdateSignBlockEntityNbtFix;fixFrontText(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   private static <T> Dynamic<T> m_qwusixbw(Dynamic<T> dynamic) {
+   private static <T> Dynamic<T> fixFrontText(Dynamic<T> dynamic) {
       Dynamic<T> dynamic2 = C_mpcdsjoo.m_umrcmxuc(dynamic.getOps());
       List<Dynamic<T>> list = m_bhcmlujx(dynamic, "Text").map(optional -> (Dynamic)optional.orElse(dynamic2)).toList();
       Dynamic<T> dynamic3 = dynamic.emptyMap()
@@ -76,9 +78,9 @@
 
    /**
     * @mapping {@literal hashed m_iwkbfoid Lnet/minecraft/unmapped/C_wohefauc;m_iwkbfoid(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
-    * @mapping {@literal named m_iwkbfoid Lnet/minecraft/datafixer/fix/UpdateSignBlockEntityNbtFix;m_iwkbfoid(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named fixBackText Lnet/minecraft/datafixer/fix/UpdateSignBlockEntityNbtFix;fixBackText(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   private static <T> Dynamic<T> m_iwkbfoid(Dynamic<T> dynamic) {
+   private static <T> Dynamic<T> fixBackText(Dynamic<T> dynamic) {
       return dynamic.emptyMap()
          .set("messages", m_noyzhklf(dynamic))
          .set("color", dynamic.createString("black"))
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/VillagerXpRebuildFix.java namedSrc/net/minecraft/datafixer/fix/VillagerXpRebuildFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/VillagerXpRebuildFix.java	2024-04-02 00:31:35.581916784 +0000
+++ namedSrc/net/minecraft/datafixer/fix/VillagerXpRebuildFix.java	2024-04-02 00:30:22.385035019 +0000
@@ -93,8 +93,8 @@
     * @mapping {@literal hashed m_uxqcqjwi Lnet/minecraft/unmapped/C_wgtxzdnm;m_uxqcqjwi(Lcom/mojang/datafixers/Typed;I)Lcom/mojang/datafixers/Typed;}
     * @mapping {@literal named fixLevel Lnet/minecraft/datafixer/fix/VillagerXpRebuildFix;fixLevel(Lcom/mojang/datafixers/Typed;I)Lcom/mojang/datafixers/Typed;}
     */
-   private static Typed<?> fixLevel(Typed<?> typed, int i) {
-      return typed.update(DSL.remainderFinder(), dynamic -> dynamic.update("VillagerData", dynamicx -> dynamicx.set("level", dynamicx.createInt(i))));
+   private static Typed<?> fixLevel(Typed<?> typed, int level) {
+      return typed.update(DSL.remainderFinder(), dynamic -> dynamic.update("VillagerData", dynamicx -> dynamicx.set("level", dynamicx.createInt(level))));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/WolfHealthFix.java namedSrc/net/minecraft/datafixer/fix/WolfHealthFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/WolfHealthFix.java	2024-04-02 00:31:35.545916355 +0000
+++ namedSrc/net/minecraft/datafixer/fix/WolfHealthFix.java	2024-04-02 00:30:22.345034548 +0000
@@ -13,13 +13,15 @@
  */
 public class WolfHealthFix extends ChoiceFix {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_rbsukxhy Lnet/minecraft/unmapped/C_hwhlokhq;f_rbsukxhy:Ljava/lang/String;}
+    * @mapping {@literal named WOLF_ID Lnet/minecraft/datafixer/fix/WolfHealthFix;WOLF_ID:Ljava/lang/String;}
     */
-   private static final String f_rbsukxhy = "minecraft:wolf";
+   private static final String WOLF_ID = "minecraft:wolf";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_rwosnfwe Lnet/minecraft/unmapped/C_hwhlokhq;f_rwosnfwe:Ljava/lang/String;}
+    * @mapping {@literal named WOLF_HEALTH Lnet/minecraft/datafixer/fix/WolfHealthFix;WOLF_HEALTH:Ljava/lang/String;}
     */
-   private static final String f_rwosnfwe = "minecraft:generic.max_health";
+   private static final String WOLF_HEALTH = "minecraft:generic.max_health";
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hwhlokhq;<init>(Lcom/mojang/datafixers/schemas/Schema;)V}
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema1451v6.java namedSrc/net/minecraft/datafixer/schema/Schema1451v6.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema1451v6.java	2024-04-02 00:31:35.705918260 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema1451v6.java	2024-04-02 00:30:22.537036810 +0000
@@ -97,7 +97,9 @@
                      String string = (String)optionalx.get();
                      return string.equals("_special")
                         ? Optional.of(dynamic.createString((String)optional2.get()))
-                        : Optional.of(dynamic2.createString(Schema1451v6.m_hkflhbit(string) + ":" + Schema1451v6.m_hkflhbit((String)optional2.get())));
+                        : Optional.of(
+                           dynamic2.createString(Schema1451v6.toDottedNamespace(string) + ":" + Schema1451v6.toDottedNamespace((String)optional2.get()))
+                        );
                   } else {
                      return Optional.empty();
                   }
@@ -173,9 +175,9 @@
 
    /**
     * @mapping {@literal hashed m_hkflhbit Lnet/minecraft/unmapped/C_hkorchzl;m_hkflhbit(Ljava/lang/String;)Ljava/lang/String;}
-    * @mapping {@literal named m_hkflhbit Lnet/minecraft/datafixer/schema/Schema1451v6;m_hkflhbit(Ljava/lang/String;)Ljava/lang/String;}
+    * @mapping {@literal named toDottedNamespace Lnet/minecraft/datafixer/schema/Schema1451v6;toDottedNamespace(Ljava/lang/String;)Ljava/lang/String;}
     */
-   public static String m_hkflhbit(String id) {
+   public static String toDottedNamespace(String id) {
       Identifier lv = Identifier.tryParse(id);
       return lv != null ? lv.getNamespace() + "." + lv.getPath() : id;
    }
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema1460.java namedSrc/net/minecraft/datafixer/schema/Schema1460.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema1460.java	2024-04-02 00:31:35.633917403 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema1460.java	2024-04-02 00:30:22.445035726 +0000
@@ -28,16 +28,16 @@
     * @mapping {@literal hashed m_cuuavtyw Lnet/minecraft/unmapped/C_zvehxbog;m_cuuavtyw(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V}
     * @mapping {@literal named registerMob Lnet/minecraft/datafixer/schema/Schema1460;registerMob(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V}
     */
-   protected static void registerMob(Schema schema, Map<String, Supplier<TypeTemplate>> map, String string) {
-      schema.register(map, string, (Supplier<TypeTemplate>)(() -> Schema100.targetItems(schema)));
+   protected static void registerMob(Schema schema, Map<String, Supplier<TypeTemplate>> map, String entityId) {
+      schema.register(map, entityId, (Supplier<TypeTemplate>)(() -> Schema100.targetItems(schema)));
    }
 
    /**
     * @mapping {@literal hashed m_qnbddmdd Lnet/minecraft/unmapped/C_zvehxbog;m_qnbddmdd(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V}
     * @mapping {@literal named registerInventory Lnet/minecraft/datafixer/schema/Schema1460;registerInventory(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V}
     */
-   protected static void registerInventory(Schema schema, Map<String, Supplier<TypeTemplate>> map, String string) {
-      schema.register(map, string, (Supplier<TypeTemplate>)(() -> DSL.optionalFields("Items", DSL.list(TypeReferences.ITEM_STACK.in(schema)))));
+   protected static void registerInventory(Schema schema, Map<String, Supplier<TypeTemplate>> map, String name) {
+      schema.register(map, name, (Supplier<TypeTemplate>)(() -> DSL.optionalFields("Items", DSL.list(TypeReferences.ITEM_STACK.in(schema)))));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema1470.java namedSrc/net/minecraft/datafixer/schema/Schema1470.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema1470.java	2024-04-02 00:31:35.617917213 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema1470.java	2024-04-02 00:30:22.429035538 +0000
@@ -25,8 +25,8 @@
     * @mapping {@literal hashed m_pybjhxbc Lnet/minecraft/unmapped/C_zrjqyhip;m_pybjhxbc(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V}
     * @mapping {@literal named registerMob Lnet/minecraft/datafixer/schema/Schema1470;registerMob(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V}
     */
-   protected static void registerMob(Schema schema, Map<String, Supplier<TypeTemplate>> map, String string) {
-      schema.register(map, string, (Supplier<TypeTemplate>)(() -> Schema100.targetItems(schema)));
+   protected static void registerMob(Schema schema, Map<String, Supplier<TypeTemplate>> map, String entityId) {
+      schema.register(map, entityId, (Supplier<TypeTemplate>)(() -> Schema100.targetItems(schema)));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema1906.java namedSrc/net/minecraft/datafixer/schema/Schema1906.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema1906.java	2024-04-02 00:31:35.581916784 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema1906.java	2024-04-02 00:30:22.385035019 +0000
@@ -40,7 +40,7 @@
     * @mapping {@literal hashed m_jqjqszre Lnet/minecraft/unmapped/C_tsdqjgvi;m_jqjqszre(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V}
     * @mapping {@literal named registerInventory Lnet/minecraft/datafixer/schema/Schema1906;registerInventory(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V}
     */
-   protected static void registerInventory(Schema schema, Map<String, Supplier<TypeTemplate>> map, String string) {
-      schema.register(map, string, (Supplier<TypeTemplate>)(() -> DSL.optionalFields("Items", DSL.list(TypeReferences.ITEM_STACK.in(schema)))));
+   protected static void registerInventory(Schema schema, Map<String, Supplier<TypeTemplate>> map, String name) {
+      schema.register(map, name, (Supplier<TypeTemplate>)(() -> DSL.optionalFields("Items", DSL.list(TypeReferences.ITEM_STACK.in(schema)))));
    }
 }
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema1920.java namedSrc/net/minecraft/datafixer/schema/Schema1920.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema1920.java	2024-04-02 00:31:35.545916355 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema1920.java	2024-04-02 00:30:22.345034548 +0000
@@ -24,8 +24,8 @@
     * @mapping {@literal hashed m_ibwoindo Lnet/minecraft/unmapped/C_peyhiscn;m_ibwoindo(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V}
     * @mapping {@literal named registerInventory Lnet/minecraft/datafixer/schema/Schema1920;registerInventory(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V}
     */
-   protected static void registerInventory(Schema schema, Map<String, Supplier<TypeTemplate>> map, String string) {
-      schema.register(map, string, (Supplier<TypeTemplate>)(() -> DSL.optionalFields("Items", DSL.list(TypeReferences.ITEM_STACK.in(schema)))));
+   protected static void registerInventory(Schema schema, Map<String, Supplier<TypeTemplate>> map, String name) {
+      schema.register(map, name, (Supplier<TypeTemplate>)(() -> DSL.optionalFields("Items", DSL.list(TypeReferences.ITEM_STACK.in(schema)))));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema2684.java namedSrc/net/minecraft/datafixer/schema/Schema2684.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema2684.java	2024-04-02 00:31:35.785919213 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema2684.java	2024-04-02 00:30:22.625037846 +0000
@@ -25,8 +25,8 @@
     * @mapping {@literal named registerTypes Lnet/minecraft/datafixer/schema/Schema2684;registerTypes(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V}
     */
    @Override
-   public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> map, Map<String, Supplier<TypeTemplate>> map2) {
-      super.registerTypes(schema, map, map2);
+   public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> entityTypes, Map<String, Supplier<TypeTemplate>> blockEntityTypes) {
+      super.registerTypes(schema, entityTypes, blockEntityTypes);
       schema.registerType(false, TypeReferences.GAME_EVENT_NAME, () -> DSL.constType(getIdentifierType()));
    }
 
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema2831.java namedSrc/net/minecraft/datafixer/schema/Schema2831.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema2831.java	2024-04-02 00:31:35.793919308 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema2831.java	2024-04-02 00:30:22.637037988 +0000
@@ -25,8 +25,8 @@
     * @mapping {@literal named registerTypes Lnet/minecraft/datafixer/schema/Schema2831;registerTypes(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V}
     */
    @Override
-   public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> map, Map<String, Supplier<TypeTemplate>> map2) {
-      super.registerTypes(schema, map, map2);
+   public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> entityTypes, Map<String, Supplier<TypeTemplate>> blockEntityTypes) {
+      super.registerTypes(schema, entityTypes, blockEntityTypes);
       schema.registerType(
          true,
          TypeReferences.UNTAGGED_SPAWNER,
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema2832.java namedSrc/net/minecraft/datafixer/schema/Schema2832.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema2832.java	2024-04-02 00:31:35.669917832 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema2832.java	2024-04-02 00:30:22.493036292 +0000
@@ -26,8 +26,8 @@
     * @mapping {@literal named registerTypes Lnet/minecraft/datafixer/schema/Schema2832;registerTypes(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V}
     */
    @Override
-   public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> map, Map<String, Supplier<TypeTemplate>> map2) {
-      super.registerTypes(schema, map, map2);
+   public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> entityTypes, Map<String, Supplier<TypeTemplate>> blockEntityTypes) {
+      super.registerTypes(schema, entityTypes, blockEntityTypes);
       schema.registerType(
          false,
          TypeReferences.CHUNK,
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema2842.java namedSrc/net/minecraft/datafixer/schema/Schema2842.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema2842.java	2024-04-02 00:31:35.689918070 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema2842.java	2024-04-02 00:30:22.513036527 +0000
@@ -25,8 +25,8 @@
     * @mapping {@literal named registerTypes Lnet/minecraft/datafixer/schema/Schema2842;registerTypes(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V}
     */
    @Override
-   public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> map, Map<String, Supplier<TypeTemplate>> map2) {
-      super.registerTypes(schema, map, map2);
+   public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> entityTypes, Map<String, Supplier<TypeTemplate>> blockEntityTypes) {
+      super.registerTypes(schema, entityTypes, blockEntityTypes);
       schema.registerType(
          false,
          TypeReferences.CHUNK,
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema3078.java namedSrc/net/minecraft/datafixer/schema/Schema3078.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema3078.java	2024-04-02 00:31:35.769919023 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema3078.java	2024-04-02 00:30:22.609037658 +0000
@@ -24,8 +24,8 @@
     * @mapping {@literal hashed m_cdvltrfd Lnet/minecraft/unmapped/C_plgtxgsa;m_cdvltrfd(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V}
     * @mapping {@literal named registerMob Lnet/minecraft/datafixer/schema/Schema3078;registerMob(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V}
     */
-   protected static void registerMob(Schema schema, Map<String, Supplier<TypeTemplate>> map, String string) {
-      schema.register(map, string, (Supplier<TypeTemplate>)(() -> Schema100.targetItems(schema)));
+   protected static void registerMob(Schema schema, Map<String, Supplier<TypeTemplate>> map, String entityId) {
+      schema.register(map, entityId, (Supplier<TypeTemplate>)(() -> Schema100.targetItems(schema)));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema3685.java namedSrc/net/minecraft/datafixer/schema/Schema3685.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema3685.java	2024-04-02 00:31:35.753918832 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema3685.java	2024-04-02 00:30:22.589037423 +0000
@@ -22,9 +22,9 @@
 
    /**
     * @mapping {@literal hashed m_jyvqwvoe Lnet/minecraft/unmapped/C_grqmuuax;m_jyvqwvoe(Lcom/mojang/datafixers/schemas/Schema;)Lcom/mojang/datafixers/types/templates/TypeTemplate;}
-    * @mapping {@literal named m_jyvqwvoe Lnet/minecraft/datafixer/schema/Schema3685;m_jyvqwvoe(Lcom/mojang/datafixers/schemas/Schema;)Lcom/mojang/datafixers/types/templates/TypeTemplate;}
+    * @mapping {@literal named registerFields Lnet/minecraft/datafixer/schema/Schema3685;registerFields(Lcom/mojang/datafixers/schemas/Schema;)Lcom/mojang/datafixers/types/templates/TypeTemplate;}
     */
-   protected static TypeTemplate m_jyvqwvoe(Schema schema) {
+   protected static TypeTemplate registerFields(Schema schema) {
       return DSL.optionalFields("inBlockState", TypeReferences.BLOCK_STATE.in(schema), "item", TypeReferences.ITEM_STACK.in(schema));
    }
 
@@ -35,9 +35,9 @@
    @Override
    public Map<String, Supplier<TypeTemplate>> registerEntities(Schema schema) {
       Map<String, Supplier<TypeTemplate>> map = super.registerEntities(schema);
-      schema.register(map, "minecraft:trident", (Supplier<TypeTemplate>)(() -> m_jyvqwvoe(schema)));
-      schema.register(map, "minecraft:spectral_arrow", (Supplier<TypeTemplate>)(() -> m_jyvqwvoe(schema)));
-      schema.register(map, "minecraft:arrow", (Supplier<TypeTemplate>)(() -> m_jyvqwvoe(schema)));
+      schema.register(map, "minecraft:trident", (Supplier<TypeTemplate>)(() -> registerFields(schema)));
+      schema.register(map, "minecraft:spectral_arrow", (Supplier<TypeTemplate>)(() -> registerFields(schema)));
+      schema.register(map, "minecraft:arrow", (Supplier<TypeTemplate>)(() -> registerFields(schema)));
       return map;
    }
 }
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema3818v3.java namedSrc/net/minecraft/datafixer/schema/Schema3818v3.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema3818v3.java	2024-04-02 00:31:35.789919261 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema3818v3.java	2024-04-02 00:30:22.633037941 +0000
@@ -26,8 +26,8 @@
     * @mapping {@literal named registerTypes Lnet/minecraft/datafixer/schema/Schema3818v3;registerTypes(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V}
     */
    @Override
-   public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> map, Map<String, Supplier<TypeTemplate>> map2) {
-      super.registerTypes(schema, map, map2);
+   public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> entityTypes, Map<String, Supplier<TypeTemplate>> blockEntityTypes) {
+      super.registerTypes(schema, entityTypes, blockEntityTypes);
       schema.registerType(
          true,
          TypeReferences.DATA_COMPONENTS,
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema3818v4.java namedSrc/net/minecraft/datafixer/schema/Schema3818v4.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema3818v4.java	2024-04-02 00:31:35.629917356 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema3818v4.java	2024-04-02 00:30:22.445035726 +0000
@@ -25,8 +25,8 @@
     * @mapping {@literal named registerTypes Lnet/minecraft/datafixer/schema/Schema3818v4;registerTypes(Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V}
     */
    @Override
-   public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> map, Map<String, Supplier<TypeTemplate>> map2) {
-      super.registerTypes(schema, map, map2);
+   public void registerTypes(Schema schema, Map<String, Supplier<TypeTemplate>> entityTypes, Map<String, Supplier<TypeTemplate>> blockEntityTypes) {
+      super.registerTypes(schema, entityTypes, blockEntityTypes);
       schema.registerType(
          true,
          TypeReferences.ITEM_STACK,
Only in namedSrc/net/minecraft/datafixer/schema: Schema3825.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-04-02 00:31:35.609917117 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema704.java	2024-04-02 00:30:22.417035396 +0000
@@ -159,7 +159,7 @@
        */
       @Override
       public <T> T apply(DynamicOps<T> ops, T object) {
-         return Schema99.addNames(new Dynamic<>(ops, object), Schema704.BLOCK_RENAMES, Schema99.f_bmaggcmk);
+         return Schema99.addNames(new Dynamic<>(ops, object), Schema704.BLOCK_RENAMES, Schema99.ITEM_TO_ENTITY);
       }
    };
 
@@ -184,10 +184,10 @@
     * @mapping {@literal named getChoiceType Lnet/minecraft/datafixer/schema/Schema704;getChoiceType(Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)Lcom/mojang/datafixers/types/Type;}
     */
    @Override
-   public Type<?> getChoiceType(TypeReference typeReference, String string) {
-      return Objects.equals(typeReference.typeName(), TypeReferences.BLOCK_ENTITY.typeName())
-         ? super.getChoiceType(typeReference, IdentifierNormalizingSchema.normalize(string))
-         : super.getChoiceType(typeReference, string);
+   public Type<?> getChoiceType(TypeReference type, String choiceName) {
+      return Objects.equals(type.typeName(), TypeReferences.BLOCK_ENTITY.typeName())
+         ? super.getChoiceType(type, IdentifierNormalizingSchema.normalize(choiceName))
+         : super.getChoiceType(type, choiceName);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema705.java namedSrc/net/minecraft/datafixer/schema/Schema705.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema705.java	2024-04-02 00:31:35.697918165 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema705.java	2024-04-02 00:30:22.529036716 +0000
@@ -20,9 +20,10 @@
  */
 public class Schema705 extends IdentifierNormalizingSchema {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_cafexrfx Lnet/minecraft/unmapped/C_gguawzfn;f_cafexrfx:Ljava/util/Map;}
+    * @mapping {@literal named ITEM_TO_ENTITY Lnet/minecraft/datafixer/schema/Schema705;ITEM_TO_ENTITY:Ljava/util/Map;}
     */
-   static final Map<String, String> f_cafexrfx = ImmutableMap.<String, String>builder()
+   static final Map<String, String> ITEM_TO_ENTITY = ImmutableMap.<String, String>builder()
       .put("minecraft:armor_stand", "minecraft:armor_stand")
       .put("minecraft:painting", "minecraft:painting")
       .put("minecraft:armadillo_spawn_egg", "minecraft:armadillo")
@@ -117,7 +118,7 @@
        */
       @Override
       public <T> T apply(DynamicOps<T> ops, T object) {
-         return Schema99.addNames(new Dynamic<>(ops, object), Schema704.BLOCK_RENAMES, Schema705.f_cafexrfx);
+         return Schema99.addNames(new Dynamic<>(ops, object), Schema704.BLOCK_RENAMES, Schema705.ITEM_TO_ENTITY);
       }
    };

github-actions · 2024-04-02T00:31:39Z

View the diff here (3/3):

diff -bur namedTargetSrc/net/minecraft/datafixer/schema/Schema99.java namedSrc/net/minecraft/datafixer/schema/Schema99.java
--- namedTargetSrc/net/minecraft/datafixer/schema/Schema99.java	2024-04-02 00:31:35.805919451 +0000
+++ namedSrc/net/minecraft/datafixer/schema/Schema99.java	2024-04-02 00:30:22.649038129 +0000
@@ -30,46 +30,47 @@
     * @mapping {@literal hashed f_egllvquq Lnet/minecraft/unmapped/C_xcbqcvvm;f_egllvquq:Ljava/util/Map;}
     * @mapping {@literal named ITEM_TO_BLOCK_ENTITY Lnet/minecraft/datafixer/schema/Schema99;ITEM_TO_BLOCK_ENTITY:Ljava/util/Map;}
     */
-   static final Map<String, String> ITEM_TO_BLOCK_ENTITY = DataFixUtils.make(Maps.<String, String>newHashMap(), hashMap -> {
-      hashMap.put("minecraft:furnace", "Furnace");
-      hashMap.put("minecraft:lit_furnace", "Furnace");
-      hashMap.put("minecraft:chest", "Chest");
-      hashMap.put("minecraft:trapped_chest", "Chest");
-      hashMap.put("minecraft:ender_chest", "EnderChest");
-      hashMap.put("minecraft:jukebox", "RecordPlayer");
-      hashMap.put("minecraft:dispenser", "Trap");
-      hashMap.put("minecraft:dropper", "Dropper");
-      hashMap.put("minecraft:sign", "Sign");
-      hashMap.put("minecraft:mob_spawner", "MobSpawner");
-      hashMap.put("minecraft:noteblock", "Music");
-      hashMap.put("minecraft:brewing_stand", "Cauldron");
-      hashMap.put("minecraft:enhanting_table", "EnchantTable");
-      hashMap.put("minecraft:command_block", "CommandBlock");
-      hashMap.put("minecraft:beacon", "Beacon");
-      hashMap.put("minecraft:skull", "Skull");
-      hashMap.put("minecraft:daylight_detector", "DLDetector");
-      hashMap.put("minecraft:hopper", "Hopper");
-      hashMap.put("minecraft:banner", "Banner");
-      hashMap.put("minecraft:flower_pot", "FlowerPot");
-      hashMap.put("minecraft:repeating_command_block", "CommandBlock");
-      hashMap.put("minecraft:chain_command_block", "CommandBlock");
-      hashMap.put("minecraft:standing_sign", "Sign");
-      hashMap.put("minecraft:wall_sign", "Sign");
-      hashMap.put("minecraft:piston_head", "Piston");
-      hashMap.put("minecraft:daylight_detector_inverted", "DLDetector");
-      hashMap.put("minecraft:unpowered_comparator", "Comparator");
-      hashMap.put("minecraft:powered_comparator", "Comparator");
-      hashMap.put("minecraft:wall_banner", "Banner");
-      hashMap.put("minecraft:standing_banner", "Banner");
-      hashMap.put("minecraft:structure_block", "Structure");
-      hashMap.put("minecraft:end_portal", "Airportal");
-      hashMap.put("minecraft:end_gateway", "EndGateway");
-      hashMap.put("minecraft:shield", "Banner");
+   static final Map<String, String> ITEM_TO_BLOCK_ENTITY = DataFixUtils.make(Maps.<String, String>newHashMap(), itemToBlockEntityHashMap -> {
+      itemToBlockEntityHashMap.put("minecraft:furnace", "Furnace");
+      itemToBlockEntityHashMap.put("minecraft:lit_furnace", "Furnace");
+      itemToBlockEntityHashMap.put("minecraft:chest", "Chest");
+      itemToBlockEntityHashMap.put("minecraft:trapped_chest", "Chest");
+      itemToBlockEntityHashMap.put("minecraft:ender_chest", "EnderChest");
+      itemToBlockEntityHashMap.put("minecraft:jukebox", "RecordPlayer");
+      itemToBlockEntityHashMap.put("minecraft:dispenser", "Trap");
+      itemToBlockEntityHashMap.put("minecraft:dropper", "Dropper");
+      itemToBlockEntityHashMap.put("minecraft:sign", "Sign");
+      itemToBlockEntityHashMap.put("minecraft:mob_spawner", "MobSpawner");
+      itemToBlockEntityHashMap.put("minecraft:noteblock", "Music");
+      itemToBlockEntityHashMap.put("minecraft:brewing_stand", "Cauldron");
+      itemToBlockEntityHashMap.put("minecraft:enhanting_table", "EnchantTable");
+      itemToBlockEntityHashMap.put("minecraft:command_block", "CommandBlock");
+      itemToBlockEntityHashMap.put("minecraft:beacon", "Beacon");
+      itemToBlockEntityHashMap.put("minecraft:skull", "Skull");
+      itemToBlockEntityHashMap.put("minecraft:daylight_detector", "DLDetector");
+      itemToBlockEntityHashMap.put("minecraft:hopper", "Hopper");
+      itemToBlockEntityHashMap.put("minecraft:banner", "Banner");
+      itemToBlockEntityHashMap.put("minecraft:flower_pot", "FlowerPot");
+      itemToBlockEntityHashMap.put("minecraft:repeating_command_block", "CommandBlock");
+      itemToBlockEntityHashMap.put("minecraft:chain_command_block", "CommandBlock");
+      itemToBlockEntityHashMap.put("minecraft:standing_sign", "Sign");
+      itemToBlockEntityHashMap.put("minecraft:wall_sign", "Sign");
+      itemToBlockEntityHashMap.put("minecraft:piston_head", "Piston");
+      itemToBlockEntityHashMap.put("minecraft:daylight_detector_inverted", "DLDetector");
+      itemToBlockEntityHashMap.put("minecraft:unpowered_comparator", "Comparator");
+      itemToBlockEntityHashMap.put("minecraft:powered_comparator", "Comparator");
+      itemToBlockEntityHashMap.put("minecraft:wall_banner", "Banner");
+      itemToBlockEntityHashMap.put("minecraft:standing_banner", "Banner");
+      itemToBlockEntityHashMap.put("minecraft:structure_block", "Structure");
+      itemToBlockEntityHashMap.put("minecraft:end_portal", "Airportal");
+      itemToBlockEntityHashMap.put("minecraft:end_gateway", "EndGateway");
+      itemToBlockEntityHashMap.put("minecraft:shield", "Banner");
    });
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bmaggcmk Lnet/minecraft/unmapped/C_xcbqcvvm;f_bmaggcmk:Ljava/util/Map;}
+    * @mapping {@literal named ITEM_TO_ENTITY Lnet/minecraft/datafixer/schema/Schema99;ITEM_TO_ENTITY:Ljava/util/Map;}
     */
-   public static final Map<String, String> f_bmaggcmk = Map.of("minecraft:armor_stand", "ArmorStand", "minecraft:painting", "Painting");
+   public static final Map<String, String> ITEM_TO_ENTITY = Map.of("minecraft:armor_stand", "ArmorStand", "minecraft:painting", "Painting");
    /**
     * @mapping {@literal hashed f_wjzmzffn Lnet/minecraft/unmapped/C_xcbqcvvm;f_wjzmzffn:Lcom/mojang/datafixers/types/templates/Hook$HookFunction;}
     * @mapping {@literal named ADD_NAMES Lnet/minecraft/datafixer/schema/Schema99;ADD_NAMES:Lcom/mojang/datafixers/types/templates/Hook$HookFunction;}
@@ -80,8 +81,8 @@
        * @mapping {@literal named apply Lnet/minecraft/datafixer/schema/Schema99$C_gtlossfa;apply(Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/lang/Object;}
        */
       @Override
-      public <T> T apply(DynamicOps<T> ops, T object) {
-         return Schema99.addNames(new Dynamic<>(ops, object), Schema99.ITEM_TO_BLOCK_ENTITY, Schema99.f_bmaggcmk);
+      public <T> T apply(DynamicOps<T> ops, T value) {
+         return Schema99.addNames(new Dynamic<>(ops, value), Schema99.ITEM_TO_BLOCK_ENTITY, Schema99.ITEM_TO_ENTITY);
       }
    };
 
@@ -411,13 +412,13 @@
     * @mapping {@literal hashed m_zejlkvsb Lnet/minecraft/unmapped/C_xcbqcvvm;m_zejlkvsb(Lcom/mojang/serialization/Dynamic;Ljava/util/Map;Ljava/util/Map;)Ljava/lang/Object;}
     * @mapping {@literal named addNames Lnet/minecraft/datafixer/schema/Schema99;addNames(Lcom/mojang/serialization/Dynamic;Ljava/util/Map;Ljava/util/Map;)Ljava/lang/Object;}
     */
-   protected static <T> T addNames(Dynamic<T> dynamic, Map<String, String> map, Map<String, String> map2) {
-      return dynamic.update("tag", dynamic2 -> dynamic2.update("BlockEntityTag", dynamic2x -> {
-            String string = (String)dynamic.get("id").asString().result().map(IdentifierNormalizingSchema::normalize).orElse("minecraft:air");
+   protected static <T> T addNames(Dynamic<T> stack, Map<String, String> renames, Map<String, String> map2) {
+      return stack.update("tag", dynamic2 -> dynamic2.update("BlockEntityTag", dynamic2x -> {
+            String string = (String)stack.get("id").asString().result().map(IdentifierNormalizingSchema::normalize).orElse("minecraft:air");
             if (!"minecraft:air".equals(string)) {
-               String string2 = (String)map.get(string);
+               String string2 = (String)renames.get(string);
                if (string2 != null) {
-                  return dynamic2x.set("id", dynamic.createString(string2));
+                  return dynamic2x.set("id", stack.createString(string2));
                }
 
                LOGGER.warn("Unable to resolve BlockEntity for ItemStack: {}", string);
@@ -425,9 +426,9 @@
 
             return dynamic2x;
          }).update("EntityTag", dynamic2x -> {
-            String string = IdentifierNormalizingSchema.normalize(dynamic.get("id").asString(""));
+            String string = IdentifierNormalizingSchema.normalize(stack.get("id").asString(""));
             String string2 = (String)map2.get(string);
-            return string2 != null ? dynamic2x.set("id", dynamic.createString(string2)) : dynamic2x;
+            return string2 != null ? dynamic2x.set("id", stack.createString(string2)) : dynamic2x;
          })).getValue();
    }
 }
diff -bur namedTargetSrc/net/minecraft/datafixer/Schemas.java namedSrc/net/minecraft/datafixer/Schemas.java
--- namedTargetSrc/net/minecraft/datafixer/Schemas.java	2024-04-02 00:31:35.757918880 +0000
+++ namedSrc/net/minecraft/datafixer/Schemas.java	2024-04-02 00:30:22.597037517 +0000
@@ -285,6 +285,7 @@
 import net.minecraft.datafixer.schema.Schema3818;
 import net.minecraft.datafixer.schema.Schema3818v3;
 import net.minecraft.datafixer.schema.Schema3818v4;
+import net.minecraft.datafixer.schema.Schema3825;
 import net.minecraft.datafixer.schema.Schema501;
 import net.minecraft.datafixer.schema.Schema700;
 import net.minecraft.datafixer.schema.Schema701;
@@ -296,7 +297,6 @@
 import net.minecraft.datafixer.schema.Schema99;
 import net.minecraft.unmapped.C_dnwxdepg;
 import net.minecraft.unmapped.C_drjkwdzx;
-import net.minecraft.unmapped.C_ngxbkjgg;
 import net.minecraft.unmapped.C_oylwhwjk;
 import net.minecraft.util.Util;
 
@@ -822,7 +822,7 @@
          new RenameItemStackAttributesFix(
             schema112,
             "Attribute renames",
-            m_fwikjxye(
+            replacingRaw(
                ImmutableMap.<String, String>builder()
                   .put("generic.maxHealth", "minecraft:generic.max_health")
                   .put("Max Health", "minecraft:generic.max_health")
@@ -1335,7 +1335,7 @@
       Schema schema217 = builder.addSchema(3820, EMPTY_IDENTIFIER_NORMALIZE);
       builder.addFixer(new PlayerHeadBlockProfileFix(schema217));
       builder.addFixer(new LodestoneCompassComponentFix(schema217));
-      Schema schema218 = builder.addSchema(3825, C_ngxbkjgg::new);
+      Schema schema218 = builder.addSchema(3825, Schema3825::new);
       builder.addFixer(new C_drjkwdzx(schema218));
       builder.addFixer(new C_dnwxdepg(schema218));
       builder.addFixer(new C_oylwhwjk(schema218));
@@ -1343,10 +1343,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_fwikjxye Lnet/minecraft/unmapped/C_fdgmxpeq;m_fwikjxye(Ljava/util/Map;)Ljava/util/function/UnaryOperator;}
+    * @mapping {@literal named replacingRaw Lnet/minecraft/datafixer/Schemas;replacingRaw(Ljava/util/Map;)Ljava/util/function/UnaryOperator;}
     */
-   private static UnaryOperator<String> m_fwikjxye(Map<String, String> map) {
-      return string -> (String)map.getOrDefault(string, string);
+   private static UnaryOperator<String> replacingRaw(Map<String, String> replacements) {
+      return string -> (String)replacements.getOrDefault(string, string);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/AreaEffectCloudEntity.java namedSrc/net/minecraft/entity/AreaEffectCloudEntity.java
--- namedTargetSrc/net/minecraft/entity/AreaEffectCloudEntity.java	2024-04-02 00:31:35.625917308 +0000
+++ namedSrc/net/minecraft/entity/AreaEffectCloudEntity.java	2024-04-02 00:30:22.441035679 +0000
@@ -18,12 +18,12 @@
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.NbtOps;
+import net.minecraft.particle.EntityEffectParticleEffect;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.potion.Potion;
 import net.minecraft.registry.Holder;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_gjiczies;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
@@ -161,7 +161,7 @@
    protected void initDataTracker(DataTracker.Builder builder) {
       builder.add(RADIUS, 3.0F);
       builder.add(WAITING, false);
-      builder.add(PARTICLE_ID, C_gjiczies.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, -1));
+      builder.add(PARTICLE_ID, EntityEffectParticleEffect.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, -1));
    }
 
    /**
@@ -208,7 +208,7 @@
     */
    private void updateColor() {
       int i = this.f_ptifiiup.equals(PotionContentsComponent.DEFAULT) ? 0 : this.f_ptifiiup.getColor();
-      this.dataTracker.set(PARTICLE_ID, C_gjiczies.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, i));
+      this.dataTracker.set(PARTICLE_ID, EntityEffectParticleEffect.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, i));
    }
 
    /**
@@ -298,7 +298,7 @@
             double e = this.getY();
             double n = this.getZ() + (double)(MathHelper.sin(l) * m);
             if (bl && this.random.nextBoolean()) {
-               this.getWorld().addImportantParticle(C_gjiczies.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, -1), d, e, n, 0.0, 0.0, 0.0);
+               this.getWorld().addImportantParticle(EntityEffectParticleEffect.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, -1), d, e, n, 0.0, 0.0, 0.0);
             } else {
                this.getWorld().addImportantParticle(lv, d, e, n, 0.0, 0.0, 0.0);
             }
diff -bur namedTargetSrc/net/minecraft/entity/boss/WitherEntity.java namedSrc/net/minecraft/entity/boss/WitherEntity.java
--- namedTargetSrc/net/minecraft/entity/boss/WitherEntity.java	2024-04-02 00:31:35.565916593 +0000
+++ namedSrc/net/minecraft/entity/boss/WitherEntity.java	2024-04-02 00:30:22.369034831 +0000
@@ -36,6 +36,7 @@
 import net.minecraft.entity.projectile.WitherSkullEntity;
 import net.minecraft.item.Items;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.particle.EntityEffectParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.registry.tag.DamageTypeTags;
@@ -44,7 +45,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_gjiczies;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
@@ -325,7 +325,7 @@
          if (bl && this.getWorld().random.nextInt(4) == 0) {
             this.getWorld()
                .addParticle(
-                  C_gjiczies.m_vnsoutnn(ParticleTypes.ENTITY_EFFECT, 0.7F, 0.7F, 0.5F),
+                  EntityEffectParticleEffect.m_vnsoutnn(ParticleTypes.ENTITY_EFFECT, 0.7F, 0.7F, 0.5F),
                   r + this.random.nextGaussian() * (double)u,
                   s + this.random.nextGaussian() * (double)u,
                   t + this.random.nextGaussian() * (double)u,
@@ -342,7 +342,7 @@
          for (int w = 0; w < 3; w++) {
             this.getWorld()
                .addParticle(
-                  C_gjiczies.m_vnsoutnn(ParticleTypes.ENTITY_EFFECT, 0.7F, 0.7F, 0.9F),
+                  EntityEffectParticleEffect.m_vnsoutnn(ParticleTypes.ENTITY_EFFECT, 0.7F, 0.7F, 0.9F),
                   this.getX() + this.random.nextGaussian(),
                   this.getY() + (double)(this.random.nextFloat() * v),
                   this.getZ() + this.random.nextGaussian(),
diff -bur namedTargetSrc/net/minecraft/entity/effect/BadOmenStatusEffect.java namedSrc/net/minecraft/entity/effect/BadOmenStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/BadOmenStatusEffect.java	2024-04-02 00:31:35.533916212 +0000
+++ namedSrc/net/minecraft/entity/effect/BadOmenStatusEffect.java	2024-04-02 00:30:22.329034360 +0000
@@ -41,7 +41,7 @@
 
          if (lv2.getDifficulty() != Difficulty.PEACEFUL && lv2.isNearOccupiedPointOfInterest(lv.getBlockPos())) {
             Raid lv3 = lv2.getRaidAt(lv.getBlockPos());
-            if (lv3 == null || lv3.m_azkplhcc() < lv3.m_evxnagza()) {
+            if (lv3 == null || lv3.getBadOmenLevel() < lv3.getMaxBadOmenLevel()) {
                lv.addStatusEffect(new StatusEffectInstance(StatusEffects.RAID_OMEN, 600, amplifier));
                lv.m_ehhcdgvv(lv.getBlockPos());
                return false;
diff -bur namedTargetSrc/net/minecraft/entity/effect/StatusEffect.java namedSrc/net/minecraft/entity/effect/StatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/StatusEffect.java	2024-04-02 00:31:35.653917642 +0000
+++ namedSrc/net/minecraft/entity/effect/StatusEffect.java	2024-04-02 00:30:22.477036103 +0000
@@ -19,13 +19,13 @@
 import net.minecraft.feature_flags.FeatureFlagBitSet;
 import net.minecraft.feature_flags.FeatureFlags;
 import net.minecraft.feature_flags.GatedFeature;
+import net.minecraft.particle.EntityEffectParticleEffect;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.Registries;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_gjiczies;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.MathHelper;
 import org.jetbrains.annotations.Nullable;
@@ -87,7 +87,7 @@
       this.color = color;
       this.f_fromvzcw = arg -> {
          int j = arg.isAmbient() ? f_hrqsqyvx : 255;
-         return C_gjiczies.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, ColorUtil.Argb32.m_bixluiis(j, color));
+         return EntityEffectParticleEffect.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, ColorUtil.Argb32.m_bixluiis(j, color));
       };
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/mob/RavagerEntity.java namedSrc/net/minecraft/entity/mob/RavagerEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/RavagerEntity.java	2024-04-02 00:31:35.621917260 +0000
+++ namedSrc/net/minecraft/entity/mob/RavagerEntity.java	2024-04-02 00:30:22.437035632 +0000
@@ -25,11 +25,11 @@
 import net.minecraft.entity.raid.RaiderEntity;
 import net.minecraft.entity.vehicle.BoatEntity;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.particle.EntityEffectParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.tag.EntityTypeTags;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_gjiczies;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.MathHelper;
@@ -273,7 +273,8 @@
          double f = this.getZ()
             + (double)this.getWidth() * Math.cos((double)(this.bodyYaw * (float) (Math.PI / 180.0)))
             + (this.random.nextDouble() * 0.6 - 0.3);
-         this.getWorld().addParticle(C_gjiczies.m_vnsoutnn(ParticleTypes.ENTITY_EFFECT, 0.49803922F, 0.5137255F, 0.57254905F), d, e, f, 0.0, 0.0, 0.0);
+         this.getWorld()
+            .addParticle(EntityEffectParticleEffect.m_vnsoutnn(ParticleTypes.ENTITY_EFFECT, 0.49803922F, 0.5137255F, 0.57254905F), d, e, f, 0.0, 0.0, 0.0);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/mob/SpellcastingIllagerEntity.java namedSrc/net/minecraft/entity/mob/SpellcastingIllagerEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/SpellcastingIllagerEntity.java	2024-04-02 00:31:35.825919689 +0000
+++ namedSrc/net/minecraft/entity/mob/SpellcastingIllagerEntity.java	2024-04-02 00:30:22.669038365 +0000
@@ -9,9 +9,9 @@
 import net.minecraft.entity.data.TrackedData;
 import net.minecraft.entity.data.TrackedDataHandlerRegistry;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.particle.EntityEffectParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.sound.SoundEvent;
-import net.minecraft.unmapped.C_gjiczies;
 import net.minecraft.util.collection.IdListUtil;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
@@ -139,7 +139,7 @@
          double e = 1.8 * (double)this.getScaleFactor();
          this.getWorld()
             .addParticle(
-               C_gjiczies.m_vnsoutnn(ParticleTypes.ENTITY_EFFECT, f, g, h),
+               EntityEffectParticleEffect.m_vnsoutnn(ParticleTypes.ENTITY_EFFECT, f, g, h),
                this.getX() + (double)j * d,
                this.getY() + e,
                this.getZ() + (double)k * d,
@@ -149,7 +149,7 @@
             );
          this.getWorld()
             .addParticle(
-               C_gjiczies.m_vnsoutnn(ParticleTypes.ENTITY_EFFECT, f, g, h),
+               EntityEffectParticleEffect.m_vnsoutnn(ParticleTypes.ENTITY_EFFECT, f, g, h),
                this.getX() - (double)j * d,
                this.getY() + e,
                this.getZ() - (double)k * d,
diff -bur namedTargetSrc/net/minecraft/entity/projectile/ArrowEntity.java namedSrc/net/minecraft/entity/projectile/ArrowEntity.java
--- namedTargetSrc/net/minecraft/entity/projectile/ArrowEntity.java	2024-04-02 00:31:35.625917308 +0000
+++ namedSrc/net/minecraft/entity/projectile/ArrowEntity.java	2024-04-02 00:30:22.437035632 +0000
@@ -11,10 +11,10 @@
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.particle.EntityEffectParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.potion.Potion;
 import net.minecraft.registry.Holder;
-import net.minecraft.unmapped.C_gjiczies;
 import net.minecraft.world.World;
 
 /**
@@ -151,7 +151,13 @@
          for (int k = 0; k < amount; k++) {
             this.getWorld()
                .addParticle(
-                  C_gjiczies.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, j), this.getParticleX(0.5), this.getRandomBodyY(), this.getParticleZ(0.5), 0.0, 0.0, 0.0
+                  EntityEffectParticleEffect.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, j),
+                  this.getParticleX(0.5),
+                  this.getRandomBodyY(),
+                  this.getParticleZ(0.5),
+                  0.0,
+                  0.0,
+                  0.0
                );
          }
       }
@@ -212,7 +218,7 @@
             for (int j = 0; j < 20; j++) {
                this.getWorld()
                   .addParticle(
-                     C_gjiczies.m_vnsoutnn(ParticleTypes.ENTITY_EFFECT, f, g, h),
+                     EntityEffectParticleEffect.m_vnsoutnn(ParticleTypes.ENTITY_EFFECT, f, g, h),
                      this.getParticleX(0.5),
                      this.getRandomBodyY(),
                      this.getParticleZ(0.5),
diff -bur namedTargetSrc/net/minecraft/feature_flags/FeatureFlagBitSet.java namedSrc/net/minecraft/feature_flags/FeatureFlagBitSet.java
--- namedTargetSrc/net/minecraft/feature_flags/FeatureFlagBitSet.java	2024-04-02 00:31:35.601917022 +0000
+++ namedSrc/net/minecraft/feature_flags/FeatureFlagBitSet.java	2024-04-02 00:30:22.409035302 +0000
@@ -104,9 +104,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jfxsjani Lnet/minecraft/unmapped/C_czxxrbcp;m_jfxsjani()Z}
+    * @mapping {@literal named isEmpty Lnet/minecraft/feature_flags/FeatureFlagBitSet;isEmpty()Z}
     */
-   public boolean m_jfxsjani() {
+   public boolean isEmpty() {
       return this.equals(EMPTY);
    }
 
diff -bur namedTargetSrc/net/minecraft/fluid/FluidState.java namedSrc/net/minecraft/fluid/FluidState.java
--- namedTargetSrc/net/minecraft/fluid/FluidState.java	2024-04-02 00:31:35.777919118 +0000
+++ namedSrc/net/minecraft/fluid/FluidState.java	2024-04-02 00:30:22.621037799 +0000
@@ -32,13 +32,15 @@
     */
    public static final Codec<FluidState> CODEC = createCodec(Registries.FLUID.getCodec(), Fluid::getDefaultState).stable();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_dpgydwjl Lnet/minecraft/unmapped/C_xqketiuf;f_dpgydwjl:I}
+    * @mapping {@literal named AMOUNT_MAX Lnet/minecraft/fluid/FluidState;AMOUNT_MAX:I}
     */
-   public static final int f_dpgydwjl = 9;
+   public static final int AMOUNT_MAX = 9;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_rqcxfxdw Lnet/minecraft/unmapped/C_xqketiuf;f_rqcxfxdw:I}
+    * @mapping {@literal named AMOUNT_FULL Lnet/minecraft/fluid/FluidState;AMOUNT_FULL:I}
     */
-   public static final int f_rqcxfxdw = 8;
+   public static final int AMOUNT_FULL = 8;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_xqketiuf;<init>(Lnet/minecraft/unmapped/C_rxhyurmy;Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;Lcom/mojang/serialization/MapCodec;)V}
diff -bur namedTargetSrc/net/minecraft/network/ClientConnection.java namedSrc/net/minecraft/network/ClientConnection.java
--- namedTargetSrc/net/minecraft/network/ClientConnection.java	2024-04-02 00:31:35.705918260 +0000
+++ namedSrc/net/minecraft/network/ClientConnection.java	2024-04-02 00:30:22.533036763 +0000
@@ -145,9 +145,10 @@
     */
    private final NetworkSide side;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_cbwmrnjw Lnet/minecraft/unmapped/C_oasmcckk;f_cbwmrnjw:Z}
+    * @mapping {@literal named duringLogin Lnet/minecraft/network/ClientConnection;duringLogin:Z}
     */
-   private volatile boolean f_cbwmrnjw = true;
+   private volatile boolean duringLogin = true;
    /**
     * @mapping {@literal hashed f_lafevvyl Lnet/minecraft/unmapped/C_oasmcckk;f_lafevvyl:Ljava/util/Queue;}
     * @mapping {@literal named queuedTasks Lnet/minecraft/network/ClientConnection;queuedTasks:Ljava/util/Queue;}
@@ -285,7 +286,7 @@
                if (bl) {
                   LOGGER.debug("Failed to sent packet", ex);
                   if (this.getOppositeSide() == NetworkSide.S2C) {
-                     Packet<?> lv2 = (Packet<?>)(this.f_cbwmrnjw ? new LoginDisconnectS2CPacket(lv) : new DisconnectS2CPacket(lv));
+                     Packet<?> lv2 = (Packet<?>)(this.duringLogin ? new LoginDisconnectS2CPacket(lv) : new DisconnectS2CPacket(lv));
                      this.send(lv2, PacketSendListener.alwaysRun(() -> this.disconnect(lv)));
                   } else {
                      this.disconnect(lv);
@@ -391,7 +392,7 @@
          }
 
          boolean bl = phase.id() == NetworkState.LOGIN;
-         this.channel.writeAndFlush(lv.andThen(channelHandlerContext -> this.f_cbwmrnjw = bl)).syncUninterruptibly();
+         this.channel.writeAndFlush(lv.andThen(channelHandlerContext -> this.duringLogin = bl)).syncUninterruptibly();
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/network/configuration/SynchronizeRegistriesConfigurationTask.java namedSrc/net/minecraft/network/configuration/SynchronizeRegistriesConfigurationTask.java
--- namedTargetSrc/net/minecraft/network/configuration/SynchronizeRegistriesConfigurationTask.java	2024-04-02 00:31:35.617917213 +0000
+++ namedSrc/net/minecraft/network/configuration/SynchronizeRegistriesConfigurationTask.java	2024-04-02 00:30:22.429035538 +0000
@@ -14,7 +14,7 @@
 import net.minecraft.registry.LayeredRegistryManager;
 import net.minecraft.registry.ServerRegistryLayer;
 import net.minecraft.registry.tag.TagNetworkSerialization;
-import net.minecraft.unmapped.C_kebqmtbz;
+import net.minecraft.resource.pack.KnownPack;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_kddnzsmk}
@@ -27,9 +27,10 @@
     */
    public static final ConfigurationTask.Type TYPE = new ConfigurationTask.Type("synchronize_registries");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_fnnewwhi Lnet/minecraft/unmapped/C_kddnzsmk;f_fnnewwhi:Ljava/util/List;}
+    * @mapping {@literal named packs Lnet/minecraft/network/configuration/SynchronizeRegistriesConfigurationTask;packs:Ljava/util/List;}
     */
-   private final List<C_kebqmtbz> f_fnnewwhi;
+   private final List<KnownPack> packs;
    /**
     * @mapping {@literal hashed f_idxromsn Lnet/minecraft/unmapped/C_kddnzsmk;f_idxromsn:Lnet/minecraft/unmapped/C_bcpxdrik;}
     * @mapping {@literal named registryLayers Lnet/minecraft/network/configuration/SynchronizeRegistriesConfigurationTask;registryLayers:Lnet/minecraft/registry/LayeredRegistryManager;}
@@ -40,8 +41,8 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_kddnzsmk;<init>(Ljava/util/List;Lnet/minecraft/unmapped/C_bcpxdrik;)V}
     * @mapping {@literal named <init> Lnet/minecraft/network/configuration/SynchronizeRegistriesConfigurationTask;<init>(Ljava/util/List;Lnet/minecraft/registry/LayeredRegistryManager;)V}
     */
-   public SynchronizeRegistriesConfigurationTask(List<C_kebqmtbz> list, LayeredRegistryManager<ServerRegistryLayer> registryLayers) {
-      this.f_fnnewwhi = list;
+   public SynchronizeRegistriesConfigurationTask(List<KnownPack> packs, LayeredRegistryManager<ServerRegistryLayer> registryLayers) {
+      this.packs = packs;
       this.registryLayers = registryLayers;
    }
 
@@ -50,31 +51,33 @@
     */
    @Override
    public void start(Consumer<Packet<?>> task) {
-      task.accept(new SelectKnownPacksS2CPacket(this.f_fnnewwhi));
+      task.accept(new SelectKnownPacksS2CPacket(this.packs));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_cmeevsoe Lnet/minecraft/unmapped/C_kddnzsmk;m_cmeevsoe(Ljava/util/function/Consumer;Ljava/util/Set;)V}
+    * @mapping {@literal named m_cmeevsoe Lnet/minecraft/network/configuration/SynchronizeRegistriesConfigurationTask;m_cmeevsoe(Ljava/util/function/Consumer;Ljava/util/Set;)V}
     */
-   private void m_cmeevsoe(Consumer<Packet<?>> consumer, Set<C_kebqmtbz> set) {
+   private void m_cmeevsoe(Consumer<Packet<?>> task, Set<KnownPack> packs) {
       DynamicOps<NbtElement> dynamicOps = this.registryLayers.getCompositeManager().createSerializationContext(NbtOps.INSTANCE);
       DynamicRegistrySync.m_mtiqpvjp(
          dynamicOps,
          this.registryLayers.getCompositeAfter(ServerRegistryLayer.WORLDGEN),
-         set,
-         (registryKey, list) -> consumer.accept(new RegistryDataS2CPacket(registryKey, list))
+         packs,
+         (registryKey, list) -> task.accept(new RegistryDataS2CPacket(registryKey, list))
       );
-      consumer.accept(new TagsSynchronizationS2CPacket(TagNetworkSerialization.serializeTagsToNetwork(this.registryLayers)));
+      task.accept(new TagsSynchronizationS2CPacket(TagNetworkSerialization.serializeTagsToNetwork(this.registryLayers)));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_urhmxqpk Lnet/minecraft/unmapped/C_kddnzsmk;m_urhmxqpk(Ljava/util/List;Ljava/util/function/Consumer;)V}
+    * @mapping {@literal named m_urhmxqpk Lnet/minecraft/network/configuration/SynchronizeRegistriesConfigurationTask;m_urhmxqpk(Ljava/util/List;Ljava/util/function/Consumer;)V}
     */
-   public void m_urhmxqpk(List<C_kebqmtbz> list, Consumer<Packet<?>> consumer) {
-      if (list.equals(this.f_fnnewwhi)) {
-         this.m_cmeevsoe(consumer, Set.copyOf(this.f_fnnewwhi));
+   public void m_urhmxqpk(List<KnownPack> packs, Consumer<Packet<?>> task) {
+      if (packs.equals(this.packs)) {
+         this.m_cmeevsoe(task, Set.copyOf(this.packs));
       } else {
-         this.m_cmeevsoe(consumer, Set.of());
+         this.m_cmeevsoe(task, Set.of());
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/network/listener/ClientConfigurationPacketListener.java namedSrc/net/minecraft/network/listener/ClientConfigurationPacketListener.java
--- namedTargetSrc/net/minecraft/network/listener/ClientConfigurationPacketListener.java	2024-04-02 00:31:35.553916451 +0000
+++ namedSrc/net/minecraft/network/listener/ClientConfigurationPacketListener.java	2024-04-02 00:30:22.357034690 +0000
@@ -3,9 +3,9 @@
 import net.minecraft.network.NetworkState;
 import net.minecraft.network.packet.s2c.configuration.FinishConfigurationS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.RegistryDataS2CPacket;
+import net.minecraft.network.packet.s2c.configuration.ResetChatS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.SelectKnownPacksS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.SynchronizeEnabledFeatureFlagsS2CPacket;
-import net.minecraft.unmapped.C_vuemjnoj;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_zwthycag}
@@ -45,7 +45,8 @@
    void onSelectKnownPacks(SelectKnownPacksS2CPacket packet);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xpmvskpp Lnet/minecraft/unmapped/C_zwthycag;m_xpmvskpp(Lnet/minecraft/unmapped/C_vuemjnoj;)V}
+    * @mapping {@literal named onResetChat Lnet/minecraft/network/listener/ClientConfigurationPacketListener;onResetChat(Lnet/minecraft/network/packet/s2c/configuration/ResetChatS2CPacket;)V}
     */
-   void m_xpmvskpp(C_vuemjnoj arg);
+   void onResetChat(ResetChatS2CPacket packet);
 }
diff -bur namedTargetSrc/net/minecraft/network/listener/ServerPlayPacketListener.java namedSrc/net/minecraft/network/listener/ServerPlayPacketListener.java
--- namedTargetSrc/net/minecraft/network/listener/ServerPlayPacketListener.java	2024-04-02 00:31:35.809919499 +0000
+++ namedSrc/net/minecraft/network/listener/ServerPlayPacketListener.java	2024-04-02 00:30:22.657038224 +0000
@@ -9,6 +9,7 @@
 import net.minecraft.network.packet.c2s.play.BookUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.ButtonClickC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatCommandC2SPacket;
+import net.minecraft.network.packet.c2s.play.ChatCommandSignedC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatSessionUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChunkBatchAcknowledgementC2SPacket;
@@ -48,7 +49,6 @@
 import net.minecraft.network.packet.c2s.play.StructureBlockUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.TeleportConfirmationC2SPacket;
 import net.minecraft.network.packet.c2s.play.VehicleMoveC2SPacket;
-import net.minecraft.unmapped.C_hnespdor;
 
 /**
  * A server side packet listener where play stage packets from a client are processed.
@@ -84,9 +84,10 @@
    void onChatCommand(ChatCommandC2SPacket packet);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jcwojvpu Lnet/minecraft/unmapped/C_eetcdhxt;m_jcwojvpu(Lnet/minecraft/unmapped/C_hnespdor;)V}
+    * @mapping {@literal named onChatCommandSigned Lnet/minecraft/network/listener/ServerPlayPacketListener;onChatCommandSigned(Lnet/minecraft/network/packet/c2s/play/ChatCommandSignedC2SPacket;)V}
     */
-   void m_jcwojvpu(C_hnespdor arg);
+   void onChatCommandSigned(ChatCommandSignedC2SPacket packet);
 
    /**
     * @mapping {@literal hashed m_vuqeccvs Lnet/minecraft/unmapped/C_eetcdhxt;m_vuqeccvs(Lnet/minecraft/unmapped/C_vtnjglse;)V}
diff -bur namedTargetSrc/net/minecraft/network/message/MessageChain.java namedSrc/net/minecraft/network/message/MessageChain.java
--- namedTargetSrc/net/minecraft/network/message/MessageChain.java	2024-04-02 00:31:35.565916593 +0000
+++ namedSrc/net/minecraft/network/message/MessageChain.java	2024-04-02 00:30:22.365034784 +0000
@@ -71,22 +71,22 @@
          @Override
          public SignedChatMessage unpack(@Nullable MessageSignature arg, MessageBody arg2) throws MessageChain.DecodingException {
             if (arg == null) {
-               throw new MessageChain.DecodingException(MessageChain.DecodingException.f_jbvszoop);
+               throw new MessageChain.DecodingException(MessageChain.DecodingException.MISSING_PROFILE_KEY);
             } else if (key.data().isExpired()) {
-               throw new MessageChain.DecodingException(MessageChain.DecodingException.f_kmyktyjk);
+               throw new MessageChain.DecodingException(MessageChain.DecodingException.EXPIRED_PROFILE_KEY);
             } else {
                MessageLink lv = MessageChain.this.link;
                if (lv == null) {
-                  throw new MessageChain.DecodingException(MessageChain.DecodingException.f_busqwolr);
+                  throw new MessageChain.DecodingException(MessageChain.DecodingException.CHAIN_BROKEN);
                } else if (arg2.timestamp().isBefore(MessageChain.this.epoch)) {
                   this.setChainBroken();
-                  throw new MessageChain.DecodingException(MessageChain.DecodingException.f_jxrzhtyz);
+                  throw new MessageChain.DecodingException(MessageChain.DecodingException.OUT_OF_ORDER_CHAT);
                } else {
                   MessageChain.this.epoch = arg2.timestamp();
                   SignedChatMessage lv2 = new SignedChatMessage(lv, arg, arg2, null, FilterMask.PASSTHROUGH);
                   if (!lv2.validate(lv)) {
                      this.setChainBroken();
-                     throw new MessageChain.DecodingException(MessageChain.DecodingException.f_zrkwpkpk);
+                     throw new MessageChain.DecodingException(MessageChain.DecodingException.INVALID_SIGNATURE);
                   } else {
                      if (lv2.isExpiredOnServer(Instant.now())) {
                         MessageChain.LOGGER.warn("Received expired chat: '{}'. Is the client/server system time unsynchronized?", arg2.content());
@@ -115,25 +115,30 @@
     */
    public static class DecodingException extends TextifiedException {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_jbvszoop Lnet/minecraft/unmapped/C_bwznvpye$C_cbfqzsjn;f_jbvszoop:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+       * @mapping {@literal named MISSING_PROFILE_KEY Lnet/minecraft/network/message/MessageChain$DecodingException;MISSING_PROFILE_KEY:Lnet/minecraft/text/Text;}
        */
-      static final Text f_jbvszoop = Text.translatable("chat.disabled.missingProfileKey");
+      static final Text MISSING_PROFILE_KEY = Text.translatable("chat.disabled.missingProfileKey");
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_busqwolr Lnet/minecraft/unmapped/C_bwznvpye$C_cbfqzsjn;f_busqwolr:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+       * @mapping {@literal named CHAIN_BROKEN Lnet/minecraft/network/message/MessageChain$DecodingException;CHAIN_BROKEN:Lnet/minecraft/text/Text;}
        */
-      static final Text f_busqwolr = Text.translatable("chat.disabled.chain_broken");
+      static final Text CHAIN_BROKEN = Text.translatable("chat.disabled.chain_broken");
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_kmyktyjk Lnet/minecraft/unmapped/C_bwznvpye$C_cbfqzsjn;f_kmyktyjk:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+       * @mapping {@literal named EXPIRED_PROFILE_KEY Lnet/minecraft/network/message/MessageChain$DecodingException;EXPIRED_PROFILE_KEY:Lnet/minecraft/text/Text;}
        */
-      static final Text f_kmyktyjk = Text.translatable("chat.disabled.expiredProfileKey");
+      static final Text EXPIRED_PROFILE_KEY = Text.translatable("chat.disabled.expiredProfileKey");
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_zrkwpkpk Lnet/minecraft/unmapped/C_bwznvpye$C_cbfqzsjn;f_zrkwpkpk:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+       * @mapping {@literal named INVALID_SIGNATURE Lnet/minecraft/network/message/MessageChain$DecodingException;INVALID_SIGNATURE:Lnet/minecraft/text/Text;}
        */
-      static final Text f_zrkwpkpk = Text.translatable("chat.disabled.invalid_signature");
+      static final Text INVALID_SIGNATURE = Text.translatable("chat.disabled.invalid_signature");
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_jxrzhtyz Lnet/minecraft/unmapped/C_bwznvpye$C_cbfqzsjn;f_jxrzhtyz:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+       * @mapping {@literal named OUT_OF_ORDER_CHAT Lnet/minecraft/network/message/MessageChain$DecodingException;OUT_OF_ORDER_CHAT:Lnet/minecraft/text/Text;}
        */
-      static final Text f_jxrzhtyz = Text.translatable("chat.disabled.out_of_order_chat");
+      static final Text OUT_OF_ORDER_CHAT = Text.translatable("chat.disabled.out_of_order_chat");
 
       /**
        * Mapping not found
@@ -176,7 +181,7 @@
       static MessageChain.Unpacker unpack(UUID sender, BooleanSupplier shouldEnforceSecureProfile) {
          return (senderx, messageBody) -> {
             if (shouldEnforceSecureProfile.getAsBoolean()) {
-               throw new MessageChain.DecodingException(MessageChain.DecodingException.f_jbvszoop);
+               throw new MessageChain.DecodingException(MessageChain.DecodingException.MISSING_PROFILE_KEY);
             } else {
                return SignedChatMessage.create(sender, messageBody.content());
             }
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/configuration/SelectKnownPacksC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/configuration/SelectKnownPacksC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/configuration/SelectKnownPacksC2SPacket.java	2024-04-02 00:31:35.773919071 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/configuration/SelectKnownPacksC2SPacket.java	2024-04-02 00:30:22.613037705 +0000
@@ -8,19 +8,19 @@
 import net.minecraft.network.packet.ConfigurationPacketTypes;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.PacketType;
-import net.minecraft.unmapped.C_kebqmtbz;
+import net.minecraft.resource.pack.KnownPack;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_klzfnvbg}
  * @mapping {@literal named net/minecraft/network/packet/c2s/configuration/SelectKnownPacksC2SPacket}
  */
-public record SelectKnownPacksC2SPacket(List<C_kebqmtbz> knownPacks) implements Packet<ServerConfigurationPacketListener> {
+public record SelectKnownPacksC2SPacket(List<KnownPack> knownPacks) implements Packet<ServerConfigurationPacketListener> {
    /**
     * @mapping {@literal hashed f_bwnyoeoi Lnet/minecraft/unmapped/C_klzfnvbg;f_bwnyoeoi:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named PACKET_CODEC Lnet/minecraft/network/packet/c2s/configuration/SelectKnownPacksC2SPacket;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    public static final PacketCodec<ByteBuf, SelectKnownPacksC2SPacket> PACKET_CODEC = PacketCodec.tuple(
-      C_kebqmtbz.PACKET_CODEC.apply(PacketCodecs.toCollection(64)), SelectKnownPacksC2SPacket::getKnownPacks, SelectKnownPacksC2SPacket::new
+      KnownPack.PACKET_CODEC.apply(PacketCodecs.toCollection(64)), SelectKnownPacksC2SPacket::getKnownPacks, SelectKnownPacksC2SPacket::new
    );
 
    /**
@@ -43,7 +43,7 @@
     * @mapping {@literal hashed m_wbhthdhg Lnet/minecraft/unmapped/C_klzfnvbg;m_wbhthdhg()Ljava/util/List;}
     * @mapping {@literal named getKnownPacks Lnet/minecraft/network/packet/c2s/configuration/SelectKnownPacksC2SPacket;getKnownPacks()Ljava/util/List;}
     */
-   public List<C_kebqmtbz> getKnownPacks() {
+   public List<KnownPack> getKnownPacks() {
       return this.knownPacks;
    }
 }
Only in namedSrc/net/minecraft/network/packet/c2s/play: ChatCommandSignedC2SPacket.java
diff -bur namedTargetSrc/net/minecraft/network/packet/ConfigurationPacketTypes.java namedSrc/net/minecraft/network/packet/ConfigurationPacketTypes.java
--- namedTargetSrc/net/minecraft/network/packet/ConfigurationPacketTypes.java	2024-04-02 00:31:35.817919594 +0000
+++ namedSrc/net/minecraft/network/packet/ConfigurationPacketTypes.java	2024-04-02 00:30:22.665038318 +0000
@@ -7,9 +7,9 @@
 import net.minecraft.network.packet.c2s.configuration.SelectKnownPacksC2SPacket;
 import net.minecraft.network.packet.s2c.configuration.FinishConfigurationS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.RegistryDataS2CPacket;
+import net.minecraft.network.packet.s2c.configuration.ResetChatS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.SelectKnownPacksS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.SynchronizeEnabledFeatureFlagsS2CPacket;
-import net.minecraft.unmapped.C_vuemjnoj;
 import net.minecraft.util.Identifier;
 
 /**
@@ -41,7 +41,7 @@
     * @mapping {@literal hashed f_tkbdzldr Lnet/minecraft/unmapped/C_ijndivcs;f_tkbdzldr:Lnet/minecraft/unmapped/C_usugyqlb;}
     * @mapping {@literal named RESET_CHAT Lnet/minecraft/network/packet/ConfigurationPacketTypes;RESET_CHAT:Lnet/minecraft/network/packet/PacketType;}
     */
-   public static final PacketType<C_vuemjnoj> RESET_CHAT = createS2C("reset_chat");
+   public static final PacketType<ResetChatS2CPacket> RESET_CHAT = createS2C("reset_chat");
    /**
     * @mapping {@literal hashed f_vibkfept Lnet/minecraft/unmapped/C_ijndivcs;f_vibkfept:Lnet/minecraft/unmapped/C_usugyqlb;}
     * @mapping {@literal named FINISH_CONFIGURATION_C2S Lnet/minecraft/network/packet/ConfigurationPacketTypes;FINISH_CONFIGURATION_C2S:Lnet/minecraft/network/packet/PacketType;}
diff -bur namedTargetSrc/net/minecraft/network/packet/PlayPacketTypes.java namedSrc/net/minecraft/network/packet/PlayPacketTypes.java
--- namedTargetSrc/net/minecraft/network/packet/PlayPacketTypes.java	2024-04-02 00:31:35.677917927 +0000
+++ namedSrc/net/minecraft/network/packet/PlayPacketTypes.java	2024-04-02 00:30:22.501036386 +0000
@@ -11,6 +11,7 @@
 import net.minecraft.network.packet.c2s.play.BookUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.ButtonClickC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatCommandC2SPacket;
+import net.minecraft.network.packet.c2s.play.ChatCommandSignedC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatSessionUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChunkBatchAcknowledgementC2SPacket;
@@ -159,7 +160,6 @@
 import net.minecraft.network.packet.s2c.play.WorldEventS2CPacket;
 import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.WrittenBookOpenS2CPacket;
-import net.minecraft.unmapped.C_hnespdor;
 import net.minecraft.util.Identifier;
 
 /**
@@ -736,7 +736,7 @@
     * @mapping {@literal hashed f_ikpofyak Lnet/minecraft/unmapped/C_pidfagay;f_ikpofyak:Lnet/minecraft/unmapped/C_usugyqlb;}
     * @mapping {@literal named CHAT_COMMAND_SIGNED Lnet/minecraft/network/packet/PlayPacketTypes;CHAT_COMMAND_SIGNED:Lnet/minecraft/network/packet/PacketType;}
     */
-   public static final PacketType<C_hnespdor> CHAT_COMMAND_SIGNED = createC2S("chat_command_signed");
+   public static final PacketType<ChatCommandSignedC2SPacket> CHAT_COMMAND_SIGNED = createC2S("chat_command_signed");
    /**
     * @mapping {@literal hashed f_bhzrunvh Lnet/minecraft/unmapped/C_pidfagay;f_bhzrunvh:Lnet/minecraft/unmapped/C_usugyqlb;}
     * @mapping {@literal named CHAT Lnet/minecraft/network/packet/PlayPacketTypes;CHAT:Lnet/minecraft/network/packet/PacketType;}
Only in namedSrc/net/minecraft/network/packet/s2c/configuration: ResetChatS2CPacket.java
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/configuration/SelectKnownPacksS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/configuration/SelectKnownPacksS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/configuration/SelectKnownPacksS2CPacket.java	2024-04-02 00:31:35.665917785 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/configuration/SelectKnownPacksS2CPacket.java	2024-04-02 00:30:22.489036244 +0000
@@ -8,19 +8,19 @@
 import net.minecraft.network.packet.ConfigurationPacketTypes;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.PacketType;
-import net.minecraft.unmapped.C_kebqmtbz;
+import net.minecraft.resource.pack.KnownPack;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_nylwiqcp}
  * @mapping {@literal named net/minecraft/network/packet/s2c/configuration/SelectKnownPacksS2CPacket}
  */
-public record SelectKnownPacksS2CPacket(List<C_kebqmtbz> knownPacks) implements Packet<ClientConfigurationPacketListener> {
+public record SelectKnownPacksS2CPacket(List<KnownPack> knownPacks) implements Packet<ClientConfigurationPacketListener> {
    /**
     * @mapping {@literal hashed f_yjyojfqt Lnet/minecraft/unmapped/C_nylwiqcp;f_yjyojfqt:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named PACKET_CODEC Lnet/minecraft/network/packet/s2c/configuration/SelectKnownPacksS2CPacket;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    public static final PacketCodec<ByteBuf, SelectKnownPacksS2CPacket> PACKET_CODEC = PacketCodec.tuple(
-      C_kebqmtbz.PACKET_CODEC.apply(PacketCodecs.toCollection()), SelectKnownPacksS2CPacket::getKnownPacks, SelectKnownPacksS2CPacket::new
+      KnownPack.PACKET_CODEC.apply(PacketCodecs.toCollection()), SelectKnownPacksS2CPacket::getKnownPacks, SelectKnownPacksS2CPacket::new
    );
 
    /**
@@ -43,7 +43,7 @@
     * @mapping {@literal hashed m_wzqhcmau Lnet/minecraft/unmapped/C_nylwiqcp;m_wzqhcmau()Ljava/util/List;}
     * @mapping {@literal named getKnownPacks Lnet/minecraft/network/packet/s2c/configuration/SelectKnownPacksS2CPacket;getKnownPacks()Ljava/util/List;}
     */
-   public List<C_kebqmtbz> getKnownPacks() {
+   public List<KnownPack> getKnownPacks() {
       return this.knownPacks;
    }
 }
diff -bur namedTargetSrc/net/minecraft/network/phase/ConfigurationPhases.java namedSrc/net/minecraft/network/phase/ConfigurationPhases.java
--- namedTargetSrc/net/minecraft/network/phase/ConfigurationPhases.java	2024-04-02 00:31:35.837919832 +0000
+++ namedSrc/net/minecraft/network/phase/ConfigurationPhases.java	2024-04-02 00:30:22.685038554 +0000
@@ -26,11 +26,11 @@
 import net.minecraft.network.packet.s2c.configuration.CookieRequestS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.FinishConfigurationS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.RegistryDataS2CPacket;
+import net.minecraft.network.packet.s2c.configuration.ResetChatS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.SelectKnownPacksS2CPacket;
 import net.minecraft.network.packet.s2c.configuration.SynchronizeEnabledFeatureFlagsS2CPacket;
 import net.minecraft.network.packet.s2c.query.StoreCookieS2CPacket;
 import net.minecraft.network.packet.s2c.query.TransferS2CPacket;
-import net.minecraft.unmapped.C_vuemjnoj;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_sdswxrfc}
@@ -64,7 +64,7 @@
             .add(ConfigurationPacketTypes.FINISH_CONFIGURATION_S2C, FinishConfigurationS2CPacket.CODEC)
             .add(QueryPacketTypes.KEEP_ALIVE_S2C, KeepConnectionAliveS2CPacket.CODEC)
             .add(QueryPacketTypes.PING, PingS2CPacket.CODEC)
-            .add(ConfigurationPacketTypes.RESET_CHAT, C_vuemjnoj.PACKET_CODEC)
+            .add(ConfigurationPacketTypes.RESET_CHAT, ResetChatS2CPacket.PACKET_CODEC)
             .add(ConfigurationPacketTypes.REGISTRY_DATA_S2C, RegistryDataS2CPacket.CODEC)
             .add(QueryPacketTypes.RESOURCE_PACK_POP, RemoveResourcePackS2CPacket.CODEC)
             .add(QueryPacketTypes.RESOURCE_PACK_PUSH, AddResourcePackS2CPacket.CODEC)
diff -bur namedTargetSrc/net/minecraft/network/phase/PlayPhases.java namedSrc/net/minecraft/network/phase/PlayPhases.java
--- namedTargetSrc/net/minecraft/network/phase/PlayPhases.java	2024-04-02 00:31:35.581916784 +0000
+++ namedSrc/net/minecraft/network/phase/PlayPhases.java	2024-04-02 00:30:22.389035066 +0000
@@ -23,6 +23,7 @@
 import net.minecraft.network.packet.c2s.play.BookUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.ButtonClickC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatCommandC2SPacket;
+import net.minecraft.network.packet.c2s.play.ChatCommandSignedC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChatSessionUpdateC2SPacket;
 import net.minecraft.network.packet.c2s.play.ChunkBatchAcknowledgementC2SPacket;
@@ -184,7 +185,6 @@
 import net.minecraft.network.packet.s2c.query.QueryPongS2CPacket;
 import net.minecraft.network.packet.s2c.query.StoreCookieS2CPacket;
 import net.minecraft.network.packet.s2c.query.TransferS2CPacket;
-import net.minecraft.unmapped.C_hnespdor;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_aekjcark}
@@ -202,7 +202,7 @@
             .add(PlayPacketTypes.CHANGE_DIFFICULTY_C2S, DifficultyUpdateC2SPacket.CODEC)
             .add(PlayPacketTypes.CHAT_ACK, MessageAcknowledgmentC2SPacket.CODEC)
             .add(PlayPacketTypes.CHAT_COMMAND, ChatCommandC2SPacket.CODEC)
-            .add(PlayPacketTypes.CHAT_COMMAND_SIGNED, C_hnespdor.PACKET_CODEC)
+            .add(PlayPacketTypes.CHAT_COMMAND_SIGNED, ChatCommandSignedC2SPacket.PACKET_CODEC)
             .add(PlayPacketTypes.CHAT, ChatMessageC2SPacket.CODEC)
             .add(PlayPacketTypes.CHAT_SESSION_UPDATE, ChatSessionUpdateC2SPacket.CODEC)
             .add(PlayPacketTypes.CHUNK_BATCH_RECEIVED, ChunkBatchAcknowledgementC2SPacket.CODEC)
diff -bur namedTargetSrc/net/minecraft/particle/BlockStateParticleEffect.java namedSrc/net/minecraft/particle/BlockStateParticleEffect.java
--- namedTargetSrc/net/minecraft/particle/BlockStateParticleEffect.java	2024-04-02 00:31:35.621917260 +0000
+++ namedSrc/net/minecraft/particle/BlockStateParticleEffect.java	2024-04-02 00:30:22.437035632 +0000
@@ -23,10 +23,10 @@
     */
    public static final ParticleEffect.Factory<BlockStateParticleEffect> PARAMETERS_FACTORY = new ParticleEffect.Factory<BlockStateParticleEffect>() {
       /**
-       * @mapping {@literal hashed m_kbqdvgnj Lnet/minecraft/unmapped/C_ltgmbjdx$C_nyovwaiz;m_kbqdvgnj(Lnet/minecraft/unmapped/C_qlzoaopu;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_ltgmbjdx;}
-       * @mapping {@literal named m_kbqdvgnj Lnet/minecraft/particle/BlockStateParticleEffect$C_nyovwaiz;m_kbqdvgnj(Lnet/minecraft/particle/ParticleType;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/BlockStateParticleEffect;}
+       * @mapping {@literal hashed m_qrqczsum Lnet/minecraft/unmapped/C_ltgmbjdx$C_nyovwaiz;m_qrqczsum(Lnet/minecraft/unmapped/C_qlzoaopu;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_ltgmbjdx;}
+       * @mapping {@literal named fromCommand Lnet/minecraft/particle/BlockStateParticleEffect$C_nyovwaiz;fromCommand(Lnet/minecraft/particle/ParticleType;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/BlockStateParticleEffect;}
        */
-      public BlockStateParticleEffect m_kbqdvgnj(ParticleType<BlockStateParticleEffect> arg, StringReader reader, HolderLookup.Provider arg2) throws CommandSyntaxException {
+      public BlockStateParticleEffect fromCommand(ParticleType<BlockStateParticleEffect> arg, StringReader reader, HolderLookup.Provider arg2) throws CommandSyntaxException {
          reader.expect(' ');
          return new BlockStateParticleEffect(arg, BlockArgumentParser.parseForBlock(Registries.BLOCK.asLookup(), reader, false).blockState());
       }
diff -bur namedTargetSrc/net/minecraft/particle/DefaultParticleType.java namedSrc/net/minecraft/particle/DefaultParticleType.java
--- namedTargetSrc/net/minecraft/particle/DefaultParticleType.java	2024-04-02 00:31:35.561916545 +0000
+++ namedSrc/net/minecraft/particle/DefaultParticleType.java	2024-04-02 00:30:22.365034784 +0000
@@ -18,10 +18,10 @@
     */
    private static final ParticleEffect.Factory<DefaultParticleType> PARAMETER_FACTORY = new ParticleEffect.Factory<DefaultParticleType>() {
       /**
-       * @mapping {@literal hashed m_kbqdvgnj Lnet/minecraft/unmapped/C_lwmufxcy$C_sewlqckj;m_kbqdvgnj(Lnet/minecraft/unmapped/C_qlzoaopu;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_lwmufxcy;}
-       * @mapping {@literal named m_kbqdvgnj Lnet/minecraft/particle/DefaultParticleType$C_sewlqckj;m_kbqdvgnj(Lnet/minecraft/particle/ParticleType;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/DefaultParticleType;}
+       * @mapping {@literal hashed m_wwosbsjf Lnet/minecraft/unmapped/C_lwmufxcy$C_sewlqckj;m_wwosbsjf(Lnet/minecraft/unmapped/C_qlzoaopu;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_lwmufxcy;}
+       * @mapping {@literal named fromCommand Lnet/minecraft/particle/DefaultParticleType$C_sewlqckj;fromCommand(Lnet/minecraft/particle/ParticleType;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/DefaultParticleType;}
        */
-      public DefaultParticleType m_kbqdvgnj(ParticleType<DefaultParticleType> arg, StringReader reader, HolderLookup.Provider arg2) {
+      public DefaultParticleType fromCommand(ParticleType<DefaultParticleType> arg, StringReader reader, HolderLookup.Provider arg2) {
          return (DefaultParticleType)arg;
       }
    };
diff -bur namedTargetSrc/net/minecraft/particle/DustColorTransitionParticleEffect.java namedSrc/net/minecraft/particle/DustColorTransitionParticleEffect.java
--- namedTargetSrc/net/minecraft/particle/DustColorTransitionParticleEffect.java	2024-04-02 00:31:35.801919404 +0000
+++ namedSrc/net/minecraft/particle/DustColorTransitionParticleEffect.java	2024-04-02 00:30:22.645038082 +0000
@@ -61,10 +61,10 @@
     */
    public static final ParticleEffect.Factory<DustColorTransitionParticleEffect> FACTORY = new ParticleEffect.Factory<DustColorTransitionParticleEffect>() {
       /**
-       * @mapping {@literal hashed m_kbqdvgnj Lnet/minecraft/unmapped/C_dimfwbzx$C_ojimqsym;m_kbqdvgnj(Lnet/minecraft/unmapped/C_qlzoaopu;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_dimfwbzx;}
-       * @mapping {@literal named m_kbqdvgnj Lnet/minecraft/particle/DustColorTransitionParticleEffect$C_ojimqsym;m_kbqdvgnj(Lnet/minecraft/particle/ParticleType;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/DustColorTransitionParticleEffect;}
+       * @mapping {@literal hashed m_ylwjxvzc Lnet/minecraft/unmapped/C_dimfwbzx$C_ojimqsym;m_ylwjxvzc(Lnet/minecraft/unmapped/C_qlzoaopu;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_dimfwbzx;}
+       * @mapping {@literal named fromCommand Lnet/minecraft/particle/DustColorTransitionParticleEffect$C_ojimqsym;fromCommand(Lnet/minecraft/particle/ParticleType;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/DustColorTransitionParticleEffect;}
        */
-      public DustColorTransitionParticleEffect m_kbqdvgnj(ParticleType<DustColorTransitionParticleEffect> arg, StringReader reader, HolderLookup.Provider arg2) throws CommandSyntaxException {
+      public DustColorTransitionParticleEffect fromCommand(ParticleType<DustColorTransitionParticleEffect> arg, StringReader reader, HolderLookup.Provider arg2) throws CommandSyntaxException {
          Vector3f vector3f = AbstractDustParticleEffect.readColor(reader);
          reader.expect(' ');
          float f = reader.readFloat();
diff -bur namedTargetSrc/net/minecraft/particle/DustParticleEffect.java namedSrc/net/minecraft/particle/DustParticleEffect.java
--- namedTargetSrc/net/minecraft/particle/DustParticleEffect.java	2024-04-02 00:31:35.677917927 +0000
+++ namedSrc/net/minecraft/particle/DustParticleEffect.java	2024-04-02 00:30:22.501036386 +0000
@@ -51,10 +51,10 @@
     */
    public static final ParticleEffect.Factory<DustParticleEffect> PARAMETERS_FACTORY = new ParticleEffect.Factory<DustParticleEffect>() {
       /**
-       * @mapping {@literal hashed m_kbqdvgnj Lnet/minecraft/unmapped/C_adimpttu$C_juujwtws;m_kbqdvgnj(Lnet/minecraft/unmapped/C_qlzoaopu;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_adimpttu;}
-       * @mapping {@literal named m_kbqdvgnj Lnet/minecraft/particle/DustParticleEffect$C_juujwtws;m_kbqdvgnj(Lnet/minecraft/particle/ParticleType;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/DustParticleEffect;}
+       * @mapping {@literal hashed m_kddwweri Lnet/minecraft/unmapped/C_adimpttu$C_juujwtws;m_kddwweri(Lnet/minecraft/unmapped/C_qlzoaopu;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_adimpttu;}
+       * @mapping {@literal named fromCommand Lnet/minecraft/particle/DustParticleEffect$C_juujwtws;fromCommand(Lnet/minecraft/particle/ParticleType;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/DustParticleEffect;}
        */
-      public DustParticleEffect m_kbqdvgnj(ParticleType<DustParticleEffect> arg, StringReader reader, HolderLookup.Provider arg2) throws CommandSyntaxException {
+      public DustParticleEffect fromCommand(ParticleType<DustParticleEffect> arg, StringReader reader, HolderLookup.Provider arg2) throws CommandSyntaxException {
          Vector3f vector3f = AbstractDustParticleEffect.readColor(reader);
          reader.expect(' ');
          float f = reader.readFloat();
Only in namedSrc/net/minecraft/particle: EntityEffectParticleEffect.java
diff -bur namedTargetSrc/net/minecraft/particle/ItemStackParticleEffect.java namedSrc/net/minecraft/particle/ItemStackParticleEffect.java
--- namedTargetSrc/net/minecraft/particle/ItemStackParticleEffect.java	2024-04-02 00:31:35.773919071 +0000
+++ namedSrc/net/minecraft/particle/ItemStackParticleEffect.java	2024-04-02 00:30:22.617037752 +0000
@@ -22,10 +22,10 @@
     */
    public static final ParticleEffect.Factory<ItemStackParticleEffect> PARAMETERS_FACTORY = new ParticleEffect.Factory<ItemStackParticleEffect>() {
       /**
-       * @mapping {@literal hashed m_kbqdvgnj Lnet/minecraft/unmapped/C_hiarsvao$C_umvttraz;m_kbqdvgnj(Lnet/minecraft/unmapped/C_qlzoaopu;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hiarsvao;}
-       * @mapping {@literal named m_kbqdvgnj Lnet/minecraft/particle/ItemStackParticleEffect$C_umvttraz;m_kbqdvgnj(Lnet/minecraft/particle/ParticleType;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/ItemStackParticleEffect;}
+       * @mapping {@literal hashed m_otvnlfad Lnet/minecraft/unmapped/C_hiarsvao$C_umvttraz;m_otvnlfad(Lnet/minecraft/unmapped/C_qlzoaopu;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hiarsvao;}
+       * @mapping {@literal named fromCommand Lnet/minecraft/particle/ItemStackParticleEffect$C_umvttraz;fromCommand(Lnet/minecraft/particle/ParticleType;Lcom/mojang/brigadier/StringReader;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/ItemStackParticleEffect;}
        */
-      public ItemStackParticleEffect m_kbqdvgnj(ParticleType<ItemStackParticleEffect> arg, StringReader reader, HolderLookup.Provider arg2) throws CommandSyntaxException {
+      public ItemStackParticleEffect fromCommand(ParticleType<ItemStackParticleEffect> arg, StringReader reader, HolderLookup.Provider arg2) throws CommandSyntaxException {
          reader.expect(' ');
          ItemStringReader.ItemResult lv = new ItemStringReader(arg2).m_ccdupztg(reader);
          ItemStack lv2 = new ItemStackArgument(lv.item(), lv.components()).createStack(1, false);


The remaining diff is too long!

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

-Original file line number
+Diff line change
@@ Expand Up @@
     	METHOD m_hpxxrezd fromPacket (Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_kdwyuhdb;
     		ARG 0 requirements
     	METHOD m_htjukofs parent ()Ljava/util/Optional;
+    	METHOD m_mmibtmoe validate (Lnet/minecraft/unmapped/C_jtpvewkp;Lnet/minecraft/unmapped/C_pzdchrcy$C_pbvqpmst;)V
+    		ARG 1 errorReporter
+    		ARG 2 lookup
     	METHOD m_nlkunzez (Lnet/minecraft/unmapped/C_kdwyuhdb;)Ljava/util/Optional;
     		ARG 0 advancement
     	METHOD m_ofikdsfj rewards ()Lnet/minecraft/unmapped/C_wptigggq;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_krykgqvz SUMMONED_ENTITY Lnet/minecraft/unmapped/C_ckqxcepo;
     	FIELD f_ktddzemg LIGHTNING_STRIKE Lnet/minecraft/unmapped/C_ujdwetcx;
     	FIELD f_lbnxzyzw HERO_OF_THE_VILLAGE Lnet/minecraft/unmapped/C_maikngon;
+    	FIELD f_melyrayn VOLUNTARY_EXILE Lnet/minecraft/unmapped/C_maikngon;
     	FIELD f_mldjmzng ITEM_USED_ON_BLOCK Lnet/minecraft/unmapped/C_bvrmpowj;
     	FIELD f_mtclpdhs AVOID_VIBRATION Lnet/minecraft/unmapped/C_maikngon;
     	FIELD f_mtimahzx PLAYER_INTERACTED_WITH_ENTITY Lnet/minecraft/unmapped/C_bvljsgzr;
@@ Expand All @@
     	FIELD f_swqlglzk FILLED_BUCKET Lnet/minecraft/unmapped/C_mhaudtdi;
     	FIELD f_tikkshas CONSTRUCT_BEACON Lnet/minecraft/unmapped/C_bbkpvqdm;
     	FIELD f_tmatnqrb ENCHANTED_ITEM Lnet/minecraft/unmapped/C_sszdquwf;
+    	FIELD f_ugbvqpld CRAFTER_RECIPE_CRAFTED Lnet/minecraft/unmapped/C_thfyxhzz;
     	FIELD f_umamkxlz PLAYER_KILLED_ENTITY Lnet/minecraft/unmapped/C_hqkuepng;
     	FIELD f_vdmrrmcv INVENTORY_CHANGED Lnet/minecraft/unmapped/C_wqesddch;
     	FIELD f_wdynfuaf ALLAY_DROP_ITEM_ON_BLOCK Lnet/minecraft/unmapped/C_bvrmpowj;
     	FIELD f_xboamyvc USED_TOTEM Lnet/minecraft/unmapped/C_clwnikrb;
     	FIELD f_xgceertb BRED_ANIMALS Lnet/minecraft/unmapped/C_mvevuwjm;
     	FIELD f_xlgkdsct CHANGED_DIMENSION Lnet/minecraft/unmapped/C_nxnnvhrs;
+    	FIELD f_yjeeyvuk FALL_AFTER_EXPLOSION Lnet/minecraft/unmapped/C_ggxgldwv;
     	FIELD f_ywtongwv ENTITY_HURT_PLAYER Lnet/minecraft/unmapped/C_vteznemu;
     	FIELD f_yxyehrrr LEVITATION Lnet/minecraft/unmapped/C_mhjgbxyr;
     	FIELD f_zfjqvvml LOCATION Lnet/minecraft/unmapped/C_maikngon;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+    CLASS net/minecraft/unmapped/C_ggxgldwv net/minecraft/advancement/criterion/FallAfterExplosionCriterionTrigger
+    	METHOD m_wbkwcbuk trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_astfners;)V
+    		ARG 2 startPosition
+    		ARG 3 cause
+    	CLASS C_lnhehbtr Conditions
+    		METHOD m_btjdamgy create (Lnet/minecraft/unmapped/C_ullximxc;Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_rzypsigz;
+    		METHOD m_kchlcuvj matches (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_iakykpgh;)Z
+    			ARG 2 startPosition
+    			ARG 3 endPosition
+    			ARG 4 cause

-Original file line number
+Diff line change
@@ Expand Up @@
     		METHOD m_srqmbfmi matches (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)Z
     			ARG 1 recipeId
     			ARG 2 stacks
+    		METHOD m_zrhvqutd crafterCraftedItem (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_rzypsigz;
+    			ARG 0 recipeId

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 `f2fcee1`

github-actions bot commented on `f2fcee1` Apr 2, 2024

github-actions bot commented on `f2fcee1` Apr 2, 2024

github-actions bot commented on `f2fcee1` Apr 2, 2024

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_mvjlsrzv externalAssetPath Ljava/nio/file/Path;
     	FIELD f_rlhfktwn HIGH_CONTRAST_NAME Ljava/lang/String;
     	FIELD f_vbkddfmv RESOURCE_PACKS_DIR Lnet/minecraft/unmapped/C_ncpywfca;
+    	FIELD f_xtluyfeh VANILLA_PACK_INFO Lnet/minecraft/unmapped/C_yebcvztn;
     	METHOD <init> (Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_jgxjjhjn;)V
     		ARG 1 path
     		ARG 2 symlinkValidator
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     		ARG 2 nbt
     		ARG 3 oldDataVersion
     		ARG 4 newDataVersion
+    	METHOD m_uaejgwae createDatafixCodec (Lcom/mojang/serialization/Codec;Lcom/mojang/datafixers/DataFixer;I)Lcom/mojang/serialization/Codec;
+    		ARG 3 currentDataVersion
     	METHOD m_uhqygcnr updateDataFixer (Lcom/mojang/datafixers/DataFixer;Lcom/mojang/serialization/Dynamic;II)Lcom/mojang/serialization/Dynamic;
     		ARG 1 fixer
     		ARG 3 oldDataVersion
     		ARG 4 newDataVersion
+    	CLASS C_alqyygvn
+    		METHOD decode decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
+    			ARG 1 ops
+    			ARG 2 input
+    		METHOD encode encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
+    			ARG 1 input
+    			ARG 2 ops
+    			ARG 3 prefix

-Original file line number
+Diff line change
@@ -1 +1,3 @@
     CLASS net/minecraft/unmapped/C_qfhcarfn net/minecraft/datafixer/DataFixUtil
+    	METHOD m_bclgngzq cast (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
+    	METHOD m_jhmddjog fixBlockPos (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;

-Original file line number
+Diff line change
@@ Expand Up @@
     		ARG 0 builder
     	METHOD m_erbswjjb replacing (Ljava/util/Map;)Ljava/util/function/UnaryOperator;
     		ARG 0 replacements
+    	METHOD m_fwikjxye replacingRaw (Ljava/util/Map;)Ljava/util/function/UnaryOperator;
+    		ARG 0 replacements
     	METHOD m_gkbczsaz (Ljava/lang/String;)Ljava/lang/String;
     		ARG 0 id
     	METHOD m_hiinumov getFixer ()Lcom/mojang/datafixers/DataFixer;
@@ Expand Down @@

Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		CLASS net/minecraft/unmapped/C_hhpdildx net/minecraft/datafixer/fix/AreaEffectCloudPotionFix
		METHOD m_ievxdhik fix (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;

-Original file line number
+Diff line change
@@ -1 +1,6 @@
     CLASS net/minecraft/unmapped/C_dglojnba net/minecraft/datafixer/fix/BannerPatternFormatFix
+    	FIELD f_ofediqax OLD_TO_NEW_PATTERNS Ljava/util/Map;
+    	METHOD m_bdkitibn replacePatterns (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+    	METHOD m_hponfylw replacePatternAndColor (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+    	METHOD m_meylxmnz getColor (I)Ljava/lang/String;
+    		ARG 0 color

-Original file line number
+Diff line change
@@ -1 +1,4 @@
     CLASS net/minecraft/unmapped/C_vvigtzbk net/minecraft/datafixer/fix/BeehiveFieldRenameFix
+    	METHOD m_ocvytcpa fixBee (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+    	METHOD m_ogmidexj fixBeehive (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+    	METHOD makeRule makeRule ()Lcom/mojang/datafixers/TypeRewriteRule;

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_aagjfgql SKIP_BLENDING_STATUS Ljava/util/Set;
     	FIELD f_ttijhrsa name Ljava/lang/String;
     	METHOD m_foctrvhu updateChunkNbt (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/OptionalDynamic;)Lcom/mojang/serialization/Dynamic;
+    		ARG 0 chunk
+    		ARG 1 context
     	METHOD m_vuctozvv updateBlendingData (Lcom/mojang/serialization/Dynamic;II)Lcom/mojang/serialization/Dynamic;
     		ARG 1 worldHeight
     		ARG 2 minY
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)V
     		ARG 1 oldSchema
     		ARG 2 name
+    	METHOD m_gfynbltp renameBlock (Ljava/lang/String;)Ljava/lang/String;
+    		ARG 1 oldName
     	METHOD m_wotaakbv create (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/DataFix;
     		ARG 0 oldSchema
     		ARG 1 name
     		ARG 2 rename
+    	METHOD m_yzgnosmh fixFlatBlockState (Ljava/lang/String;)Ljava/lang/String;
+    		ARG 1 block
+    	METHOD m_zyutiumf fixBlockState (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
     	METHOD makeRule makeRule ()Lcom/mojang/datafixers/TypeRewriteRule;

-Original file line number
+Diff line change
@@ -1 +1,14 @@
     CLASS net/minecraft/unmapped/C_lntklpwx net/minecraft/datafixer/fix/BlockPosFormatFix
+    	FIELD f_okkmsozd PATROL_TARGET_ENTITY_IDS Ljava/util/List;
+    	METHOD m_ktyneubd fixBlockPosFormat (Lcom/mojang/datafixers/Typed;Ljava/util/Map;)Lcom/mojang/datafixers/Typed;
+    		ARG 2 oldToNewKey
+    	METHOD m_mwdtslhk fixMapItemFrames (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+    	METHOD m_ocrbhxpw addBlockEntityRules (Ljava/util/List;)V
+    		ARG 1 rules
+    	METHOD m_vwmshnpe addEntityRules (Ljava/util/List;)V
+    		ARG 1 rules
+    	METHOD m_yeyehovs createEntityFixRule (Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;Ljava/util/Map;)Lcom/mojang/datafixers/TypeRewriteRule;
+    		ARG 1 typeReference
+    		ARG 2 id
+    		ARG 3 oldToNewKey
+    	METHOD makeRule makeRule ()Lcom/mojang/datafixers/TypeRewriteRule;

-Original file line number
+Diff line change
@@ -1,4 +1,6 @@
     CLASS net/minecraft/unmapped/C_vbhondoh net/minecraft/datafixer/fix/CauldronRenameFix
     	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;Z)V
     		ARG 1 outputSchema
+    		ARG 2 changesType
     	METHOD m_nwhklvlq rename (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+    	METHOD makeRule makeRule ()Lcom/mojang/datafixers/TypeRewriteRule;

-Original file line number
+Diff line change
@@ Expand Up @@
     		ARG 0 value
     	METHOD m_eiqkbwwj updateHeightmaps (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
     	METHOD m_gjgcgypj updateChunkTag (Lcom/mojang/serialization/Dynamic;ZZZLjava/util/function/Supplier;)Lcom/mojang/serialization/Dynamic;
+    		ARG 0 level
+    		ARG 1 isOverworld
+    		ARG 2 heightAlreadyUpdated
+    		ARG 3 atNoiseStatus
     	METHOD m_gqnkferc predictChunkStatusBeforeSurface (Lcom/mojang/serialization/Dynamic;Ljava/util/Set;)Lcom/mojang/serialization/Dynamic;
+    		ARG 2 blocks
     	METHOD m_iczggqwx updateCarvingMasks (Lcom/mojang/serialization/Dynamic;II)Lcom/mojang/serialization/Dynamic;
+    		ARG 0 level
+    		ARG 1 sectionsPerChunk
+    		ARG 2 oldBottomSectionY
     	METHOD m_ioefdnre fixHeightmap (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
     	METHOD m_jsgzpkef getOldBiomeId ([II)I
     		ARG 0 biomes
+    		ARG 1 index
     	METHOD m_mefnutdc createPalettedContainer (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
     	METHOD m_nivduoxv padPaletteEntries (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;Ljava/util/List;)Lcom/mojang/serialization/Dynamic;
     	METHOD m_okecuaga createPalettedContainer (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
     	METHOD m_omndifrq addPaddingEntries (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic;
     		ARG 1 key
     	METHOD m_tbqhkxol createOptimizedPalettedContainer (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
     	METHOD m_vhkegrfg createBiomeContainer (Lcom/mojang/serialization/Dynamic;Lit/unimi/dsi/fastutil/ints/Int2IntFunction;)Lcom/mojang/serialization/Dynamic;
+    		ARG 0 level
+    		ARG 1 biomeGetter
     	METHOD m_zkmdzafb shiftUpgradeData (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
     	METHOD m_zlioptox getBiomeContainers (Lcom/mojang/serialization/Dynamic;ZILorg/apache/commons/lang3/mutable/MutableBoolean;)[Lcom/mojang/serialization/Dynamic;
     		ARG 1 isOverworld
+    		ARG 3 heightAlreadyUpdated
     	METHOD makeRule makeRule ()Lcom/mojang/datafixers/TypeRewriteRule;

-Original file line number
+Diff line change
@@ Expand Up @@
     		ARG 1 outputSchema
     		ARG 2 changesType
     	METHOD m_deapfidx mergeIdAndData (Lcom/mojang/datafixers/Typed;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/mojang/datafixers/Typed;
+    		ARG 1 entity
     		ARG 2 oldIdKey
     		ARG 3 oldDataKey
     		ARG 4 newStateKey
     	METHOD m_dtukmext useFunction (Lcom/mojang/datafixers/Typed;Ljava/lang/String;Ljava/util/function/Function;)Lcom/mojang/datafixers/Typed;
+    		ARG 1 entity
     		ARG 2 entityId
     		ARG 3 function
     	METHOD m_dvjudfum updateFallingBlock (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
+    		ARG 1 fallingBlock
     	METHOD m_gzpdowex getNumericalBlockId (Ljava/lang/String;)I
     		ARG 0 blockId
     	METHOD m_mflplbzg (Ljava/util/HashMap;)V
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_csrdrcrf NEW_MINE_BLOCK_ID Ljava/lang/String;
     	FIELD f_eshehglp RENAMED_ENTITY_STATS Ljava/util/Map;
     	FIELD f_fqbquxrt RENAMED_ENTITIES Ljava/util/Map;
+    	FIELD f_fvogauph SPECIAL_OBJECTIVE_CRITERIA Ljava/util/Set;
     	FIELD f_kqqxmjzo SKIP Ljava/util/Set;
     	FIELD f_ladwzklc RENAMED_ITEM_STATS Ljava/util/Map;
     	FIELD f_nukofjgi RENAMED_GENERAL_STATS Ljava/util/Map;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,5 +1,10 @@
     CLASS net/minecraft/unmapped/C_wohefauc net/minecraft/datafixer/fix/UpdateSignBlockEntityNbtFix
+    	FIELD f_jhypaqpp FILTERED_CORRECT Ljava/lang/String;
+    	FIELD f_jtmmrdrg DEFAULT_COLOR Ljava/lang/String;
     	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;)V
     		ARG 2 name
     		ARG 3 blockEntity
     	METHOD m_gvtcdrcb updateSignNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+    		ARG 0 signData
+    	METHOD m_iwkbfoid fixBackText (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
+    	METHOD m_qwusixbw fixFrontText (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;

-Original file line number
+Diff line change
@@ Expand Up @@
     	METHOD m_fpjfoqgn levelToXp (I)I
     		ARG 0 level
     	METHOD m_rreutene fixXp (Lcom/mojang/datafixers/Typed;I)Lcom/mojang/datafixers/Typed;
+    		ARG 0 typed
+    		ARG 1 level
     	METHOD m_uxqcqjwi fixLevel (Lcom/mojang/datafixers/Typed;I)Lcom/mojang/datafixers/Typed;
+    		ARG 0 typed
+    		ARG 1 level

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_cftojwmy UNPACK_OBJECTIVE_ID Lcom/mojang/datafixers/types/templates/Hook$HookFunction;
     	FIELD f_gmxrczdk REPACK_OBJECTIVE_ID Lcom/mojang/datafixers/types/templates/Hook$HookFunction;
     	FIELD f_lgzrvedn SPECIAL_OBJECTIVE_MARKER Ljava/lang/String;
+    	METHOD m_hkflhbit toDottedNamespace (Ljava/lang/String;)Ljava/lang/String;
     	METHOD m_tbsprxso createCriterionTypes (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map;
     	METHOD registerTypes registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V
     		ARG 2 entityTypes
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,6 +1,10 @@
     CLASS net/minecraft/unmapped/C_zvehxbog net/minecraft/datafixer/schema/Schema1460
     	METHOD m_cuuavtyw registerMob (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
+    		ARG 1 map
+    		ARG 2 entityId
     	METHOD m_qnbddmdd registerInventory (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V
+    		ARG 1 map
+    		ARG 2 name
     	METHOD registerBlockEntities registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map;
     	METHOD registerEntities registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map;
     	METHOD registerTypes registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V
@@ Expand Down @@

Commit

There are no files selected for viewing

3 comments on commit f2fcee1

github-actions bot commented on f2fcee1 Apr 2, 2024

Choose a reason for hiding this comment

github-actions bot commented on f2fcee1 Apr 2, 2024

Choose a reason for hiding this comment

github-actions bot commented on f2fcee1 Apr 2, 2024

Choose a reason for hiding this comment

3 comments on commit `f2fcee1`

github-actions bot commented on `f2fcee1` Apr 2, 2024

github-actions bot commented on `f2fcee1` Apr 2, 2024

github-actions bot commented on `f2fcee1` Apr 2, 2024