finish up · ix0rai/quilt-mappings@50aab4a

github-actions · 2023-12-31T04:03:02Z

With commit 50aab4a, 151 file(s) were updated with 1161 line(s) added and 1079 removed compared to the latest Quilt Mappings version.

View the diff here (1/3):

diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementCriterion.java namedSrc/net/minecraft/advancement/AdvancementCriterion.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementCriterion.java	2023-12-31 04:03:00.236433656 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementCriterion.java	2023-12-31 04:01:57.384690032 +0000
@@ -13,21 +13,23 @@
  */
 public record AdvancementCriterion<T extends CriterionConditions>(CriterionTrigger<T> trigger, T conditions) {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yezbocli Lnet/minecraft/unmapped/C_rzypsigz;f_yezbocli:Lcom/mojang/serialization/MapCodec;}
+    * @mapping {@literal named MAP_CODEC Lnet/minecraft/advancement/AdvancementCriterion;MAP_CODEC:Lcom/mojang/serialization/MapCodec;}
     */
-   private static final MapCodec<AdvancementCriterion<?>> f_yezbocli = Codecs.m_dgtnqbdd(
-      "trigger", "conditions", Criteria.CODEC, AdvancementCriterion::trigger, AdvancementCriterion::m_uxddutmc
+   private static final MapCodec<AdvancementCriterion<?>> MAP_CODEC = Codecs.withOptionalParameters(
+      "trigger", "conditions", Criteria.CODEC, AdvancementCriterion::trigger, AdvancementCriterion::getCodec
    );
    /**
     * @mapping {@literal hashed f_bijaoybp Lnet/minecraft/unmapped/C_rzypsigz;f_bijaoybp:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/advancement/AdvancementCriterion;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<AdvancementCriterion<?>> CODEC = f_yezbocli.codec();
+   public static final Codec<AdvancementCriterion<?>> CODEC = MAP_CODEC.codec();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_uxddutmc Lnet/minecraft/unmapped/C_rzypsigz;m_uxddutmc(Lnet/minecraft/unmapped/C_mysyaxfs;)Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named getCodec Lnet/minecraft/advancement/AdvancementCriterion;getCodec(Lnet/minecraft/advancement/criterion/CriterionTrigger;)Lcom/mojang/serialization/Codec;}
     */
-   private static <T extends CriterionConditions> Codec<AdvancementCriterion<T>> m_uxddutmc(CriterionTrigger<T> arg) {
-      return arg.m_xrbtiope().xmap(arg2 -> new AdvancementCriterion<>(arg, (T)arg2), AdvancementCriterion::conditions);
+   private static <T extends CriterionConditions> Codec<AdvancementCriterion<T>> getCodec(CriterionTrigger<T> trigger) {
+      return trigger.getCodec().xmap(conditions -> new AdvancementCriterion<>(trigger, (T)conditions), AdvancementCriterion::conditions);
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementDisplay.java namedSrc/net/minecraft/advancement/AdvancementDisplay.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementDisplay.java	2023-12-31 04:03:00.220433722 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementDisplay.java	2023-12-31 04:01:57.360690130 +0000
@@ -6,8 +6,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.text.Text;
-import net.minecraft.text.component.AdvancementComponent;
-import net.minecraft.unmapped.C_qrzzgymy;
+import net.minecraft.text.TextCodecs;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.dynamic.Codecs;
 
@@ -23,13 +22,13 @@
    public static final Codec<AdvancementDisplay> CODEC = RecordCodecBuilder.create(
       instance -> instance.group(
                ItemStack.f_swhvebgo.fieldOf("icon").forGetter(AdvancementDisplay::getIcon),
-               C_qrzzgymy.f_flkmksis.fieldOf("title").forGetter(AdvancementDisplay::getTitle),
-               C_qrzzgymy.f_flkmksis.fieldOf("description").forGetter(AdvancementDisplay::getDescription),
-               Codecs.m_cjqijzpr(Identifier.CODEC, "background").forGetter(AdvancementDisplay::getBackground),
-               Codecs.m_aeryaqrd(AdvancementComponent.CODEC, "frame", AdvancementComponent.TASK).forGetter(AdvancementDisplay::m_spcgkfjs),
-               Codecs.m_aeryaqrd(Codec.BOOL, "show_toast", true).forGetter(AdvancementDisplay::shouldShowToast),
-               Codecs.m_aeryaqrd(Codec.BOOL, "announce_to_chat", true).forGetter(AdvancementDisplay::shouldAnnounceToChat),
-               Codecs.m_aeryaqrd(Codec.BOOL, "hidden", false).forGetter(AdvancementDisplay::isHidden)
+               TextCodecs.f_flkmksis.fieldOf("title").forGetter(AdvancementDisplay::getTitle),
+               TextCodecs.f_flkmksis.fieldOf("description").forGetter(AdvancementDisplay::getDescription),
+               Codecs.createStrictOptionalField(Identifier.CODEC, "background").forGetter(AdvancementDisplay::getBackground),
+               Codecs.createStrictOptionalField(AdvancementType.CODEC, "frame", AdvancementType.TASK).forGetter(AdvancementDisplay::getType),
+               Codecs.createStrictOptionalField(Codec.BOOL, "show_toast", true).forGetter(AdvancementDisplay::shouldShowToast),
+               Codecs.createStrictOptionalField(Codec.BOOL, "announce_to_chat", true).forGetter(AdvancementDisplay::shouldAnnounceToChat),
+               Codecs.createStrictOptionalField(Codec.BOOL, "hidden", false).forGetter(AdvancementDisplay::isHidden)
             )
             .apply(instance, AdvancementDisplay::new)
    );
@@ -54,9 +53,10 @@
     */
    private final Optional<Identifier> background;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_qnsndlza Lnet/minecraft/unmapped/C_bvqakncm;f_qnsndlza:Lnet/minecraft/unmapped/C_onnxqlfg;}
+    * @mapping {@literal named type Lnet/minecraft/advancement/AdvancementDisplay;type:Lnet/minecraft/advancement/AdvancementType;}
     */
-   private final AdvancementComponent f_qnsndlza;
+   private final AdvancementType type;
    /**
     * @mapping {@literal hashed f_mbfqtzfa Lnet/minecraft/unmapped/C_bvqakncm;f_mbfqtzfa:Z}
     * @mapping {@literal named showToast Lnet/minecraft/advancement/AdvancementDisplay;showToast:Z}
@@ -85,14 +85,14 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_bvqakncm;<init>(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/util/Optional;Lnet/minecraft/unmapped/C_onnxqlfg;ZZZ)V}
-    * @mapping {@literal named <init> Lnet/minecraft/advancement/AdvancementDisplay;<init>(Lnet/minecraft/item/ItemStack;Lnet/minecraft/text/Text;Lnet/minecraft/text/Text;Ljava/util/Optional;Lnet/minecraft/text/component/AdvancementComponent;ZZZ)V}
+    * @mapping {@literal named <init> Lnet/minecraft/advancement/AdvancementDisplay;<init>(Lnet/minecraft/item/ItemStack;Lnet/minecraft/text/Text;Lnet/minecraft/text/Text;Ljava/util/Optional;Lnet/minecraft/advancement/AdvancementType;ZZZ)V}
     */
    public AdvancementDisplay(
       ItemStack stack,
       Text title,
       Text description,
       Optional<Identifier> background,
-      AdvancementComponent arg4,
+      AdvancementType type,
       boolean showToast,
       boolean announceToChat,
       boolean hidden
@@ -101,7 +101,7 @@
       this.description = description;
       this.icon = stack;
       this.background = background;
-      this.f_qnsndlza = arg4;
+      this.type = type;
       this.showToast = showToast;
       this.announceToChat = announceToChat;
       this.hidden = hidden;
@@ -149,10 +149,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_spcgkfjs Lnet/minecraft/unmapped/C_bvqakncm;m_spcgkfjs()Lnet/minecraft/unmapped/C_onnxqlfg;}
+    * @mapping {@literal named getType Lnet/minecraft/advancement/AdvancementDisplay;getType()Lnet/minecraft/advancement/AdvancementType;}
     */
-   public AdvancementComponent m_spcgkfjs() {
-      return this.f_qnsndlza;
+   public AdvancementType getType() {
+      return this.type;
    }
 
    /**
@@ -203,7 +204,7 @@
       buf.writeText(this.title);
       buf.writeText(this.description);
       buf.writeItemStack(this.icon);
-      buf.writeEnumConstant(this.f_qnsndlza);
+      buf.writeEnumConstant(this.type);
       int i = 0;
       if (this.background.isPresent()) {
          i |= 1;
@@ -231,7 +232,7 @@
       Text lv = buf.m_aeyjpepw();
       Text lv2 = buf.m_aeyjpepw();
       ItemStack lv3 = buf.readItemStack();
-      AdvancementComponent lv4 = buf.readEnumConstant(AdvancementComponent.class);
+      AdvancementType lv4 = buf.readEnumConstant(AdvancementType.class);
       int i = buf.readInt();
       Optional<Identifier> optional = (i & 1) != 0 ? Optional.of(buf.readIdentifier()) : Optional.empty();
       boolean bl = (i & 2) != 0;
diff -bur namedTargetSrc/net/minecraft/advancement/Advancement.java namedSrc/net/minecraft/advancement/Advancement.java
--- namedTargetSrc/net/minecraft/advancement/Advancement.java	2023-12-31 04:03:00.272433509 +0000
+++ namedSrc/net/minecraft/advancement/Advancement.java	2023-12-31 04:01:57.436689819 +0000
@@ -7,6 +7,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Consumer;
+import net.minecraft.advancement.criterion.CriterionValidator;
 import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.ItemStack;
 import net.minecraft.loot.LootDataLookup;
@@ -15,9 +16,7 @@
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.text.Texts;
-import net.minecraft.text.component.AdvancementComponent;
-import net.minecraft.unmapped.C_jtpvewkp;
-import net.minecraft.unmapped.C_zybjffid;
+import net.minecraft.util.ErrorReporter;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.dynamic.Codecs;
@@ -37,31 +36,34 @@
    Optional<Text> name
 ) {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bpbcihch Lnet/minecraft/unmapped/C_kdwyuhdb;f_bpbcihch:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named CRITERIA_CODEC Lnet/minecraft/advancement/Advancement;CRITERIA_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   private static final Codec<Map<String, AdvancementCriterion<?>>> f_bpbcihch = Codecs.validate(
+   private static final Codec<Map<String, AdvancementCriterion<?>>> CRITERIA_CODEC = Codecs.validate(
       Codec.unboundedMap(Codec.STRING, AdvancementCriterion.CODEC),
       map -> map.isEmpty() ? DataResult.error(() -> "Advancement criteria cannot be empty") : DataResult.success(map)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ncipkedb Lnet/minecraft/unmapped/C_kdwyuhdb;f_ncipkedb:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/advancement/Advancement;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<Advancement> f_ncipkedb = Codecs.validate(
+   public static final Codec<Advancement> CODEC = Codecs.validate(
       RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(Identifier.CODEC, "parent").forGetter(Advancement::parent),
-                  Codecs.m_cjqijzpr(AdvancementDisplay.CODEC, "display").forGetter(Advancement::display),
-                  Codecs.m_aeryaqrd(AdvancementRewards.CODEC, "rewards", AdvancementRewards.NONE).forGetter(Advancement::rewards),
-                  f_bpbcihch.fieldOf("criteria").forGetter(Advancement::criteria),
-                  Codecs.m_cjqijzpr(AdvancementRequirements.CODEC, "requirements").forGetter(arg -> Optional.of(arg.requirements())),
-                  Codecs.m_aeryaqrd(Codec.BOOL, "sends_telemetry_event", false).forGetter(Advancement::sendsTelemetryEvent)
+                  Codecs.createStrictOptionalField(Identifier.CODEC, "parent").forGetter(Advancement::parent),
+                  Codecs.createStrictOptionalField(AdvancementDisplay.CODEC, "display").forGetter(Advancement::display),
+                  Codecs.createStrictOptionalField(AdvancementRewards.CODEC, "rewards", AdvancementRewards.NONE).forGetter(Advancement::rewards),
+                  CRITERIA_CODEC.fieldOf("criteria").forGetter(Advancement::criteria),
+                  Codecs.createStrictOptionalField(AdvancementRequirements.CODEC, "requirements")
+                     .forGetter(advancement -> Optional.of(advancement.requirements())),
+                  Codecs.createStrictOptionalField(Codec.BOOL, "sends_telemetry_event", false).forGetter(Advancement::sendsTelemetryEvent)
                )
-               .apply(instance, (optional, optional2, arg, map, optional3, arg2) -> {
-                  AdvancementRequirements lv = (AdvancementRequirements)optional3.orElseGet(() -> AdvancementRequirements.allOf(map.keySet()));
-                  return new Advancement(optional, optional2, arg, map, lv, arg2);
+               .apply(instance, (id, display, rewards, criteria, requirements, sendsTelemetryEvent) -> {
+                  AdvancementRequirements lv = (AdvancementRequirements)requirements.orElseGet(() -> AdvancementRequirements.allOf(criteria.keySet()));
+                  return new Advancement(id, display, rewards, criteria, lv, sendsTelemetryEvent);
                })
       ),
-      Advancement::m_pzwagfwo
+      Advancement::validate
    );
 
    /**
@@ -80,10 +82,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pzwagfwo Lnet/minecraft/unmapped/C_kdwyuhdb;m_pzwagfwo(Lnet/minecraft/unmapped/C_kdwyuhdb;)Lcom/mojang/serialization/DataResult;}
+    * @mapping {@literal named validate Lnet/minecraft/advancement/Advancement;validate(Lnet/minecraft/advancement/Advancement;)Lcom/mojang/serialization/DataResult;}
     */
-   private static DataResult<Advancement> m_pzwagfwo(Advancement arg) {
-      return arg.requirements().m_bnmpyfyz(arg.criteria().keySet()).map(arg2 -> arg);
+   private static DataResult<Advancement> validate(Advancement advancement) {
+      return advancement.requirements().validate(advancement.criteria().keySet()).map(criterionKey -> advancement);
    }
 
    /**
@@ -92,9 +95,9 @@
     */
    private static Text createText(AdvancementDisplay display) {
       Text lv = display.getTitle();
-      Formatting lv2 = display.m_spcgkfjs().getFormatting();
+      Formatting lv2 = display.getType().getFormatting();
       Text lv3 = Texts.setStyleIfAbsent(lv.copy(), Style.EMPTY.withColor(lv2)).append("\n").append(display.getDescription());
-      Text lv4 = lv.copy().styled(arg2 -> arg2.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, lv3)));
+      Text lv4 = lv.copy().styled(style -> style.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, lv3)));
       return Texts.bracketed(lv4).formatted(lv2);
    }
 
@@ -112,7 +115,7 @@
     */
    public void toPacket(PacketByteBuf buf) {
       buf.writeOptional(this.parent, PacketByteBuf::writeIdentifier);
-      buf.writeOptional(this.display, (bufx, arg2) -> arg2.toPacket(bufx));
+      buf.writeOptional(this.display, (bufx, display) -> display.toPacket(bufx));
       this.requirements.toPacket(buf);
       buf.writeBoolean(this.sendsTelemetryEvent);
    }
@@ -141,12 +144,13 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jvmczssc Lnet/minecraft/unmapped/C_kdwyuhdb;m_jvmczssc(Lnet/minecraft/unmapped/C_jtpvewkp;Lnet/minecraft/unmapped/C_srnkfpki;)V}
+    * @mapping {@literal named validateCriteria Lnet/minecraft/advancement/Advancement;validateCriteria(Lnet/minecraft/util/ErrorReporter;Lnet/minecraft/loot/LootDataLookup;)V}
     */
-   public void m_jvmczssc(C_jtpvewkp arg, LootDataLookup arg2) {
-      this.criteria.forEach((string, arg3) -> {
-         C_zybjffid lv = new C_zybjffid(arg.m_nnxeyyzv(string), arg2);
-         arg3.conditions().m_mmotanow(lv);
+   public void validateCriteria(ErrorReporter reporter, LootDataLookup dataLookup) {
+      this.criteria.forEach((key, criterion) -> {
+         CriterionValidator lv = new CriterionValidator(reporter.forChild(key), dataLookup);
+         criterion.conditions().validate(lv);
       });
    }
 
@@ -230,21 +234,38 @@
 
       /**
        * @mapping {@literal hashed m_htowdhjv Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;m_htowdhjv(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_onnxqlfg;ZZZ)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;}
-       * @mapping {@literal named m_htowdhjv Lnet/minecraft/advancement/Advancement$Builder;m_htowdhjv(Lnet/minecraft/item/ItemStack;Lnet/minecraft/text/Text;Lnet/minecraft/text/Text;Lnet/minecraft/util/Identifier;Lnet/minecraft/text/component/AdvancementComponent;ZZZ)Lnet/minecraft/advancement/Advancement$Builder;}
+       * @mapping {@literal named display Lnet/minecraft/advancement/Advancement$Builder;display(Lnet/minecraft/item/ItemStack;Lnet/minecraft/text/Text;Lnet/minecraft/text/Text;Lnet/minecraft/util/Identifier;Lnet/minecraft/advancement/AdvancementType;ZZZ)Lnet/minecraft/advancement/Advancement$Builder;}
        */
-      public Advancement.Builder m_htowdhjv(
-         ItemStack stack, Text arg2, Text arg3, @Nullable Identifier arg4, AdvancementComponent arg5, boolean bl, boolean bl2, boolean bl3
+      public Advancement.Builder display(
+         ItemStack stack,
+         Text title,
+         Text description,
+         @Nullable Identifier background,
+         AdvancementType type,
+         boolean showToast,
+         boolean announceToChat,
+         boolean hidden
       ) {
-         return this.display(new AdvancementDisplay(stack, arg2, arg3, Optional.ofNullable(arg4), arg5, bl, bl2, bl3));
+         return this.display(new AdvancementDisplay(stack, title, description, Optional.ofNullable(background), type, showToast, announceToChat, hidden));
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_mopntkkx Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;m_mopntkkx(Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_onnxqlfg;ZZZ)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;}
+       * @mapping {@literal named display Lnet/minecraft/advancement/Advancement$Builder;display(Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/text/Text;Lnet/minecraft/text/Text;Lnet/minecraft/util/Identifier;Lnet/minecraft/advancement/AdvancementType;ZZZ)Lnet/minecraft/advancement/Advancement$Builder;}
        */
-      public Advancement.Builder m_mopntkkx(
-         ItemConvertible arg, Text arg2, Text arg3, @Nullable Identifier arg4, AdvancementComponent arg5, boolean bl, boolean bl2, boolean bl3
+      public Advancement.Builder display(
+         ItemConvertible item,
+         Text title,
+         Text description,
+         @Nullable Identifier background,
+         AdvancementType type,
+         boolean showToast,
+         boolean announceToChat,
+         boolean hidden
       ) {
-         return this.display(new AdvancementDisplay(new ItemStack(arg.asItem()), arg2, arg3, Optional.ofNullable(arg4), arg5, bl, bl2, bl3));
+         return this.display(
+            new AdvancementDisplay(new ItemStack(item.asItem()), title, description, Optional.ofNullable(background), type, showToast, announceToChat, hidden)
+         );
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementProgress.java namedSrc/net/minecraft/advancement/AdvancementProgress.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementProgress.java	2023-12-31 04:03:00.232433673 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementProgress.java	2023-12-31 04:01:57.380690048 +0000
@@ -36,7 +36,7 @@
     * @mapping {@literal hashed f_tfwtcnnx Lnet/minecraft/unmapped/C_rpzbknxp;f_tfwtcnnx:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named COMPLETED_TIME_CODEC Lnet/minecraft/advancement/AdvancementProgress;COMPLETED_TIME_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   private static final Codec<Instant> COMPLETED_TIME_CODEC = Codecs.m_ifdvuwzy(COMPLETED_TIME_FORMAT)
+   private static final Codec<Instant> COMPLETED_TIME_CODEC = Codecs.formattedTime(COMPLETED_TIME_FORMAT)
       .xmap(Instant::from, instant -> instant.atZone(ZoneId.systemDefault()));
    /**
     * @mapping {@literal hashed f_ojpamimu Lnet/minecraft/unmapped/C_rpzbknxp;f_ojpamimu:Lcom/mojang/serialization/Codec;}
@@ -56,7 +56,7 @@
     */
    public static final Codec<AdvancementProgress> CODEC = RecordCodecBuilder.create(
       instance -> instance.group(
-               Codecs.m_aeryaqrd(CRITERIA_CODEC, "criteria", Map.of()).forGetter(progress -> progress.criteriaProgresses),
+               Codecs.createStrictOptionalField(CRITERIA_CODEC, "criteria", Map.of()).forGetter(progress -> progress.criteriaProgresses),
                Codec.BOOL.fieldOf("done").orElse(true).forGetter(AdvancementProgress::isComplete)
             )
             .apply(instance, (map, arg) -> new AdvancementProgress(new HashMap(map)))
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementRequirements.java namedSrc/net/minecraft/advancement/AdvancementRequirements.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementRequirements.java	2023-12-31 04:03:00.312433346 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementRequirements.java	2023-12-31 04:01:57.484689623 +0000
@@ -42,7 +42,7 @@
     * @mapping {@literal named toPacket Lnet/minecraft/advancement/AdvancementRequirements;toPacket(Lnet/minecraft/network/PacketByteBuf;)V}
     */
    public void toPacket(PacketByteBuf buf) {
-      buf.writeCollection(this.requirements, (bufx, list) -> bufx.writeCollection(list, PacketByteBuf::writeString));
+      buf.writeCollection(this.requirements, (bufx, requirements) -> bufx.writeCollection(requirements, PacketByteBuf::writeString));
    }
 
    /**
@@ -109,8 +109,8 @@
     * @mapping {@literal hashed m_gzkxpsoh Lnet/minecraft/unmapped/C_wbfyxnvb;m_gzkxpsoh(Ljava/util/List;Ljava/util/function/Predicate;)Z}
     * @mapping {@literal named anyMatch Lnet/minecraft/advancement/AdvancementRequirements;anyMatch(Ljava/util/List;Ljava/util/function/Predicate;)Z}
     */
-   private static boolean anyMatch(List<String> list, Predicate<String> predicate) {
-      for (String string : list) {
+   private static boolean anyMatch(List<String> requirements, Predicate<String> predicate) {
+      for (String string : requirements) {
          if (predicate.test(string)) {
             return true;
          }
@@ -120,22 +120,23 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bnmpyfyz Lnet/minecraft/unmapped/C_wbfyxnvb;m_bnmpyfyz(Ljava/util/Set;)Lcom/mojang/serialization/DataResult;}
+    * @mapping {@literal named validate Lnet/minecraft/advancement/AdvancementRequirements;validate(Ljava/util/Set;)Lcom/mojang/serialization/DataResult;}
     */
-   public DataResult<AdvancementRequirements> m_bnmpyfyz(Set<String> set) {
+   public DataResult<AdvancementRequirements> validate(Set<String> requirements) {
       Set<String> set2 = new ObjectOpenHashSet<>();
 
       for (List<String> list : this.requirements) {
-         if (list.isEmpty() && set.isEmpty()) {
+         if (list.isEmpty() && requirements.isEmpty()) {
             return DataResult.error(() -> "Requirement entry cannot be empty");
          }
 
          set2.addAll(list);
       }
 
-      if (!set.equals(set2)) {
-         Set<String> set3 = Sets.<String>difference(set, set2);
-         Set<String> set4 = Sets.<String>difference(set2, set);
+      if (!requirements.equals(set2)) {
+         Set<String> set3 = Sets.<String>difference(requirements, set2);
+         Set<String> set4 = Sets.<String>difference(set2, requirements);
          return DataResult.error(() -> "Advancement completion requirements did not exactly match specified criteria. Missing: " + set3 + ". Unknown: " + set4);
       } else {
          return DataResult.success(this);
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java namedSrc/net/minecraft/advancement/AdvancementRewards.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementRewards.java	2023-12-31 04:03:00.376433085 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementRewards.java	2023-12-31 04:01:57.556689328 +0000
@@ -29,10 +29,10 @@
     */
    public static final Codec<AdvancementRewards> CODEC = RecordCodecBuilder.create(
       instance -> instance.group(
-               Codecs.m_aeryaqrd(Codec.INT, "experience", 0).forGetter(AdvancementRewards::experience),
-               Codecs.m_aeryaqrd(Identifier.CODEC.listOf(), "loot", List.of()).forGetter(AdvancementRewards::loot),
-               Codecs.m_aeryaqrd(Identifier.CODEC.listOf(), "recipes", List.of()).forGetter(AdvancementRewards::recipes),
-               Codecs.m_cjqijzpr(C_uxzryfxv.CODEC, "function").forGetter(AdvancementRewards::function)
+               Codecs.createStrictOptionalField(Codec.INT, "experience", 0).forGetter(AdvancementRewards::experience),
+               Codecs.createStrictOptionalField(Identifier.CODEC.listOf(), "loot", List.of()).forGetter(AdvancementRewards::loot),
+               Codecs.createStrictOptionalField(Identifier.CODEC.listOf(), "recipes", List.of()).forGetter(AdvancementRewards::recipes),
+               Codecs.createStrictOptionalField(C_uxzryfxv.CODEC, "function").forGetter(AdvancementRewards::function)
             )
             .apply(instance, AdvancementRewards::new)
    );
Only in namedSrc/net/minecraft/advancement: AdvancementType.java
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/AbstractCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/AbstractCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/AbstractCriterionTrigger.java	2023-12-31 04:03:00.248433607 +0000
+++ namedSrc/net/minecraft/advancement/criterion/AbstractCriterionTrigger.java	2023-12-31 04:01:57.400689966 +0000
@@ -13,7 +13,6 @@
 import net.minecraft.predicate.ContextAwarePredicate;
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_bmtrgtzi}
@@ -100,12 +99,13 @@
        * Mapping not found
        */
       @Override
-      default void m_mmotanow(C_zybjffid arg) {
-         arg.m_nhvyihxi(this.player(), ".player");
+      default void validate(CriterionValidator validator) {
+         validator.validateEntity(this.player(), ".player");
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_klqamsnl Lnet/minecraft/unmapped/C_bmtrgtzi$C_hjljikdm;m_klqamsnl()Ljava/util/Optional;}
+       * @mapping {@literal named player Lnet/minecraft/advancement/criterion/AbstractCriterionTrigger$Conditions;player()Ljava/util/Optional;}
        */
       Optional<ContextAwarePredicate> player();
    }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterionTrigger.java	2023-12-31 04:03:00.336433248 +0000
+++ namedSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterionTrigger.java	2023-12-31 04:01:57.516689491 +0000
@@ -25,7 +25,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<BeeNestDestroyedCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<BeeNestDestroyedCriterionTrigger.Conditions> getCodec() {
       return BeeNestDestroyedCriterionTrigger.Conditions.CODEC;
    }
 
@@ -34,7 +34,7 @@
     * @mapping {@literal named trigger Lnet/minecraft/advancement/criterion/BeeNestDestroyedCriterionTrigger;trigger(Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/block/BlockState;Lnet/minecraft/item/ItemStack;I)V}
     */
    public void trigger(ServerPlayerEntity player, BlockState state, ItemStack stack, int beeCount) {
-      this.trigger(player, arg3 -> arg3.matches(state, stack, beeCount));
+      this.trigger(player, conditions -> conditions.matches(state, stack, beeCount));
    }
 
    /**
@@ -50,10 +50,10 @@
        */
       public static final Codec<BeeNestDestroyedCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(BeeNestDestroyedCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(Registries.BLOCK.holderByNameCodec(), "block").forGetter(BeeNestDestroyedCriterionTrigger.Conditions::block),
-                  Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(BeeNestDestroyedCriterionTrigger.Conditions::item),
-                  Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "num_bees_inside", NumberRange.IntRange.ANY)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(BeeNestDestroyedCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(Registries.BLOCK.holderByNameCodec(), "block").forGetter(BeeNestDestroyedCriterionTrigger.Conditions::block),
+                  Codecs.createStrictOptionalField(ItemPredicate.f_jzkgbumt, "item").forGetter(BeeNestDestroyedCriterionTrigger.Conditions::item),
+                  Codecs.createStrictOptionalField(NumberRange.IntRange.CODEC, "num_bees_inside", NumberRange.IntRange.ANY)
                      .forGetter(BeeNestDestroyedCriterionTrigger.Conditions::beesInside)
                )
                .apply(instance, BeeNestDestroyedCriterionTrigger.Conditions::new)
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/BredAnimalsCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/BredAnimalsCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/BredAnimalsCriterionTrigger.java	2023-12-31 04:03:00.224433706 +0000
+++ namedSrc/net/minecraft/advancement/criterion/BredAnimalsCriterionTrigger.java	2023-12-31 04:01:57.368690097 +0000
@@ -10,7 +10,6 @@
 import net.minecraft.predicate.ContextAwarePredicate;
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 import org.jetbrains.annotations.Nullable;
 
@@ -23,7 +22,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<BredAnimalsCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<BredAnimalsCriterionTrigger.Conditions> getCodec() {
       return BredAnimalsCriterionTrigger.Conditions.CODEC;
    }
 
@@ -54,10 +53,10 @@
        */
       public static final Codec<BredAnimalsCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(BredAnimalsCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "parent").forGetter(BredAnimalsCriterionTrigger.Conditions::parent),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "partner").forGetter(BredAnimalsCriterionTrigger.Conditions::partner),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "child").forGetter(BredAnimalsCriterionTrigger.Conditions::child)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(BredAnimalsCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "parent").forGetter(BredAnimalsCriterionTrigger.Conditions::parent),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "partner").forGetter(BredAnimalsCriterionTrigger.Conditions::partner),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "child").forGetter(BredAnimalsCriterionTrigger.Conditions::child)
                )
                .apply(instance, BredAnimalsCriterionTrigger.Conditions::new)
       );
@@ -124,11 +123,11 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         arg.m_nhvyihxi(this.parent, ".parent");
-         arg.m_nhvyihxi(this.partner, ".partner");
-         arg.m_nhvyihxi(this.child, ".child");
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         validator.validateEntity(this.parent, ".parent");
+         validator.validateEntity(this.partner, ".partner");
+         validator.validateEntity(this.child, ".child");
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/BrewedPotionCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/BrewedPotionCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/BrewedPotionCriterionTrigger.java	2023-12-31 04:03:00.256433575 +0000
+++ namedSrc/net/minecraft/advancement/criterion/BrewedPotionCriterionTrigger.java	2023-12-31 04:01:57.416689901 +0000
@@ -21,7 +21,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<BrewedPotionCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<BrewedPotionCriterionTrigger.Conditions> getCodec() {
       return BrewedPotionCriterionTrigger.Conditions.CODEC;
    }
 
@@ -29,8 +29,8 @@
     * @mapping {@literal hashed m_jlnjsigz Lnet/minecraft/unmapped/C_opfhzgki;m_jlnjsigz(Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_cjzoxshv;)V}
     * @mapping {@literal named trigger Lnet/minecraft/advancement/criterion/BrewedPotionCriterionTrigger;trigger(Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/registry/Holder;)V}
     */
-   public void trigger(ServerPlayerEntity player, Holder<Potion> arg2) {
-      this.trigger(player, arg2x -> arg2x.matches(arg2));
+   public void trigger(ServerPlayerEntity player, Holder<Potion> potion) {
+      this.trigger(player, arg2 -> arg2.matches(potion));
    }
 
    /**
@@ -44,8 +44,8 @@
        */
       public static final Codec<BrewedPotionCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(BrewedPotionCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(Registries.POTION.holderByNameCodec(), "potion").forGetter(BrewedPotionCriterionTrigger.Conditions::potion)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(BrewedPotionCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(Registries.POTION.holderByNameCodec(), "potion").forGetter(BrewedPotionCriterionTrigger.Conditions::potion)
                )
                .apply(instance, BrewedPotionCriterionTrigger.Conditions::new)
       );
@@ -62,8 +62,8 @@
        * @mapping {@literal hashed m_smuruvko Lnet/minecraft/unmapped/C_opfhzgki$C_nhlhuijz;m_smuruvko(Lnet/minecraft/unmapped/C_cjzoxshv;)Z}
        * @mapping {@literal named matches Lnet/minecraft/advancement/criterion/BrewedPotionCriterionTrigger$Conditions;matches(Lnet/minecraft/registry/Holder;)Z}
        */
-      public boolean matches(Holder<Potion> arg) {
-         return !this.potion.isPresent() || ((Holder)this.potion.get()).equals(arg);
+      public boolean matches(Holder<Potion> potion) {
+         return !this.potion.isPresent() || ((Holder)this.potion.get()).equals(potion);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java	2023-12-31 04:03:00.252433592 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java	2023-12-31 04:01:57.404689951 +0000
@@ -21,7 +21,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<ChangedDimensionCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<ChangedDimensionCriterionTrigger.Conditions> getCodec() {
       return ChangedDimensionCriterionTrigger.Conditions.CODEC;
    }
 
@@ -45,9 +45,9 @@
        */
       public static final Codec<ChangedDimensionCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ChangedDimensionCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(RegistryKey.codec(RegistryKeys.WORLD), "from").forGetter(ChangedDimensionCriterionTrigger.Conditions::from),
-                  Codecs.m_cjqijzpr(RegistryKey.codec(RegistryKeys.WORLD), "to").forGetter(ChangedDimensionCriterionTrigger.Conditions::to)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(ChangedDimensionCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(RegistryKey.codec(RegistryKeys.WORLD), "from").forGetter(ChangedDimensionCriterionTrigger.Conditions::from),
+                  Codecs.createStrictOptionalField(RegistryKey.codec(RegistryKeys.WORLD), "to").forGetter(ChangedDimensionCriterionTrigger.Conditions::to)
                )
                .apply(instance, ChangedDimensionCriterionTrigger.Conditions::new)
       );
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterionTrigger.java	2023-12-31 04:03:00.304433380 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterionTrigger.java	2023-12-31 04:01:57.476689655 +0000
@@ -12,7 +12,6 @@
 import net.minecraft.predicate.ContextAwarePredicate;
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 
 /**
@@ -24,7 +23,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<ChanneledLightningCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<ChanneledLightningCriterionTrigger.Conditions> getCodec() {
       return ChanneledLightningCriterionTrigger.Conditions.CODEC;
    }
 
@@ -50,8 +49,9 @@
        */
       public static final Codec<ChanneledLightningCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ChanneledLightningCriterionTrigger.Conditions::player),
-                  Codecs.m_aeryaqrd(EntityPredicate.f_uvagahsk.listOf(), "victims", List.of())
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player")
+                     .forGetter(ChanneledLightningCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC.listOf(), "victims", List.of())
                      .forGetter(ChanneledLightningCriterionTrigger.Conditions::victims)
                )
                .apply(instance, ChanneledLightningCriterionTrigger.Conditions::new)
@@ -93,9 +93,9 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         arg.m_svooszyh(this.victims, ".victims");
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         validator.validateEntities(this.victims, ".victims");
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterionTrigger.java	2023-12-31 04:03:00.216433738 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterionTrigger.java	2023-12-31 04:01:57.360690130 +0000
@@ -19,7 +19,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<ConstructBeaconCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<ConstructBeaconCriterionTrigger.Conditions> getCodec() {
       return ConstructBeaconCriterionTrigger.Conditions.CODEC;
    }
 
@@ -42,8 +42,9 @@
        */
       public static final Codec<ConstructBeaconCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ConstructBeaconCriterionTrigger.Conditions::player),
-                  Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "level", NumberRange.IntRange.ANY).forGetter(ConstructBeaconCriterionTrigger.Conditions::level)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(ConstructBeaconCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(NumberRange.IntRange.CODEC, "level", NumberRange.IntRange.ANY)
+                     .forGetter(ConstructBeaconCriterionTrigger.Conditions::level)
                )
                .apply(instance, ConstructBeaconCriterionTrigger.Conditions::new)
       );
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ConsumeItemCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ConsumeItemCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ConsumeItemCriterionTrigger.java	2023-12-31 04:03:00.332433264 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ConsumeItemCriterionTrigger.java	2023-12-31 04:01:57.508689524 +0000
@@ -21,7 +21,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<ConsumeItemCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<ConsumeItemCriterionTrigger.Conditions> getCodec() {
       return ConsumeItemCriterionTrigger.Conditions.CODEC;
    }
 
@@ -44,8 +44,8 @@
        */
       public static final Codec<ConsumeItemCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ConsumeItemCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(ConsumeItemCriterionTrigger.Conditions::item)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(ConsumeItemCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(ItemPredicate.f_jzkgbumt, "item").forGetter(ConsumeItemCriterionTrigger.Conditions::item)
                )
                .apply(instance, ConsumeItemCriterionTrigger.Conditions::new)
       );
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/Criteria.java namedSrc/net/minecraft/advancement/criterion/Criteria.java
--- namedTargetSrc/net/minecraft/advancement/criterion/Criteria.java	2023-12-31 04:03:00.236433656 +0000
+++ namedSrc/net/minecraft/advancement/criterion/Criteria.java	2023-12-31 04:01:57.388690015 +0000
@@ -297,9 +297,9 @@
 
    /**
     * @mapping {@literal hashed m_jgbggipj Lnet/minecraft/unmapped/C_hmkjzbjo;m_jgbggipj(Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_mysyaxfs;}
-    * @mapping {@literal named m_jgbggipj Lnet/minecraft/advancement/criterion/Criteria;m_jgbggipj(Lnet/minecraft/registry/Registry;)Lnet/minecraft/advancement/criterion/CriterionTrigger;}
+    * @mapping {@literal named impossible Lnet/minecraft/advancement/criterion/Criteria;impossible(Lnet/minecraft/registry/Registry;)Lnet/minecraft/advancement/criterion/CriterionTrigger;}
     */
-   public static CriterionTrigger<?> m_jgbggipj(Registry<CriterionTrigger<?>> registry) {
+   public static CriterionTrigger<?> impossible(Registry<CriterionTrigger<?>> registry) {
       return IMPOSSIBLE;
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/CriterionConditions.java namedSrc/net/minecraft/advancement/criterion/CriterionConditions.java
--- namedTargetSrc/net/minecraft/advancement/criterion/CriterionConditions.java	2023-12-31 04:03:00.408432955 +0000
+++ namedSrc/net/minecraft/advancement/criterion/CriterionConditions.java	2023-12-31 04:01:57.588689197 +0000
@@ -1,14 +1,13 @@
 package net.minecraft.advancement.criterion;
 
-import net.minecraft.unmapped.C_zybjffid;
-
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_zkhebbek}
  * @mapping {@literal named net/minecraft/advancement/criterion/CriterionConditions}
  */
 public interface CriterionConditions {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mmotanow Lnet/minecraft/unmapped/C_zkhebbek;m_mmotanow(Lnet/minecraft/unmapped/C_zybjffid;)V}
+    * @mapping {@literal named validate Lnet/minecraft/advancement/criterion/CriterionConditions;validate(Lnet/minecraft/advancement/criterion/CriterionValidator;)V}
     */
-   void m_mmotanow(C_zybjffid arg);
+   void validate(CriterionValidator validator);
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/CriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/CriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/CriterionTrigger.java	2023-12-31 04:03:00.304433380 +0000
+++ namedSrc/net/minecraft/advancement/criterion/CriterionTrigger.java	2023-12-31 04:01:57.476689655 +0000
@@ -29,9 +29,10 @@
    void endTracking(PlayerAdvancementTracker tracker);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xrbtiope Lnet/minecraft/unmapped/C_mysyaxfs;m_xrbtiope()Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named getCodec Lnet/minecraft/advancement/criterion/CriterionTrigger;getCodec()Lcom/mojang/serialization/Codec;}
     */
-   Codec<T> m_xrbtiope();
+   Codec<T> getCodec();
 
    /**
     * @mapping {@literal hashed m_eenzxdpn Lnet/minecraft/unmapped/C_mysyaxfs;m_eenzxdpn(Lnet/minecraft/unmapped/C_zkhebbek;)Lnet/minecraft/unmapped/C_rzypsigz;}
Only in namedSrc/net/minecraft/advancement/criterion: CriterionValidator.java
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterionTrigger.java	2023-12-31 04:03:00.320433313 +0000
+++ namedSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterionTrigger.java	2023-12-31 04:01:57.492689590 +0000
@@ -10,7 +10,6 @@
 import net.minecraft.predicate.ContextAwarePredicate;
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 
 /**
@@ -22,7 +21,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<CuredZombieVillagerCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<CuredZombieVillagerCriterionTrigger.Conditions> getCodec() {
       return CuredZombieVillagerCriterionTrigger.Conditions.CODEC;
    }
 
@@ -49,9 +48,12 @@
        */
       public static final Codec<CuredZombieVillagerCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(CuredZombieVillagerCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "zombie").forGetter(CuredZombieVillagerCriterionTrigger.Conditions::zombie),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "villager").forGetter(CuredZombieVillagerCriterionTrigger.Conditions::villager)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player")
+                     .forGetter(CuredZombieVillagerCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "zombie")
+                     .forGetter(CuredZombieVillagerCriterionTrigger.Conditions::zombie),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "villager")
+                     .forGetter(CuredZombieVillagerCriterionTrigger.Conditions::villager)
                )
                .apply(instance, CuredZombieVillagerCriterionTrigger.Conditions::new)
       );
@@ -80,10 +82,10 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         arg.m_nhvyihxi(this.zombiePredicate, ".zombie");
-         arg.m_nhvyihxi(this.villagerPredicate, ".villager");
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         validator.validateEntity(this.zombiePredicate, ".zombie");
+         validator.validateEntity(this.villagerPredicate, ".villager");
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EffectsChangedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/EffectsChangedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EffectsChangedCriterionTrigger.java	2023-12-31 04:03:00.356433167 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EffectsChangedCriterionTrigger.java	2023-12-31 04:01:57.536689410 +0000
@@ -11,7 +11,6 @@
 import net.minecraft.predicate.entity.EntityEffectPredicate;
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 import org.jetbrains.annotations.Nullable;
 
@@ -24,7 +23,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<EffectsChangedCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<EffectsChangedCriterionTrigger.Conditions> getCodec() {
       return EffectsChangedCriterionTrigger.Conditions.CODEC;
    }
 
@@ -49,9 +48,9 @@
        */
       public static final Codec<EffectsChangedCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(EffectsChangedCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(EntityEffectPredicate.CODEC, "effects").forGetter(EffectsChangedCriterionTrigger.Conditions::effects),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "source").forGetter(EffectsChangedCriterionTrigger.Conditions::source)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(EffectsChangedCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(EntityEffectPredicate.CODEC, "effects").forGetter(EffectsChangedCriterionTrigger.Conditions::effects),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "source").forGetter(EffectsChangedCriterionTrigger.Conditions::source)
                )
                .apply(instance, EffectsChangedCriterionTrigger.Conditions::new)
       );
@@ -89,9 +88,9 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         arg.m_nhvyihxi(this.source, ".source");
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         validator.validateEntity(this.source, ".source");
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EnchantedItemCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/EnchantedItemCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EnchantedItemCriterionTrigger.java	2023-12-31 04:03:00.276433494 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EnchantedItemCriterionTrigger.java	2023-12-31 04:01:57.440689803 +0000
@@ -21,7 +21,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<EnchantedItemCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<EnchantedItemCriterionTrigger.Conditions> getCodec() {
       return EnchantedItemCriterionTrigger.Conditions.CODEC;
    }
 
@@ -45,9 +45,10 @@
        */
       public static final Codec<EnchantedItemCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(EnchantedItemCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(EnchantedItemCriterionTrigger.Conditions::item),
-                  Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "levels", NumberRange.IntRange.ANY).forGetter(EnchantedItemCriterionTrigger.Conditions::levels)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(EnchantedItemCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(ItemPredicate.f_jzkgbumt, "item").forGetter(EnchantedItemCriterionTrigger.Conditions::item),
+                  Codecs.createStrictOptionalField(NumberRange.IntRange.CODEC, "levels", NumberRange.IntRange.ANY)
+                     .forGetter(EnchantedItemCriterionTrigger.Conditions::levels)
                )
                .apply(instance, EnchantedItemCriterionTrigger.Conditions::new)
       );
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java	2023-12-31 04:03:00.304433380 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java	2023-12-31 04:01:57.476689655 +0000
@@ -24,7 +24,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<EnterBlockCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<EnterBlockCriterionTrigger.Conditions> getCodec() {
       return EnterBlockCriterionTrigger.Conditions.CODEC;
    }
 
@@ -33,7 +33,7 @@
     * @mapping {@literal named trigger Lnet/minecraft/advancement/criterion/EnterBlockCriterionTrigger;trigger(Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/block/BlockState;)V}
     */
    public void trigger(ServerPlayerEntity player, BlockState state) {
-      this.trigger(player, arg2 -> arg2.matches(state));
+      this.trigger(player, conditions -> conditions.matches(state));
    }
 
    /**
@@ -49,26 +49,27 @@
       public static final Codec<EnterBlockCriterionTrigger.Conditions> CODEC = Codecs.validate(
          RecordCodecBuilder.create(
             instance -> instance.group(
-                     Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(EnterBlockCriterionTrigger.Conditions::player),
-                     Codecs.m_cjqijzpr(Registries.BLOCK.holderByNameCodec(), "block").forGetter(EnterBlockCriterionTrigger.Conditions::block),
-                     Codecs.m_cjqijzpr(StatePredicate.f_oreeybze, "state").forGetter(EnterBlockCriterionTrigger.Conditions::state)
+                     Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(EnterBlockCriterionTrigger.Conditions::player),
+                     Codecs.createStrictOptionalField(Registries.BLOCK.holderByNameCodec(), "block").forGetter(EnterBlockCriterionTrigger.Conditions::block),
+                     Codecs.createStrictOptionalField(StatePredicate.f_oreeybze, "state").forGetter(EnterBlockCriterionTrigger.Conditions::state)
                   )
                   .apply(instance, EnterBlockCriterionTrigger.Conditions::new)
          ),
-         EnterBlockCriterionTrigger.Conditions::m_vysuztfg
+         EnterBlockCriterionTrigger.Conditions::validate
       );
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_vysuztfg Lnet/minecraft/unmapped/C_rvwlswnk$C_fcmyqfbr;m_vysuztfg(Lnet/minecraft/unmapped/C_rvwlswnk$C_fcmyqfbr;)Lcom/mojang/serialization/DataResult;}
+       * @mapping {@literal named validate Lnet/minecraft/advancement/criterion/EnterBlockCriterionTrigger$Conditions;validate(Lnet/minecraft/advancement/criterion/EnterBlockCriterionTrigger$Conditions;)Lcom/mojang/serialization/DataResult;}
        */
-      private static DataResult<EnterBlockCriterionTrigger.Conditions> m_vysuztfg(EnterBlockCriterionTrigger.Conditions arg) {
-         return (DataResult<EnterBlockCriterionTrigger.Conditions>)arg.block
+      private static DataResult<EnterBlockCriterionTrigger.Conditions> validate(EnterBlockCriterionTrigger.Conditions conditions) {
+         return (DataResult<EnterBlockCriterionTrigger.Conditions>)conditions.block
             .flatMap(
-               arg2 -> arg.state
+               arg2 -> conditions.state
                      .flatMap(arg2x -> arg2x.m_flzybrzb(((Block)arg2.value()).getStateManager()))
                      .map(string -> DataResult.error(() -> "Block" + arg2 + " has no property " + string))
             )
-            .orElseGet(() -> DataResult.success(arg));
+            .orElseGet(() -> DataResult.success(conditions));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterionTrigger.java	2023-12-31 04:03:00.288433444 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterionTrigger.java	2023-12-31 04:01:57.456689737 +0000
@@ -20,7 +20,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<EntityHurtPlayerCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<EntityHurtPlayerCriterionTrigger.Conditions> getCodec() {
       return EntityHurtPlayerCriterionTrigger.Conditions.CODEC;
    }
 
@@ -43,8 +43,8 @@
        */
       public static final Codec<EntityHurtPlayerCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(EntityHurtPlayerCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(DamagePredicate.CODEC, "damage").forGetter(EntityHurtPlayerCriterionTrigger.Conditions::damage)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(EntityHurtPlayerCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(DamagePredicate.CODEC, "damage").forGetter(EntityHurtPlayerCriterionTrigger.Conditions::damage)
                )
                .apply(instance, EntityHurtPlayerCriterionTrigger.Conditions::new)
       );
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/FilledBucketCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/FilledBucketCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/FilledBucketCriterionTrigger.java	2023-12-31 04:03:00.332433264 +0000
+++ namedSrc/net/minecraft/advancement/criterion/FilledBucketCriterionTrigger.java	2023-12-31 04:01:57.508689524 +0000
@@ -20,7 +20,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<FilledBucketCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<FilledBucketCriterionTrigger.Conditions> getCodec() {
       return FilledBucketCriterionTrigger.Conditions.CODEC;
    }
 
@@ -43,8 +43,8 @@
        */
       public static final Codec<FilledBucketCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(FilledBucketCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(FilledBucketCriterionTrigger.Conditions::item)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(FilledBucketCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(ItemPredicate.f_jzkgbumt, "item").forGetter(FilledBucketCriterionTrigger.Conditions::item)
                )
                .apply(instance, FilledBucketCriterionTrigger.Conditions::new)
       );
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java	2023-12-31 04:03:00.424432889 +0000
+++ namedSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java	2023-12-31 04:01:57.608689115 +0000
@@ -15,7 +15,6 @@
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.predicate.item.ItemPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 
 /**
@@ -27,7 +26,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<FishingRodHookedCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<FishingRodHookedCriterionTrigger.Conditions> getCodec() {
       return FishingRodHookedCriterionTrigger.Conditions.CODEC;
    }
 
@@ -55,10 +54,10 @@
        */
       public static final Codec<FishingRodHookedCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(FishingRodHookedCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "rod").forGetter(FishingRodHookedCriterionTrigger.Conditions::rod),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "entity").forGetter(FishingRodHookedCriterionTrigger.Conditions::entity),
-                  Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(FishingRodHookedCriterionTrigger.Conditions::item)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(FishingRodHookedCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(ItemPredicate.f_jzkgbumt, "rod").forGetter(FishingRodHookedCriterionTrigger.Conditions::rod),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "entity").forGetter(FishingRodHookedCriterionTrigger.Conditions::entity),
+                  Codecs.createStrictOptionalField(ItemPredicate.f_jzkgbumt, "item").forGetter(FishingRodHookedCriterionTrigger.Conditions::item)
                )
                .apply(instance, FishingRodHookedCriterionTrigger.Conditions::new)
       );
@@ -111,9 +110,9 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         arg.m_nhvyihxi(this.hookedEntity, ".entity");
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         validator.validateEntity(this.hookedEntity, ".entity");
       }
 
       /**

github-actions · 2023-12-31T04:03:03Z

View the diff here (2/3):

diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ImpossibleCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ImpossibleCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ImpossibleCriterionTrigger.java	2023-12-31 04:03:00.348433199 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ImpossibleCriterionTrigger.java	2023-12-31 04:01:57.528689442 +0000
@@ -2,7 +2,6 @@
 
 import com.mojang.serialization.Codec;
 import net.minecraft.advancement.PlayerAdvancementTracker;
-import net.minecraft.unmapped.C_zybjffid;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_hzboreux}
@@ -34,7 +33,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<ImpossibleCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<ImpossibleCriterionTrigger.Conditions> getCodec() {
       return ImpossibleCriterionTrigger.Conditions.CODEC;
    }
 
@@ -53,7 +52,7 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
+      public void validate(CriterionValidator validator) {
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger.java	2023-12-31 04:03:00.296433411 +0000
+++ namedSrc/net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger.java	2023-12-31 04:01:57.468689688 +0000
@@ -27,7 +27,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<InventoryChangedCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<InventoryChangedCriterionTrigger.Conditions> getCodec() {
       return InventoryChangedCriterionTrigger.Conditions.CODEC;
    }
 
@@ -68,7 +68,7 @@
     * @mapping {@literal named net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger$Conditions}
     */
    public static record Conditions(
-      Optional<ContextAwarePredicate> player, InventoryChangedCriterionTrigger.Conditions.C_iakmulom slots, List<ItemPredicate> items
+      Optional<ContextAwarePredicate> player, InventoryChangedCriterionTrigger.Conditions.SlotDataCriterion slots, List<ItemPredicate> items
    ) implements AbstractCriterionTrigger.Conditions {
       /**
        * @mapping {@literal hashed f_vkhxwyvz Lnet/minecraft/unmapped/C_wqesddch$C_bvmbsujf;f_vkhxwyvz:Lcom/mojang/serialization/Codec;}
@@ -76,14 +76,15 @@
        */
       public static final Codec<InventoryChangedCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(InventoryChangedCriterionTrigger.Conditions::player),
-                  Codecs.m_aeryaqrd(
-                        InventoryChangedCriterionTrigger.Conditions.C_iakmulom.CODEC,
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(InventoryChangedCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(
+                        InventoryChangedCriterionTrigger.Conditions.SlotDataCriterion.CODEC,
                         "slots",
-                        InventoryChangedCriterionTrigger.Conditions.C_iakmulom.f_yrzishql
+                        InventoryChangedCriterionTrigger.Conditions.SlotDataCriterion.ANY
                      )
                      .forGetter(InventoryChangedCriterionTrigger.Conditions::slots),
-                  Codecs.m_aeryaqrd(ItemPredicate.f_jzkgbumt.listOf(), "items", List.of()).forGetter(InventoryChangedCriterionTrigger.Conditions::items)
+                  Codecs.createStrictOptionalField(ItemPredicate.f_jzkgbumt.listOf(), "items", List.of())
+                     .forGetter(InventoryChangedCriterionTrigger.Conditions::items)
                )
                .apply(instance, InventoryChangedCriterionTrigger.Conditions::new)
       );
@@ -104,7 +105,7 @@
          return Criteria.INVENTORY_CHANGED
             .create(
                new InventoryChangedCriterionTrigger.Conditions(
-                  Optional.empty(), InventoryChangedCriterionTrigger.Conditions.C_iakmulom.f_yrzishql, List.of(items)
+                  Optional.empty(), InventoryChangedCriterionTrigger.Conditions.SlotDataCriterion.ANY, List.of(items)
                )
             );
       }
@@ -137,7 +138,7 @@
        * @mapping {@literal named matches Lnet/minecraft/advancement/criterion/InventoryChangedCriterionTrigger$Conditions;matches(Lnet/minecraft/entity/player/PlayerInventory;Lnet/minecraft/item/ItemStack;III)Z}
        */
       public boolean matches(PlayerInventory inventory, ItemStack stack, int full, int empty, int occupied) {
-         if (!this.slots.m_oshpoxks(full, empty, occupied)) {
+         if (!this.slots.test(full, empty, occupied)) {
             return false;
          } else if (this.items.isEmpty()) {
             return true;
@@ -163,42 +164,46 @@
       }
 
       /**
+       * Tests the amount of inventory slots of the types {@code occupied}, {@code full}, and {@code empty} against provided ranges.
+       * 
        * @mapping {@literal hashed net/minecraft/unmapped/C_wqesddch$C_bvmbsujf$C_iakmulom}
-       * @mapping {@literal named net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger$Conditions$C_iakmulom}
+       * @mapping {@literal named net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger$Conditions$SlotDataCriterion}
        */
-      public static record C_iakmulom(NumberRange.IntRange occupied, NumberRange.IntRange full, NumberRange.IntRange empty) {
+      public static record SlotDataCriterion(NumberRange.IntRange occupied, NumberRange.IntRange full, NumberRange.IntRange empty) {
          /**
           * @mapping {@literal hashed f_xdojeqcw Lnet/minecraft/unmapped/C_wqesddch$C_bvmbsujf$C_iakmulom;f_xdojeqcw:Lcom/mojang/serialization/Codec;}
-          * @mapping {@literal named CODEC Lnet/minecraft/advancement/criterion/InventoryChangedCriterionTrigger$Conditions$C_iakmulom;CODEC:Lcom/mojang/serialization/Codec;}
+          * @mapping {@literal named CODEC Lnet/minecraft/advancement/criterion/InventoryChangedCriterionTrigger$Conditions$SlotDataCriterion;CODEC:Lcom/mojang/serialization/Codec;}
           */
-         public static final Codec<InventoryChangedCriterionTrigger.Conditions.C_iakmulom> CODEC = RecordCodecBuilder.create(
+         public static final Codec<InventoryChangedCriterionTrigger.Conditions.SlotDataCriterion> CODEC = RecordCodecBuilder.create(
             instance -> instance.group(
-                     Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "occupied", NumberRange.IntRange.ANY)
-                        .forGetter(InventoryChangedCriterionTrigger.Conditions.C_iakmulom::occupied),
-                     Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "full", NumberRange.IntRange.ANY)
-                        .forGetter(InventoryChangedCriterionTrigger.Conditions.C_iakmulom::full),
-                     Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "empty", NumberRange.IntRange.ANY)
-                        .forGetter(InventoryChangedCriterionTrigger.Conditions.C_iakmulom::empty)
+                     Codecs.createStrictOptionalField(NumberRange.IntRange.CODEC, "occupied", NumberRange.IntRange.ANY)
+                        .forGetter(InventoryChangedCriterionTrigger.Conditions.SlotDataCriterion::occupied),
+                     Codecs.createStrictOptionalField(NumberRange.IntRange.CODEC, "full", NumberRange.IntRange.ANY)
+                        .forGetter(InventoryChangedCriterionTrigger.Conditions.SlotDataCriterion::full),
+                     Codecs.createStrictOptionalField(NumberRange.IntRange.CODEC, "empty", NumberRange.IntRange.ANY)
+                        .forGetter(InventoryChangedCriterionTrigger.Conditions.SlotDataCriterion::empty)
                   )
-                  .apply(instance, InventoryChangedCriterionTrigger.Conditions.C_iakmulom::new)
+                  .apply(instance, InventoryChangedCriterionTrigger.Conditions.SlotDataCriterion::new)
          );
          /**
-          * Mapping not found
+          * @mapping {@literal hashed f_yrzishql Lnet/minecraft/unmapped/C_wqesddch$C_bvmbsujf$C_iakmulom;f_yrzishql:Lnet/minecraft/unmapped/C_wqesddch$C_bvmbsujf$C_iakmulom;}
+          * @mapping {@literal named ANY Lnet/minecraft/advancement/criterion/InventoryChangedCriterionTrigger$Conditions$SlotDataCriterion;ANY:Lnet/minecraft/advancement/criterion/InventoryChangedCriterionTrigger$Conditions$SlotDataCriterion;}
           */
-         public static final InventoryChangedCriterionTrigger.Conditions.C_iakmulom f_yrzishql = new InventoryChangedCriterionTrigger.Conditions.C_iakmulom(
+         public static final InventoryChangedCriterionTrigger.Conditions.SlotDataCriterion ANY = new InventoryChangedCriterionTrigger.Conditions.SlotDataCriterion(
             NumberRange.IntRange.ANY, NumberRange.IntRange.ANY, NumberRange.IntRange.ANY
          );
 
          /**
-          * Mapping not found
+          * @mapping {@literal hashed m_oshpoxks Lnet/minecraft/unmapped/C_wqesddch$C_bvmbsujf$C_iakmulom;m_oshpoxks(III)Z}
+          * @mapping {@literal named test Lnet/minecraft/advancement/criterion/InventoryChangedCriterionTrigger$Conditions$SlotDataCriterion;test(III)Z}
           */
-         public boolean m_oshpoxks(int i, int j, int k) {
-            if (!this.full.test(i)) {
+         public boolean test(int full, int empty, int occupied) {
+            if (!this.full.test(full)) {
                return false;
-            } else if (!this.empty.test(j)) {
+            } else if (!this.empty.test(empty)) {
                return false;
             } else {
-               return this.occupied.test(k);
+               return this.occupied.test(occupied);
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterionTrigger.java	2023-12-31 04:03:00.432432857 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterionTrigger.java	2023-12-31 04:01:57.616689082 +0000
@@ -21,7 +21,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<ItemDurabilityChangedCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<ItemDurabilityChangedCriterionTrigger.Conditions> getCodec() {
       return ItemDurabilityChangedCriterionTrigger.Conditions.CODEC;
    }
 
@@ -46,11 +46,12 @@
        */
       public static final Codec<ItemDurabilityChangedCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ItemDurabilityChangedCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(ItemDurabilityChangedCriterionTrigger.Conditions::item),
-                  Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "durability", NumberRange.IntRange.ANY)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player")
+                     .forGetter(ItemDurabilityChangedCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(ItemPredicate.f_jzkgbumt, "item").forGetter(ItemDurabilityChangedCriterionTrigger.Conditions::item),
+                  Codecs.createStrictOptionalField(NumberRange.IntRange.CODEC, "durability", NumberRange.IntRange.ANY)
                      .forGetter(ItemDurabilityChangedCriterionTrigger.Conditions::durability),
-                  Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "delta", NumberRange.IntRange.ANY)
+                  Codecs.createStrictOptionalField(NumberRange.IntRange.CODEC, "delta", NumberRange.IntRange.ANY)
                      .forGetter(ItemDurabilityChangedCriterionTrigger.Conditions::delta)
                )
                .apply(instance, ItemDurabilityChangedCriterionTrigger.Conditions::new)
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java	2023-12-31 04:03:00.272433509 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java	2023-12-31 04:01:57.436689819 +0000
@@ -22,7 +22,6 @@
 import net.minecraft.predicate.item.ItemPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 import net.minecraft.util.math.BlockPos;
 
@@ -35,7 +34,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<ItemUsedOnLocationCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<ItemUsedOnLocationCriterionTrigger.Conditions> getCodec() {
       return ItemUsedOnLocationCriterionTrigger.Conditions.CODEC;
    }
 
@@ -68,8 +67,9 @@
        */
       public static final Codec<ItemUsedOnLocationCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ItemUsedOnLocationCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(ContextAwarePredicate.CODEC, "location").forGetter(ItemUsedOnLocationCriterionTrigger.Conditions::location)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player")
+                     .forGetter(ItemUsedOnLocationCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(ContextAwarePredicate.CODEC, "location").forGetter(ItemUsedOnLocationCriterionTrigger.Conditions::location)
                )
                .apply(instance, ItemUsedOnLocationCriterionTrigger.Conditions::new)
       );
@@ -135,9 +135,9 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         this.location.ifPresent(arg2 -> arg.m_fgshsjad(arg2, LootContextTypes.ADVANCEMENT_LOCATION, ".location"));
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         this.location.ifPresent(arg2 -> validator.validate(arg2, LootContextTypes.ADVANCEMENT_LOCATION, ".location"));
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterionTrigger.java	2023-12-31 04:03:00.332433264 +0000
+++ namedSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterionTrigger.java	2023-12-31 04:01:57.508689524 +0000
@@ -17,7 +17,6 @@
 import net.minecraft.predicate.NumberRange;
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 
 /**
@@ -29,7 +28,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<KilledByCrossbowCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<KilledByCrossbowCriterionTrigger.Conditions> getCodec() {
       return KilledByCrossbowCriterionTrigger.Conditions.CODEC;
    }
 
@@ -61,9 +60,10 @@
        */
       public static final Codec<KilledByCrossbowCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(KilledByCrossbowCriterionTrigger.Conditions::player),
-                  Codecs.m_aeryaqrd(EntityPredicate.f_uvagahsk.listOf(), "victims", List.of()).forGetter(KilledByCrossbowCriterionTrigger.Conditions::victims),
-                  Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "unique_entity_types", NumberRange.IntRange.ANY)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(KilledByCrossbowCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC.listOf(), "victims", List.of())
+                     .forGetter(KilledByCrossbowCriterionTrigger.Conditions::victims),
+                  Codecs.createStrictOptionalField(NumberRange.IntRange.CODEC, "unique_entity_types", NumberRange.IntRange.ANY)
                      .forGetter(KilledByCrossbowCriterionTrigger.Conditions::uniqueEntityTypes)
                )
                .apply(instance, KilledByCrossbowCriterionTrigger.Conditions::new)
@@ -120,9 +120,9 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         arg.m_svooszyh(this.victims, ".victims");
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         validator.validateEntities(this.victims, ".victims");
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/LevitationCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/LevitationCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/LevitationCriterionTrigger.java	2023-12-31 04:03:00.256433575 +0000
+++ namedSrc/net/minecraft/advancement/criterion/LevitationCriterionTrigger.java	2023-12-31 04:01:57.416689901 +0000
@@ -21,7 +21,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<LevitationCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<LevitationCriterionTrigger.Conditions> getCodec() {
       return LevitationCriterionTrigger.Conditions.CODEC;
    }
 
@@ -45,9 +45,9 @@
        */
       public static final Codec<LevitationCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(LevitationCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(DistancePredicate.CODEC, "distance").forGetter(LevitationCriterionTrigger.Conditions::distance),
-                  Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "duration", NumberRange.IntRange.ANY)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(LevitationCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(DistancePredicate.CODEC, "distance").forGetter(LevitationCriterionTrigger.Conditions::distance),
+                  Codecs.createStrictOptionalField(NumberRange.IntRange.CODEC, "duration", NumberRange.IntRange.ANY)
                      .forGetter(LevitationCriterionTrigger.Conditions::duration)
                )
                .apply(instance, LevitationCriterionTrigger.Conditions::new)
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/LightningStrikeCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/LightningStrikeCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/LightningStrikeCriterionTrigger.java	2023-12-31 04:03:00.284433460 +0000
+++ namedSrc/net/minecraft/advancement/criterion/LightningStrikeCriterionTrigger.java	2023-12-31 04:01:57.448689770 +0000
@@ -12,7 +12,6 @@
 import net.minecraft.predicate.ContextAwarePredicate;
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 
 /**
@@ -24,7 +23,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<LightningStrikeCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<LightningStrikeCriterionTrigger.Conditions> getCodec() {
       return LightningStrikeCriterionTrigger.Conditions.CODEC;
    }
 
@@ -52,9 +51,11 @@
        */
       public static final Codec<LightningStrikeCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(LightningStrikeCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "lightning").forGetter(LightningStrikeCriterionTrigger.Conditions::lightning),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "bystander").forGetter(LightningStrikeCriterionTrigger.Conditions::bystander)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(LightningStrikeCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "lightning")
+                     .forGetter(LightningStrikeCriterionTrigger.Conditions::lightning),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "bystander")
+                     .forGetter(LightningStrikeCriterionTrigger.Conditions::bystander)
                )
                .apply(instance, LightningStrikeCriterionTrigger.Conditions::new)
       );
@@ -86,10 +87,10 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         arg.m_nhvyihxi(this.lightning, ".lightning");
-         arg.m_nhvyihxi(this.bystander, ".bystander");
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         validator.validateEntity(this.lightning, ".lightning");
+         validator.validateEntity(this.bystander, ".bystander");
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/LocationCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/LocationCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/LocationCriterionTrigger.java	2023-12-31 04:03:00.344433216 +0000
+++ namedSrc/net/minecraft/advancement/criterion/LocationCriterionTrigger.java	2023-12-31 04:01:57.520689476 +0000
@@ -24,7 +24,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<LocationCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<LocationCriterionTrigger.Conditions> getCodec() {
       return LocationCriterionTrigger.Conditions.CODEC;
    }
 
@@ -46,7 +46,9 @@
        * @mapping {@literal named CODEC Lnet/minecraft/advancement/criterion/LocationCriterionTrigger$Conditions;CODEC:Lcom/mojang/serialization/Codec;}
        */
       public static final Codec<LocationCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
-         instance -> instance.group(Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(LocationCriterionTrigger.Conditions::player))
+         instance -> instance.group(
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(LocationCriterionTrigger.Conditions::player)
+               )
                .apply(instance, LocationCriterionTrigger.Conditions::new)
       );
 
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/OnKilledCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/OnKilledCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/OnKilledCriterionTrigger.java	2023-12-31 04:03:00.284433460 +0000
+++ namedSrc/net/minecraft/advancement/criterion/OnKilledCriterionTrigger.java	2023-12-31 04:01:57.452689754 +0000
@@ -11,7 +11,6 @@
 import net.minecraft.predicate.entity.DamageSourcePredicate;
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 
 /**
@@ -23,7 +22,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<OnKilledCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<OnKilledCriterionTrigger.Conditions> getCodec() {
       return OnKilledCriterionTrigger.Conditions.CODEC;
    }
 
@@ -48,9 +47,9 @@
        */
       public static final Codec<OnKilledCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(OnKilledCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "entity").forGetter(OnKilledCriterionTrigger.Conditions::entityPredicate),
-                  Codecs.m_cjqijzpr(DamageSourcePredicate.CODEC, "killing_blow").forGetter(OnKilledCriterionTrigger.Conditions::killingBlow)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(OnKilledCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "entity").forGetter(OnKilledCriterionTrigger.Conditions::entityPredicate),
+                  Codecs.createStrictOptionalField(DamageSourcePredicate.CODEC, "killing_blow").forGetter(OnKilledCriterionTrigger.Conditions::killingBlow)
                )
                .apply(instance, OnKilledCriterionTrigger.Conditions::new)
       );
@@ -219,9 +218,9 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         arg.m_nhvyihxi(this.entity, ".entity");
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         validator.validateEntity(this.entity, ".entity");
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterionTrigger.java	2023-12-31 04:03:00.348433199 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterionTrigger.java	2023-12-31 04:01:57.524689459 +0000
@@ -11,7 +11,6 @@
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.predicate.item.ItemPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 import org.jetbrains.annotations.Nullable;
 
@@ -24,7 +23,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<PickedUpThrownItemCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<PickedUpThrownItemCriterionTrigger.Conditions> getCodec() {
       return PickedUpThrownItemCriterionTrigger.Conditions.CODEC;
    }
 
@@ -49,9 +48,11 @@
        */
       public static final Codec<PickedUpThrownItemCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(PickedUpThrownItemCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(PickedUpThrownItemCriterionTrigger.Conditions::item),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "entity").forGetter(PickedUpThrownItemCriterionTrigger.Conditions::entity)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player")
+                     .forGetter(PickedUpThrownItemCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(ItemPredicate.f_jzkgbumt, "item").forGetter(PickedUpThrownItemCriterionTrigger.Conditions::item),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "entity")
+                     .forGetter(PickedUpThrownItemCriterionTrigger.Conditions::entity)
                )
                .apply(instance, PickedUpThrownItemCriterionTrigger.Conditions::new)
       );
@@ -92,9 +93,9 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         arg.m_nhvyihxi(this.entity, ".entity");
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         validator.validateEntity(this.entity, ".entity");
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java	2023-12-31 04:03:00.304433380 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java	2023-12-31 04:01:57.472689672 +0000
@@ -19,7 +19,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<PlayerGeneratesContainerLootCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<PlayerGeneratesContainerLootCriterionTrigger.Conditions> getCodec() {
       return PlayerGeneratesContainerLootCriterionTrigger.Conditions.CODEC;
    }
 
@@ -42,7 +42,8 @@
        */
       public static final Codec<PlayerGeneratesContainerLootCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(PlayerGeneratesContainerLootCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player")
+                     .forGetter(PlayerGeneratesContainerLootCriterionTrigger.Conditions::player),
                   Identifier.CODEC.fieldOf("loot_table").forGetter(PlayerGeneratesContainerLootCriterionTrigger.Conditions::lootTable)
                )
                .apply(instance, PlayerGeneratesContainerLootCriterionTrigger.Conditions::new)
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterionTrigger.java	2023-12-31 04:03:00.232433673 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterionTrigger.java	2023-12-31 04:01:57.380690048 +0000
@@ -11,7 +11,6 @@
 import net.minecraft.predicate.DamagePredicate;
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 
 /**
@@ -23,7 +22,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<PlayerHurtEntityCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<PlayerHurtEntityCriterionTrigger.Conditions> getCodec() {
       return PlayerHurtEntityCriterionTrigger.Conditions.CODEC;
    }
 
@@ -48,9 +47,9 @@
        */
       public static final Codec<PlayerHurtEntityCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(PlayerHurtEntityCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(DamagePredicate.CODEC, "damage").forGetter(PlayerHurtEntityCriterionTrigger.Conditions::damage),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "entity").forGetter(PlayerHurtEntityCriterionTrigger.Conditions::entity)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(PlayerHurtEntityCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(DamagePredicate.CODEC, "damage").forGetter(PlayerHurtEntityCriterionTrigger.Conditions::damage),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "entity").forGetter(PlayerHurtEntityCriterionTrigger.Conditions::entity)
                )
                .apply(instance, PlayerHurtEntityCriterionTrigger.Conditions::new)
       );
@@ -122,9 +121,9 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         arg.m_nhvyihxi(this.entity, ".entity");
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         validator.validateEntity(this.entity, ".entity");
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterionTrigger.java	2023-12-31 04:03:00.276433494 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterionTrigger.java	2023-12-31 04:01:57.440689803 +0000
@@ -11,7 +11,6 @@
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.predicate.item.ItemPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 
 /**
@@ -23,7 +22,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<PlayerInteractedWithEntityCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<PlayerInteractedWithEntityCriterionTrigger.Conditions> getCodec() {
       return PlayerInteractedWithEntityCriterionTrigger.Conditions.CODEC;
    }
 
@@ -48,9 +47,11 @@
        */
       public static final Codec<PlayerInteractedWithEntityCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(PlayerInteractedWithEntityCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(PlayerInteractedWithEntityCriterionTrigger.Conditions::item),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "entity").forGetter(PlayerInteractedWithEntityCriterionTrigger.Conditions::entity)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player")
+                     .forGetter(PlayerInteractedWithEntityCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(ItemPredicate.f_jzkgbumt, "item").forGetter(PlayerInteractedWithEntityCriterionTrigger.Conditions::item),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "entity")
+                     .forGetter(PlayerInteractedWithEntityCriterionTrigger.Conditions::entity)
                )
                .apply(instance, PlayerInteractedWithEntityCriterionTrigger.Conditions::new)
       );
@@ -92,9 +93,9 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         arg.m_nhvyihxi(this.entity, ".entity");
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         validator.validateEntity(this.entity, ".entity");
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.java	2023-12-31 04:03:00.364433134 +0000
+++ namedSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.java	2023-12-31 04:01:57.544689377 +0000
@@ -24,7 +24,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<RecipeCraftedCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<RecipeCraftedCriterionTrigger.Conditions> getCodec() {
       return RecipeCraftedCriterionTrigger.Conditions.CODEC;
    }
 
@@ -48,9 +48,9 @@
        */
       public static final Codec<RecipeCraftedCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(RecipeCraftedCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(RecipeCraftedCriterionTrigger.Conditions::player),
                   Identifier.CODEC.fieldOf("recipe_id").forGetter(RecipeCraftedCriterionTrigger.Conditions::recipeId),
-                  Codecs.m_aeryaqrd(ItemPredicate.f_jzkgbumt.listOf(), "ingredients", List.of())
+                  Codecs.createStrictOptionalField(ItemPredicate.f_jzkgbumt.listOf(), "ingredients", List.of())
                      .forGetter(RecipeCraftedCriterionTrigger.Conditions::ingredients)
                )
                .apply(instance, RecipeCraftedCriterionTrigger.Conditions::new)
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterionTrigger.java	2023-12-31 04:03:00.432432857 +0000
+++ namedSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterionTrigger.java	2023-12-31 04:01:57.616689082 +0000
@@ -20,7 +20,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<RecipeUnlockedCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<RecipeUnlockedCriterionTrigger.Conditions> getCodec() {
       return RecipeUnlockedCriterionTrigger.Conditions.CODEC;
    }
 
@@ -51,7 +51,7 @@
        */
       public static final Codec<RecipeUnlockedCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(RecipeUnlockedCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(RecipeUnlockedCriterionTrigger.Conditions::player),
                   Identifier.CODEC.fieldOf("recipe").forGetter(RecipeUnlockedCriterionTrigger.Conditions::recipe)
                )
                .apply(instance, RecipeUnlockedCriterionTrigger.Conditions::new)
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterionTrigger.java	2023-12-31 04:03:00.272433509 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterionTrigger.java	2023-12-31 04:01:57.436689819 +0000
@@ -21,7 +21,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<ShotCrossbowCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<ShotCrossbowCriterionTrigger.Conditions> getCodec() {
       return ShotCrossbowCriterionTrigger.Conditions.CODEC;
    }
 
@@ -44,8 +44,8 @@
        */
       public static final Codec<ShotCrossbowCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ShotCrossbowCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(ShotCrossbowCriterionTrigger.Conditions::item)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(ShotCrossbowCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(ItemPredicate.f_jzkgbumt, "item").forGetter(ShotCrossbowCriterionTrigger.Conditions::item)
                )
                .apply(instance, ShotCrossbowCriterionTrigger.Conditions::new)
       );
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java	2023-12-31 04:03:00.396433004 +0000
+++ namedSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java	2023-12-31 04:01:57.576689246 +0000
@@ -24,7 +24,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<SlideDownBlockCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<SlideDownBlockCriterionTrigger.Conditions> getCodec() {
       return SlideDownBlockCriterionTrigger.Conditions.CODEC;
    }
 
@@ -33,7 +33,7 @@
     * @mapping {@literal named trigger Lnet/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger;trigger(Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/block/BlockState;)V}
     */
    public void trigger(ServerPlayerEntity player, BlockState state) {
-      this.trigger(player, arg2 -> arg2.matches(state));
+      this.trigger(player, conditions -> conditions.matches(state));
    }
 
    /**
@@ -49,26 +49,28 @@
       public static final Codec<SlideDownBlockCriterionTrigger.Conditions> CODEC = Codecs.validate(
          RecordCodecBuilder.create(
             instance -> instance.group(
-                     Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(SlideDownBlockCriterionTrigger.Conditions::player),
-                     Codecs.m_cjqijzpr(Registries.BLOCK.holderByNameCodec(), "block").forGetter(SlideDownBlockCriterionTrigger.Conditions::block),
-                     Codecs.m_cjqijzpr(StatePredicate.f_oreeybze, "state").forGetter(SlideDownBlockCriterionTrigger.Conditions::state)
+                     Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(SlideDownBlockCriterionTrigger.Conditions::player),
+                     Codecs.createStrictOptionalField(Registries.BLOCK.holderByNameCodec(), "block")
+                        .forGetter(SlideDownBlockCriterionTrigger.Conditions::block),
+                     Codecs.createStrictOptionalField(StatePredicate.f_oreeybze, "state").forGetter(SlideDownBlockCriterionTrigger.Conditions::state)
                   )
                   .apply(instance, SlideDownBlockCriterionTrigger.Conditions::new)
          ),
-         SlideDownBlockCriterionTrigger.Conditions::m_wrmmefke
+         SlideDownBlockCriterionTrigger.Conditions::validate
       );
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_wrmmefke Lnet/minecraft/unmapped/C_guvqoceu$C_rzzwrqgc;m_wrmmefke(Lnet/minecraft/unmapped/C_guvqoceu$C_rzzwrqgc;)Lcom/mojang/serialization/DataResult;}
+       * @mapping {@literal named validate Lnet/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger$Conditions;validate(Lnet/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger$Conditions;)Lcom/mojang/serialization/DataResult;}
        */
-      private static DataResult<SlideDownBlockCriterionTrigger.Conditions> m_wrmmefke(SlideDownBlockCriterionTrigger.Conditions arg) {
-         return (DataResult<SlideDownBlockCriterionTrigger.Conditions>)arg.block
+      private static DataResult<SlideDownBlockCriterionTrigger.Conditions> validate(SlideDownBlockCriterionTrigger.Conditions conditions) {
+         return (DataResult<SlideDownBlockCriterionTrigger.Conditions>)conditions.block
             .flatMap(
-               arg2 -> arg.state
+               arg2 -> conditions.state
                      .flatMap(arg2x -> arg2x.m_flzybrzb(((Block)arg2.value()).getStateManager()))
                      .map(string -> DataResult.error(() -> "Block" + arg2 + " has no property " + string))
             )
-            .orElseGet(() -> DataResult.success(arg));
+            .orElseGet(() -> DataResult.success(conditions));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/StartedRidingCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/StartedRidingCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/StartedRidingCriterionTrigger.java	2023-12-31 04:03:00.244433624 +0000
+++ namedSrc/net/minecraft/advancement/criterion/StartedRidingCriterionTrigger.java	2023-12-31 04:01:57.396689983 +0000
@@ -18,7 +18,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<StartedRidingCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<StartedRidingCriterionTrigger.Conditions> getCodec() {
       return StartedRidingCriterionTrigger.Conditions.CODEC;
    }
 
@@ -40,7 +40,9 @@
        * @mapping {@literal named CODEC Lnet/minecraft/advancement/criterion/StartedRidingCriterionTrigger$Conditions;CODEC:Lcom/mojang/serialization/Codec;}
        */
       public static final Codec<StartedRidingCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
-         instance -> instance.group(Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(StartedRidingCriterionTrigger.Conditions::player))
+         instance -> instance.group(
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(StartedRidingCriterionTrigger.Conditions::player)
+               )
                .apply(instance, StartedRidingCriterionTrigger.Conditions::new)
       );
 
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/SummonedEntityCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/SummonedEntityCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/SummonedEntityCriterionTrigger.java	2023-12-31 04:03:00.304433380 +0000
+++ namedSrc/net/minecraft/advancement/criterion/SummonedEntityCriterionTrigger.java	2023-12-31 04:01:57.472689672 +0000
@@ -9,7 +9,6 @@
 import net.minecraft.predicate.ContextAwarePredicate;
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 
 /**
@@ -21,7 +20,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<SummonedEntityCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<SummonedEntityCriterionTrigger.Conditions> getCodec() {
       return SummonedEntityCriterionTrigger.Conditions.CODEC;
    }
 
@@ -46,8 +45,8 @@
        */
       public static final Codec<SummonedEntityCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(SummonedEntityCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "entity").forGetter(SummonedEntityCriterionTrigger.Conditions::entity)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(SummonedEntityCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "entity").forGetter(SummonedEntityCriterionTrigger.Conditions::entity)
                )
                .apply(instance, SummonedEntityCriterionTrigger.Conditions::new)
       );
@@ -73,9 +72,9 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         arg.m_nhvyihxi(this.entity, ".entity");
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         validator.validateEntity(this.entity, ".entity");
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/TameAnimalCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/TameAnimalCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/TameAnimalCriterionTrigger.java	2023-12-31 04:03:00.348433199 +0000
+++ namedSrc/net/minecraft/advancement/criterion/TameAnimalCriterionTrigger.java	2023-12-31 04:01:57.528689442 +0000
@@ -9,7 +9,6 @@
 import net.minecraft.predicate.ContextAwarePredicate;
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 
 /**
@@ -21,7 +20,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<TameAnimalCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<TameAnimalCriterionTrigger.Conditions> getCodec() {
       return TameAnimalCriterionTrigger.Conditions.CODEC;
    }
 
@@ -46,8 +45,8 @@
        */
       public static final Codec<TameAnimalCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(TameAnimalCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "entity").forGetter(TameAnimalCriterionTrigger.Conditions::entity)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(TameAnimalCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "entity").forGetter(TameAnimalCriterionTrigger.Conditions::entity)
                )
                .apply(instance, TameAnimalCriterionTrigger.Conditions::new)
       );
@@ -80,9 +79,9 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         arg.m_nhvyihxi(this.entity, ".entity");
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         validator.validateEntity(this.entity, ".entity");
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/TargetHitCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/TargetHitCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/TargetHitCriterionTrigger.java	2023-12-31 04:03:00.372433101 +0000
+++ namedSrc/net/minecraft/advancement/criterion/TargetHitCriterionTrigger.java	2023-12-31 04:01:57.556689328 +0000
@@ -10,7 +10,6 @@
 import net.minecraft.predicate.NumberRange;
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 import net.minecraft.util.math.Vec3d;
 
@@ -23,7 +22,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<TargetHitCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<TargetHitCriterionTrigger.Conditions> getCodec() {
       return TargetHitCriterionTrigger.Conditions.CODEC;
    }
 
@@ -48,10 +47,10 @@
        */
       public static final Codec<TargetHitCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(TargetHitCriterionTrigger.Conditions::player),
-                  Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "signal_strength", NumberRange.IntRange.ANY)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(TargetHitCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(NumberRange.IntRange.CODEC, "signal_strength", NumberRange.IntRange.ANY)
                      .forGetter(TargetHitCriterionTrigger.Conditions::signalStrength),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "projectile").forGetter(TargetHitCriterionTrigger.Conditions::projectile)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "projectile").forGetter(TargetHitCriterionTrigger.Conditions::projectile)
                )
                .apply(instance, TargetHitCriterionTrigger.Conditions::new)
       );
@@ -82,9 +81,9 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         arg.m_nhvyihxi(this.projectile, ".projectile");
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         validator.validateEntity(this.projectile, ".projectile");
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/TravelCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/TravelCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/TravelCriterionTrigger.java	2023-12-31 04:03:00.400432987 +0000
+++ namedSrc/net/minecraft/advancement/criterion/TravelCriterionTrigger.java	2023-12-31 04:01:57.580689230 +0000
@@ -22,7 +22,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<TravelCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<TravelCriterionTrigger.Conditions> getCodec() {
       return TravelCriterionTrigger.Conditions.CODEC;
    }
 
@@ -47,9 +47,9 @@
        */
       public static final Codec<TravelCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(TravelCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(LocationPredicate.CODEC, "start_position").forGetter(TravelCriterionTrigger.Conditions::startPosition),
-                  Codecs.m_cjqijzpr(DistancePredicate.CODEC, "distance").forGetter(TravelCriterionTrigger.Conditions::distance)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(TravelCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(LocationPredicate.CODEC, "start_position").forGetter(TravelCriterionTrigger.Conditions::startPosition),
+                  Codecs.createStrictOptionalField(DistancePredicate.CODEC, "distance").forGetter(TravelCriterionTrigger.Conditions::distance)
                )
                .apply(instance, TravelCriterionTrigger.Conditions::new)
       );
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/UsedEnderEyeCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/UsedEnderEyeCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/UsedEnderEyeCriterionTrigger.java	2023-12-31 04:03:00.280433477 +0000
+++ namedSrc/net/minecraft/advancement/criterion/UsedEnderEyeCriterionTrigger.java	2023-12-31 04:01:57.448689770 +0000
@@ -19,7 +19,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<UsedEnderEyeCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<UsedEnderEyeCriterionTrigger.Conditions> getCodec() {
       return UsedEnderEyeCriterionTrigger.Conditions.CODEC;
    }
 
@@ -45,8 +45,8 @@
        */
       public static final Codec<UsedEnderEyeCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(UsedEnderEyeCriterionTrigger.Conditions::player),
-                  Codecs.m_aeryaqrd(NumberRange.FloatRange.CODEC, "distance", NumberRange.FloatRange.ANY)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(UsedEnderEyeCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(NumberRange.FloatRange.CODEC, "distance", NumberRange.FloatRange.ANY)
                      .forGetter(UsedEnderEyeCriterionTrigger.Conditions::distance)
                )
                .apply(instance, UsedEnderEyeCriterionTrigger.Conditions::new)
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/UsedTotemCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/UsedTotemCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/UsedTotemCriterionTrigger.java	2023-12-31 04:03:00.404432971 +0000
+++ namedSrc/net/minecraft/advancement/criterion/UsedTotemCriterionTrigger.java	2023-12-31 04:01:57.588689197 +0000
@@ -21,7 +21,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<UsedTotemCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<UsedTotemCriterionTrigger.Conditions> getCodec() {
       return UsedTotemCriterionTrigger.Conditions.CODEC;
    }
 
@@ -44,8 +44,8 @@
        */
       public static final Codec<UsedTotemCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(UsedTotemCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(UsedTotemCriterionTrigger.Conditions::item)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(UsedTotemCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(ItemPredicate.f_jzkgbumt, "item").forGetter(UsedTotemCriterionTrigger.Conditions::item)
                )
                .apply(instance, UsedTotemCriterionTrigger.Conditions::new)
       );
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/UsingItemCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/UsingItemCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/UsingItemCriterionTrigger.java	2023-12-31 04:03:00.372433101 +0000
+++ namedSrc/net/minecraft/advancement/criterion/UsingItemCriterionTrigger.java	2023-12-31 04:01:57.552689345 +0000
@@ -20,7 +20,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<UsingItemCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<UsingItemCriterionTrigger.Conditions> getCodec() {
       return UsingItemCriterionTrigger.Conditions.CODEC;
    }
 
@@ -43,8 +43,8 @@
        */
       public static final Codec<UsingItemCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(UsingItemCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(UsingItemCriterionTrigger.Conditions::item)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(UsingItemCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(ItemPredicate.f_jzkgbumt, "item").forGetter(UsingItemCriterionTrigger.Conditions::item)
                )
                .apply(instance, UsingItemCriterionTrigger.Conditions::new)
       );
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/VillagerTradeCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/VillagerTradeCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/VillagerTradeCriterionTrigger.java	2023-12-31 04:03:00.288433444 +0000
+++ namedSrc/net/minecraft/advancement/criterion/VillagerTradeCriterionTrigger.java	2023-12-31 04:01:57.452689754 +0000
@@ -11,7 +11,6 @@
 import net.minecraft.predicate.entity.EntityPredicate;
 import net.minecraft.predicate.item.ItemPredicate;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.unmapped.C_zybjffid;
 import net.minecraft.util.dynamic.Codecs;
 
 /**
@@ -23,7 +22,7 @@
     * Mapping not found
     */
    @Override
-   public Codec<VillagerTradeCriterionTrigger.Conditions> m_xrbtiope() {
+   public Codec<VillagerTradeCriterionTrigger.Conditions> getCodec() {
       return VillagerTradeCriterionTrigger.Conditions.CODEC;
    }
 
@@ -48,9 +47,9 @@
        */
       public static final Codec<VillagerTradeCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(VillagerTradeCriterionTrigger.Conditions::player),
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "villager").forGetter(VillagerTradeCriterionTrigger.Conditions::villager),
-                  Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(VillagerTradeCriterionTrigger.Conditions::item)
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "player").forGetter(VillagerTradeCriterionTrigger.Conditions::player),
+                  Codecs.createStrictOptionalField(EntityPredicate.ADVANCEMENT_CODEC, "villager").forGetter(VillagerTradeCriterionTrigger.Conditions::villager),
+                  Codecs.createStrictOptionalField(ItemPredicate.f_jzkgbumt, "item").forGetter(VillagerTradeCriterionTrigger.Conditions::item)
                )
                .apply(instance, VillagerTradeCriterionTrigger.Conditions::new)
       );
@@ -88,9 +87,9 @@
        * Mapping not found
        */
       @Override
-      public void m_mmotanow(C_zybjffid arg) {
-         AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
-         arg.m_nhvyihxi(this.villager, ".villager");
+      public void validate(CriterionValidator validator) {
+         AbstractCriterionTrigger.Conditions.super.validate(validator);
+         validator.validateEntity(this.villager, ".villager");
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/PlayerAdvancementTracker.java namedSrc/net/minecraft/advancement/PlayerAdvancementTracker.java
--- namedTargetSrc/net/minecraft/advancement/PlayerAdvancementTracker.java	2023-12-31 04:03:00.236433656 +0000
+++ namedSrc/net/minecraft/advancement/PlayerAdvancementTracker.java	2023-12-31 04:01:57.384690032 +0000
@@ -302,7 +302,7 @@
             advancement.data().rewards().apply(this.owner);
             advancement.data().display().ifPresent(display -> {
                if (display.shouldAnnounceToChat() && this.owner.getWorld().getGameRules().getBooleanValue(GameRules.ANNOUNCE_ADVANCEMENTS)) {
-                  this.playerManager.broadcastSystemMessage(display.m_spcgkfjs().getFormatted(advancement, this.owner), false);
+                  this.playerManager.broadcastSystemMessage(display.getType().getFormatted(advancement, this.owner), false);
                }
             });
          }

github-actions · 2023-12-31T04:03:03Z

View the diff here (3/3):

diff -bur namedTargetSrc/net/minecraft/block/entity/SignText.java namedSrc/net/minecraft/block/entity/SignText.java
--- namedTargetSrc/net/minecraft/block/entity/SignText.java	2023-12-31 04:03:00.232433673 +0000
+++ namedSrc/net/minecraft/block/entity/SignText.java	2023-12-31 04:01:57.384690032 +0000
@@ -12,7 +12,7 @@
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_qrzzgymy;
+import net.minecraft.text.TextCodecs;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Util;
 import org.jetbrains.annotations.Nullable;
@@ -30,7 +30,7 @@
     * @mapping {@literal hashed f_cwscwtrs Lnet/minecraft/unmapped/C_ralzcant;f_cwscwtrs:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named MESSAGES_CODEC Lnet/minecraft/block/entity/SignText;MESSAGES_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   private static final Codec<Text[]> MESSAGES_CODEC = C_qrzzgymy.f_ptpqrytj
+   private static final Codec<Text[]> MESSAGES_CODEC = TextCodecs.f_ptpqrytj
       .listOf()
       .comapFlatMap(
          lines -> Util.fixedSizeList(lines, 4).map(list -> new Text[]{(Text)list.get(0), (Text)list.get(1), (Text)list.get(2), (Text)list.get(3)}),
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus.java namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus.java
--- namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus.java	2023-12-31 04:03:00.340433232 +0000
+++ namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementObtainedStatus.java	2023-12-31 04:01:57.520689476 +0000
@@ -2,7 +2,7 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.text.component.AdvancementComponent;
+import net.minecraft.advancement.AdvancementType;
 import net.minecraft.util.Identifier;
 
 /**
@@ -69,7 +69,7 @@
    /**
     * Mapping not found
     */
-   public Identifier m_hajbibtv(AdvancementComponent arg) {
+   public Identifier m_hajbibtv(AdvancementType arg) {
       return switch (arg) {
          case TASK -> this.f_fqpmjvtv;
          case CHALLENGE -> this.f_bxfdcnbf;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java	2023-12-31 04:03:00.204433787 +0000
+++ namedSrc/net/minecraft/client/gui/screen/advancement/AdvancementWidget.java	2023-12-31 04:01:57.344690196 +0000
@@ -175,7 +175,7 @@
       int k = i > 1 ? client.textRenderer.getWidth("  ") + client.textRenderer.getWidth("0") * j * 2 + client.textRenderer.getWidth("/") : 0;
       int l = 29 + client.textRenderer.getWidth(this.title) + k;
       this.description = Language.getInstance()
-         .reorder(this.wrapDescription(Texts.setStyleIfAbsent(display.getDescription().copy(), Style.EMPTY.withColor(display.m_spcgkfjs().getFormatting())), l));
+         .reorder(this.wrapDescription(Texts.setStyleIfAbsent(display.getDescription().copy(), Style.EMPTY.withColor(display.getType().getFormatting())), l));
 
       for (OrderedText lv : this.description) {
          l = Math.max(l, client.textRenderer.getWidth(lv));
@@ -277,7 +277,7 @@
             lv = AdvancementObtainedStatus.UNOBTAINED;
          }
 
-         graphics.drawGuiTexture(lv.m_hajbibtv(this.display.m_spcgkfjs()), x + this.x + 3, y + this.y, 26, 26);
+         graphics.drawGuiTexture(lv.m_hajbibtv(this.display.getType()), x + this.x + 3, y + this.y, 26, 26);
          graphics.drawItemWithoutEntity(this.display.getIcon(), x + this.x + 8, y + this.y + 5);
       }
 
@@ -366,7 +366,7 @@
 
       graphics.drawGuiTexture(lv2.m_chrnijcb(), 200, 26, 0, 0, q, p, n, 26);
       graphics.drawGuiTexture(lv3.m_chrnijcb(), 200, 26, 200 - o, 0, q + n, p, o, 26);
-      graphics.drawGuiTexture(lv4.m_hajbibtv(this.display.m_spcgkfjs()), originX + this.x + 3, originY + this.y, 26, 26);
+      graphics.drawGuiTexture(lv4.m_hajbibtv(this.display.getType()), originX + this.x + 3, originY + this.y, 26, 26);
       if (bl) {
          graphics.drawShadowedText(this.client.textRenderer, this.title, q + 5, originY + this.y + 9, -1);
          if (lv != null) {
diff -bur namedTargetSrc/net/minecraft/client/multiplayer/chat/LoggedChatMessage.java namedSrc/net/minecraft/client/multiplayer/chat/LoggedChatMessage.java
--- namedTargetSrc/net/minecraft/client/multiplayer/chat/LoggedChatMessage.java	2023-12-31 04:03:00.376433085 +0000
+++ namedSrc/net/minecraft/client/multiplayer/chat/LoggedChatMessage.java	2023-12-31 04:01:57.556689328 +0000
@@ -14,7 +14,7 @@
 import net.minecraft.client.network.TrustLevel;
 import net.minecraft.network.message.SignedChatMessage;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_qrzzgymy;
+import net.minecraft.text.TextCodecs;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.dynamic.Codecs;
 
@@ -162,7 +162,7 @@
        */
       public static final Codec<LoggedChatMessage.System> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  C_qrzzgymy.f_flkmksis.fieldOf("message").forGetter(LoggedChatMessage.System::message),
+                  TextCodecs.f_flkmksis.fieldOf("message").forGetter(LoggedChatMessage.System::message),
                   Codecs.INSTANT.fieldOf("time_stamp").forGetter(LoggedChatMessage.System::timestamp)
                )
                .apply(instance, LoggedChatMessage.System::new)
diff -bur namedTargetSrc/net/minecraft/client/QuickPlayLogger.java namedSrc/net/minecraft/client/QuickPlayLogger.java
--- namedTargetSrc/net/minecraft/client/QuickPlayLogger.java	2023-12-31 04:03:00.340433232 +0000
+++ namedSrc/net/minecraft/client/QuickPlayLogger.java	2023-12-31 04:01:57.520689476 +0000
@@ -209,7 +209,7 @@
       public static final MapCodec<QuickPlayLogger.QuickPlayWorld> CODEC = RecordCodecBuilder.mapCodec(
          instance -> instance.group(
                   QuickPlayLogger.ConnectionType.CODEC.fieldOf("type").forGetter(QuickPlayLogger.QuickPlayWorld::type),
-                  Codecs.f_sumxgdro.fieldOf("id").forGetter(QuickPlayLogger.QuickPlayWorld::id),
+                  Codecs.ESCAPED_STRING.fieldOf("id").forGetter(QuickPlayLogger.QuickPlayWorld::id),
                   Codec.STRING.fieldOf("name").forGetter(QuickPlayLogger.QuickPlayWorld::name)
                )
                .apply(instance, QuickPlayLogger.QuickPlayWorld::new)
diff -bur namedTargetSrc/net/minecraft/client/resource/metadata/GuiResourceMetadata.java namedSrc/net/minecraft/client/resource/metadata/GuiResourceMetadata.java
--- namedTargetSrc/net/minecraft/client/resource/metadata/GuiResourceMetadata.java	2023-12-31 04:03:00.364433134 +0000
+++ namedSrc/net/minecraft/client/resource/metadata/GuiResourceMetadata.java	2023-12-31 04:01:57.548689361 +0000
@@ -24,7 +24,9 @@
     * @mapping {@literal named CODEC Lnet/minecraft/client/resource/metadata/GuiResourceMetadata;CODEC:Lcom/mojang/serialization/Codec;}
     */
    public static final Codec<GuiResourceMetadata> CODEC = RecordCodecBuilder.create(
-      instance -> instance.group(Codecs.m_aeryaqrd(SpriteScaling.CODEC, "scaling", SpriteScaling.DEFAULT).forGetter(GuiResourceMetadata::scaling))
+      instance -> instance.group(
+               Codecs.createStrictOptionalField(SpriteScaling.CODEC, "scaling", SpriteScaling.DEFAULT).forGetter(GuiResourceMetadata::scaling)
+            )
             .apply(instance, GuiResourceMetadata::new)
    );
    /**
diff -bur namedTargetSrc/net/minecraft/client/toast/AdvancementToast.java namedSrc/net/minecraft/client/toast/AdvancementToast.java
--- namedTargetSrc/net/minecraft/client/toast/AdvancementToast.java	2023-12-31 04:03:00.228433689 +0000
+++ namedSrc/net/minecraft/client/toast/AdvancementToast.java	2023-12-31 04:01:57.376690064 +0000
@@ -5,11 +5,11 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.advancement.AdvancementDisplay;
 import net.minecraft.advancement.AdvancementHolder;
+import net.minecraft.advancement.AdvancementType;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.OrderedText;
-import net.minecraft.text.component.AdvancementComponent;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
 
@@ -57,16 +57,16 @@
       graphics.drawGuiTexture(BACKGROUND_TEXTURE, 0, 0, this.getWidth(), this.getHeight());
       if (lv != null) {
          List<OrderedText> list = manager.getGame().textRenderer.wrapLines(lv.getTitle(), 125);
-         int i = lv.m_spcgkfjs() == AdvancementComponent.CHALLENGE ? 16746751 : 16776960;
+         int i = lv.getType() == AdvancementType.CHALLENGE ? 16746751 : 16776960;
          if (list.size() == 1) {
-            graphics.drawText(manager.getGame().textRenderer, lv.m_spcgkfjs().getToast(), 30, 7, i | 0xFF000000, false);
+            graphics.drawText(manager.getGame().textRenderer, lv.getType().getToast(), 30, 7, i | 0xFF000000, false);
             graphics.drawText(manager.getGame().textRenderer, (OrderedText)list.get(0), 30, 18, -1, false);
          } else {
             int j = 1500;
             float f = 300.0F;
             if (startTime < 1500L) {
                int k = MathHelper.floor(MathHelper.clamp((float)(1500L - startTime) / 300.0F, 0.0F, 1.0F) * 255.0F) << 24 | 67108864;
-               graphics.drawText(manager.getGame().textRenderer, lv.m_spcgkfjs().getToast(), 30, 11, i | k, false);
+               graphics.drawText(manager.getGame().textRenderer, lv.getType().getToast(), 30, 11, i | k, false);
             } else {
                int m = MathHelper.floor(MathHelper.clamp((float)(startTime - 1500L) / 300.0F, 0.0F, 1.0F) * 252.0F) << 24 | 67108864;
                int n = this.getHeight() / 2 - list.size() * 9 / 2;
@@ -80,7 +80,7 @@
 
          if (!this.soundPlayed && startTime > 0L) {
             this.soundPlayed = true;
-            if (lv.m_spcgkfjs() == AdvancementComponent.CHALLENGE) {
+            if (lv.getType() == AdvancementType.CHALLENGE) {
                manager.getGame().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.UI_TOAST_CHALLENGE_COMPLETE, 1.0F, 1.0F));
             }
          }
diff -bur namedTargetSrc/net/minecraft/command/argument/TextArgumentType.java namedSrc/net/minecraft/command/argument/TextArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/TextArgumentType.java	2023-12-31 04:03:00.344433216 +0000
+++ namedSrc/net/minecraft/command/argument/TextArgumentType.java	2023-12-31 04:01:57.524689459 +0000
@@ -9,8 +9,8 @@
 import java.util.Collection;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.Text;
+import net.minecraft.text.TextCodecs;
 import net.minecraft.unmapped.C_lirdakbw;
-import net.minecraft.unmapped.C_qrzzgymy;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_aluvpfjr}
@@ -58,7 +58,7 @@
     */
    public Text parse(StringReader reader) throws CommandSyntaxException {
       try {
-         return C_lirdakbw.m_pbxfhdmc(reader, C_qrzzgymy.f_flkmksis);
+         return C_lirdakbw.m_pbxfhdmc(reader, TextCodecs.f_flkmksis);
       } catch (Exception var4) {
          String string = var4.getCause() != null ? var4.getCause().getMessage() : var4.getMessage();
          throw INVALID_COMPONENT_EXCEPTION.createWithContext(reader, string);
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2023-12-31 04:03:00.392433020 +0000
+++ namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2023-12-31 04:01:57.572689263 +0000
@@ -11,6 +11,7 @@
 import net.minecraft.advancement.AdvancementHolder;
 import net.minecraft.advancement.AdvancementRequirements;
 import net.minecraft.advancement.AdvancementRewards;
+import net.minecraft.advancement.AdvancementType;
 import net.minecraft.advancement.criterion.ChanneledLightningCriterionTrigger;
 import net.minecraft.advancement.criterion.InventoryChangedCriterionTrigger;
 import net.minecraft.advancement.criterion.ItemUsedOnLocationCriterionTrigger;
@@ -63,7 +64,6 @@
 import net.minecraft.registry.tag.EntityTypeTags;
 import net.minecraft.registry.tag.ItemTags;
 import net.minecraft.text.Text;
-import net.minecraft.text.component.AdvancementComponent;
 import net.minecraft.unmapped.C_pdvqqjua;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
@@ -173,12 +173,12 @@
    @Override
    public void generate(HolderLookup.Provider provider, Consumer<AdvancementHolder> advancementConsumer) {
       AdvancementHolder lv = Advancement.Builder.create()
-         .m_mopntkkx(
+         .display(
             Items.MAP,
             Text.translatable("advancements.adventure.root.title"),
             Text.translatable("advancements.adventure.root.description"),
             new Identifier("textures/gui/advancements/backgrounds/adventure.png"),
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             false,
             false,
             false
@@ -189,12 +189,12 @@
          .build(advancementConsumer, "adventure/root");
       AdvancementHolder lv2 = Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Blocks.RED_BED,
             Text.translatable("advancements.adventure.sleep_in_bed.title"),
             Text.translatable("advancements.adventure.sleep_in_bed.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -204,12 +204,12 @@
       buildAdventuringTime(advancementConsumer, lv2, MultiNoiseBiomeSourceParameterList.Preset.OVERWORLD);
       AdvancementHolder lv3 = Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Items.EMERALD,
             Text.translatable("advancements.adventure.trade.title"),
             Text.translatable("advancements.adventure.trade.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -218,12 +218,12 @@
          .build(advancementConsumer, "adventure/trade");
       Advancement.Builder.create()
          .parent(lv3)
-         .m_mopntkkx(
+         .display(
             Items.EMERALD,
             Text.translatable("advancements.adventure.trade_at_world_height.title"),
             Text.translatable("advancements.adventure.trade_at_world_height.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -238,12 +238,12 @@
       AdvancementHolder lv4 = m_hxwqoqup(lv, advancementConsumer, ENEMY_MOBS);
       AdvancementHolder lv5 = Advancement.Builder.create()
          .parent(lv4)
-         .m_mopntkkx(
+         .display(
             Items.BOW,
             Text.translatable("advancements.adventure.shoot_arrow.title"),
             Text.translatable("advancements.adventure.shoot_arrow.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -262,12 +262,12 @@
          .build(advancementConsumer, "adventure/shoot_arrow");
       AdvancementHolder lv6 = Advancement.Builder.create()
          .parent(lv4)
-         .m_mopntkkx(
+         .display(
             Items.TRIDENT,
             Text.translatable("advancements.adventure.throw_trident.title"),
             Text.translatable("advancements.adventure.throw_trident.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -286,12 +286,12 @@
          .build(advancementConsumer, "adventure/throw_trident");
       Advancement.Builder.create()
          .parent(lv6)
-         .m_mopntkkx(
+         .display(
             Items.TRIDENT,
             Text.translatable("advancements.adventure.very_very_frightening.title"),
             Text.translatable("advancements.adventure.very_very_frightening.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -300,12 +300,12 @@
          .build(advancementConsumer, "adventure/very_very_frightening");
       Advancement.Builder.create()
          .parent(lv3)
-         .m_mopntkkx(
+         .display(
             Blocks.CARVED_PUMPKIN,
             Text.translatable("advancements.adventure.summon_iron_golem.title"),
             Text.translatable("advancements.adventure.summon_iron_golem.description"),
             null,
-            AdvancementComponent.GOAL,
+            AdvancementType.GOAL,
             true,
             true,
             false
@@ -314,12 +314,12 @@
          .build(advancementConsumer, "adventure/summon_iron_golem");
       Advancement.Builder.create()
          .parent(lv5)
-         .m_mopntkkx(
+         .display(
             Items.ARROW,
             Text.translatable("advancements.adventure.sniper_duel.title"),
             Text.translatable("advancements.adventure.sniper_duel.description"),
             null,
-            AdvancementComponent.CHALLENGE,
+            AdvancementType.CHALLENGE,
             true,
             true,
             false
@@ -335,12 +335,12 @@
          .build(advancementConsumer, "adventure/sniper_duel");
       Advancement.Builder.create()
          .parent(lv4)
-         .m_mopntkkx(
+         .display(
             Items.TOTEM_OF_UNDYING,
             Text.translatable("advancements.adventure.totem_of_undying.title"),
             Text.translatable("advancements.adventure.totem_of_undying.description"),
             null,
-            AdvancementComponent.GOAL,
+            AdvancementType.GOAL,
             true,
             true,
             false
@@ -349,12 +349,12 @@
          .build(advancementConsumer, "adventure/totem_of_undying");
       AdvancementHolder lv7 = Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Items.CROSSBOW,
             Text.translatable("advancements.adventure.ol_betsy.title"),
             Text.translatable("advancements.adventure.ol_betsy.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -363,12 +363,12 @@
          .build(advancementConsumer, "adventure/ol_betsy");
       Advancement.Builder.create()
          .parent(lv7)
-         .m_mopntkkx(
+         .display(
             Items.CROSSBOW,
             Text.translatable("advancements.adventure.whos_the_pillager_now.title"),
             Text.translatable("advancements.adventure.whos_the_pillager_now.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -377,12 +377,12 @@
          .build(advancementConsumer, "adventure/whos_the_pillager_now");
       Advancement.Builder.create()
          .parent(lv7)
-         .m_mopntkkx(
+         .display(
             Items.CROSSBOW,
             Text.translatable("advancements.adventure.two_birds_one_arrow.title"),
             Text.translatable("advancements.adventure.two_birds_one_arrow.description"),
             null,
-            AdvancementComponent.CHALLENGE,
+            AdvancementType.CHALLENGE,
             true,
             true,
             false
@@ -397,12 +397,12 @@
          .build(advancementConsumer, "adventure/two_birds_one_arrow");
       Advancement.Builder.create()
          .parent(lv7)
-         .m_mopntkkx(
+         .display(
             Items.CROSSBOW,
             Text.translatable("advancements.adventure.arbalistic.title"),
             Text.translatable("advancements.adventure.arbalistic.description"),
             null,
-            AdvancementComponent.CHALLENGE,
+            AdvancementType.CHALLENGE,
             true,
             true,
             true
@@ -412,12 +412,12 @@
          .build(advancementConsumer, "adventure/arbalistic");
       AdvancementHolder lv8 = Advancement.Builder.create()
          .parent(lv)
-         .m_htowdhjv(
+         .display(
             Raid.getOminousBanner(),
             Text.translatable("advancements.adventure.voluntary_exile.title"),
             Text.translatable("advancements.adventure.voluntary_exile.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             true
@@ -431,12 +431,12 @@
          .build(advancementConsumer, "adventure/voluntary_exile");
       Advancement.Builder.create()
          .parent(lv8)
-         .m_htowdhjv(
+         .display(
             Raid.getOminousBanner(),
             Text.translatable("advancements.adventure.hero_of_the_village.title"),
             Text.translatable("advancements.adventure.hero_of_the_village.description"),
             null,
-            AdvancementComponent.CHALLENGE,
+            AdvancementType.CHALLENGE,
             true,
             true,
             true
@@ -446,12 +446,12 @@
          .build(advancementConsumer, "adventure/hero_of_the_village");
       Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Blocks.HONEY_BLOCK.asItem(),
             Text.translatable("advancements.adventure.honey_block_slide.title"),
             Text.translatable("advancements.adventure.honey_block_slide.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -460,12 +460,12 @@
          .build(advancementConsumer, "adventure/honey_block_slide");
       Advancement.Builder.create()
          .parent(lv5)
-         .m_mopntkkx(
+         .display(
             Blocks.TARGET.asItem(),
             Text.translatable("advancements.adventure.bullseye.title"),
             Text.translatable("advancements.adventure.bullseye.description"),
             null,
-            AdvancementComponent.CHALLENGE,
+            AdvancementType.CHALLENGE,
             true,
             true,
             false
@@ -483,12 +483,12 @@
          .build(advancementConsumer, "adventure/bullseye");
       Advancement.Builder.create()
          .parent(lv2)
-         .m_mopntkkx(
+         .display(
             Items.LEATHER_BOOTS,
             Text.translatable("advancements.adventure.walk_on_powder_snow_with_leather_boots.title"),
             Text.translatable("advancements.adventure.walk_on_powder_snow_with_leather_boots.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -499,12 +499,12 @@
          .build(advancementConsumer, "adventure/walk_on_powder_snow_with_leather_boots");
       Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Items.LIGHTNING_ROD,
             Text.translatable("advancements.adventure.lightning_rod_with_villager_no_fire.title"),
             Text.translatable("advancements.adventure.lightning_rod_with_villager_no_fire.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -516,12 +516,12 @@
          .build(advancementConsumer, "adventure/lightning_rod_with_villager_no_fire");
       AdvancementHolder lv9 = Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Items.SPYGLASS,
             Text.translatable("advancements.adventure.spyglass_at_parrot.title"),
             Text.translatable("advancements.adventure.spyglass_at_parrot.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -530,12 +530,12 @@
          .build(advancementConsumer, "adventure/spyglass_at_parrot");
       AdvancementHolder lv10 = Advancement.Builder.create()
          .parent(lv9)
-         .m_mopntkkx(
+         .display(
             Items.SPYGLASS,
             Text.translatable("advancements.adventure.spyglass_at_ghast.title"),
             Text.translatable("advancements.adventure.spyglass_at_ghast.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -544,12 +544,12 @@
          .build(advancementConsumer, "adventure/spyglass_at_ghast");
       Advancement.Builder.create()
          .parent(lv2)
-         .m_mopntkkx(
+         .display(
             Items.JUKEBOX,
             Text.translatable("advancements.adventure.play_jukebox_in_meadows.title"),
             Text.translatable("advancements.adventure.play_jukebox_in_meadows.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -564,12 +564,12 @@
          .build(advancementConsumer, "adventure/play_jukebox_in_meadows");
       Advancement.Builder.create()
          .parent(lv10)
-         .m_mopntkkx(
+         .display(
             Items.SPYGLASS,
             Text.translatable("advancements.adventure.spyglass_at_dragon.title"),
             Text.translatable("advancements.adventure.spyglass_at_dragon.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -578,12 +578,12 @@
          .build(advancementConsumer, "adventure/spyglass_at_dragon");
       Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Items.WATER_BUCKET,
             Text.translatable("advancements.adventure.fall_from_world_height.title"),
             Text.translatable("advancements.adventure.fall_from_world_height.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -599,12 +599,12 @@
          .build(advancementConsumer, "adventure/fall_from_world_height");
       Advancement.Builder.create()
          .parent(lv4)
-         .m_mopntkkx(
+         .display(
             Blocks.SCULK_CATALYST,
             Text.translatable("advancements.adventure.kill_mob_near_sculk_catalyst.title"),
             Text.translatable("advancements.adventure.kill_mob_near_sculk_catalyst.description"),
             null,
-            AdvancementComponent.CHALLENGE,
+            AdvancementType.CHALLENGE,
             true,
             true,
             false
@@ -613,12 +613,12 @@
          .build(advancementConsumer, "adventure/kill_mob_near_sculk_catalyst");
       Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Blocks.SCULK_SENSOR,
             Text.translatable("advancements.adventure.avoid_vibration.title"),
             Text.translatable("advancements.adventure.avoid_vibration.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -627,12 +627,12 @@
          .build(advancementConsumer, "adventure/avoid_vibration");
       AdvancementHolder lv11 = requireSalvagedSherd(Advancement.Builder.create())
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Items.BRUSH,
             Text.translatable("advancements.adventure.salvage_sherd.title"),
             Text.translatable("advancements.adventure.salvage_sherd.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -640,14 +640,14 @@
          .build(advancementConsumer, "adventure/salvage_sherd");
       Advancement.Builder.create()
          .parent(lv11)
-         .m_htowdhjv(
+         .display(
             DecoratedPotBlockEntity.m_qjeeptjd(
                new DecoratedPotBlockEntity.Sherds(Items.BRICK, Items.HEART_POTTERY_SHERD, Items.BRICK, Items.EXPLORER_POTTERY_SHERD)
             ),
             Text.translatable("advancements.adventure.craft_decorated_pot_using_only_sherds.title"),
             Text.translatable("advancements.adventure.craft_decorated_pot_using_only_sherds.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -667,12 +667,12 @@
          .build(advancementConsumer, "adventure/craft_decorated_pot_using_only_sherds");
       AdvancementHolder lv12 = requireTrimmedArmor(Advancement.Builder.create())
          .parent(lv)
-         .m_htowdhjv(
+         .display(
             new ItemStack(Items.DUNE_ARMOR_TRIM_SMITHING_TEMPLATE),
             Text.translatable("advancements.adventure.trim_with_any_armor_pattern.title"),
             Text.translatable("advancements.adventure.trim_with_any_armor_pattern.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -680,12 +680,12 @@
          .build(advancementConsumer, "adventure/trim_with_any_armor_pattern");
       requireAllExclusiveTrimmedArmor(Advancement.Builder.create())
          .parent(lv12)
-         .m_htowdhjv(
+         .display(
             new ItemStack(Items.SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE),
             Text.translatable("advancements.adventure.trim_with_all_exclusive_armor_patterns.title"),
             Text.translatable("advancements.adventure.trim_with_all_exclusive_armor_patterns.description"),
             null,
-            AdvancementComponent.CHALLENGE,
+            AdvancementType.CHALLENGE,
             true,
             true,
             false
@@ -694,12 +694,12 @@
          .build(advancementConsumer, "adventure/trim_with_all_exclusive_armor_patterns");
       Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Items.CHISELED_BOOKSHELF,
             Text.translatable("advancements.adventure.read_power_from_chiseled_bookshelf.title"),
             Text.translatable("advancements.adventure.read_power_from_chiseled_bookshelf.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -716,12 +716,12 @@
    public static AdvancementHolder m_hxwqoqup(AdvancementHolder arg, Consumer<AdvancementHolder> consumer, List<EntityType<?>> list) {
       AdvancementHolder lv = appendKillAllEnemyMobsCriterion(Advancement.Builder.create(), list)
          .parent(arg)
-         .m_mopntkkx(
+         .display(
             Items.IRON_SWORD,
             Text.translatable("advancements.adventure.kill_a_mob.title"),
             Text.translatable("advancements.adventure.kill_a_mob.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -730,12 +730,12 @@
          .build(consumer, "adventure/kill_a_mob");
       appendKillAllEnemyMobsCriterion(Advancement.Builder.create(), list)
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Items.DIAMOND_SWORD,
             Text.translatable("advancements.adventure.kill_all_mobs.title"),
             Text.translatable("advancements.adventure.kill_all_mobs.description"),
             null,
-            AdvancementComponent.CHALLENGE,
+            AdvancementType.CHALLENGE,
             true,
             true,
             false
@@ -841,12 +841,12 @@
    protected static void buildAdventuringTime(Consumer<AdvancementHolder> exporter, AdvancementHolder parent, MultiNoiseBiomeSourceParameterList.Preset preset) {
       appendEnterAllBiomesCriterion(Advancement.Builder.create(), preset.m_vzbcawto().toList())
          .parent(parent)
-         .m_mopntkkx(
+         .display(
             Items.DIAMOND_BOOTS,
             Text.translatable("advancements.adventure.adventuring_time.title"),
             Text.translatable("advancements.adventure.adventuring_time.description"),
             null,
-            AdvancementComponent.CHALLENGE,
+            AdvancementType.CHALLENGE,
             true,
             true,
             false
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/EndAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/EndAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/EndAdvancementTabGenerator.java	2023-12-31 04:03:00.244433624 +0000
+++ namedSrc/net/minecraft/data/server/advancement/EndAdvancementTabGenerator.java	2023-12-31 04:01:57.396689983 +0000
@@ -4,6 +4,7 @@
 import net.minecraft.advancement.Advancement;
 import net.minecraft.advancement.AdvancementHolder;
 import net.minecraft.advancement.AdvancementRewards;
+import net.minecraft.advancement.AdvancementType;
 import net.minecraft.advancement.criterion.ChangedDimensionCriterionTrigger;
 import net.minecraft.advancement.criterion.EnterBlockCriterionTrigger;
 import net.minecraft.advancement.criterion.InventoryChangedCriterionTrigger;
@@ -20,7 +21,6 @@
 import net.minecraft.predicate.entity.LocationPredicate;
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.text.Text;
-import net.minecraft.text.component.AdvancementComponent;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.structure.BuiltInStructures;
@@ -36,12 +36,12 @@
    @Override
    public void generate(HolderLookup.Provider provider, Consumer<AdvancementHolder> advancementConsumer) {
       AdvancementHolder lv = Advancement.Builder.create()
-         .m_mopntkkx(
+         .display(
             Blocks.END_STONE,
             Text.translatable("advancements.end.root.title"),
             Text.translatable("advancements.end.root.description"),
             new Identifier("textures/gui/advancements/backgrounds/end.png"),
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             false,
             false,
             false
@@ -50,12 +50,12 @@
          .build(advancementConsumer, "end/root");
       AdvancementHolder lv2 = Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Blocks.DRAGON_HEAD,
             Text.translatable("advancements.end.kill_dragon.title"),
             Text.translatable("advancements.end.kill_dragon.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -64,12 +64,12 @@
          .build(advancementConsumer, "end/kill_dragon");
       AdvancementHolder lv3 = Advancement.Builder.create()
          .parent(lv2)
-         .m_mopntkkx(
+         .display(
             Items.ENDER_PEARL,
             Text.translatable("advancements.end.enter_end_gateway.title"),
             Text.translatable("advancements.end.enter_end_gateway.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -78,12 +78,12 @@
          .build(advancementConsumer, "end/enter_end_gateway");
       Advancement.Builder.create()
          .parent(lv2)
-         .m_mopntkkx(
+         .display(
             Items.END_CRYSTAL,
             Text.translatable("advancements.end.respawn_dragon.title"),
             Text.translatable("advancements.end.respawn_dragon.description"),
             null,
-            AdvancementComponent.GOAL,
+            AdvancementType.GOAL,
             true,
             true,
             false
@@ -92,12 +92,12 @@
          .build(advancementConsumer, "end/respawn_dragon");
       AdvancementHolder lv4 = Advancement.Builder.create()
          .parent(lv3)
-         .m_mopntkkx(
+         .display(
             Blocks.PURPUR_BLOCK,
             Text.translatable("advancements.end.find_end_city.title"),
             Text.translatable("advancements.end.find_end_city.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -106,12 +106,12 @@
          .build(advancementConsumer, "end/find_end_city");
       Advancement.Builder.create()
          .parent(lv2)
-         .m_mopntkkx(
+         .display(
             Items.DRAGON_BREATH,
             Text.translatable("advancements.end.dragon_breath.title"),
             Text.translatable("advancements.end.dragon_breath.description"),
             null,
-            AdvancementComponent.GOAL,
+            AdvancementType.GOAL,
             true,
             true,
             false
@@ -120,12 +120,12 @@
          .build(advancementConsumer, "end/dragon_breath");
       Advancement.Builder.create()
          .parent(lv4)
-         .m_mopntkkx(
+         .display(
             Items.SHULKER_SHELL,
             Text.translatable("advancements.end.levitate.title"),
             Text.translatable("advancements.end.levitate.description"),
             null,
-            AdvancementComponent.CHALLENGE,
+            AdvancementType.CHALLENGE,
             true,
             true,
             false
@@ -135,12 +135,12 @@
          .build(advancementConsumer, "end/levitate");
       Advancement.Builder.create()
          .parent(lv4)
-         .m_mopntkkx(
+         .display(
             Items.ELYTRA,
             Text.translatable("advancements.end.elytra.title"),
             Text.translatable("advancements.end.elytra.description"),
             null,
-            AdvancementComponent.GOAL,
+            AdvancementType.GOAL,
             true,
             true,
             false
@@ -149,12 +149,12 @@
          .build(advancementConsumer, "end/elytra");
       Advancement.Builder.create()
          .parent(lv2)
-         .m_mopntkkx(
+         .display(
             Blocks.DRAGON_EGG,
             Text.translatable("advancements.end.dragon_egg.title"),
             Text.translatable("advancements.end.dragon_egg.description"),
             null,
-            AdvancementComponent.GOAL,
+            AdvancementType.GOAL,
             true,
             true,
             false
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java	2023-12-31 04:03:00.236433656 +0000
+++ namedSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java	2023-12-31 04:01:57.384690032 +0000
@@ -11,6 +11,7 @@
 import net.minecraft.advancement.AdvancementHolder;
 import net.minecraft.advancement.AdvancementRequirements;
 import net.minecraft.advancement.AdvancementRewards;
+import net.minecraft.advancement.AdvancementType;
 import net.minecraft.advancement.criterion.BeeNestDestroyedCriterionTrigger;
 import net.minecraft.advancement.criterion.BredAnimalsCriterionTrigger;
 import net.minecraft.advancement.criterion.ConsumeItemCriterionTrigger;
@@ -45,7 +46,6 @@
 import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.registry.tag.ItemTags;
 import net.minecraft.text.Text;
-import net.minecraft.text.component.AdvancementComponent;
 import net.minecraft.util.Identifier;
 
 /**
@@ -154,12 +154,12 @@
    @Override
    public void generate(HolderLookup.Provider provider, Consumer<AdvancementHolder> advancementConsumer) {
       AdvancementHolder lv = Advancement.Builder.create()
-         .m_mopntkkx(
+         .display(
             Blocks.HAY_BLOCK,
             Text.translatable("advancements.husbandry.root.title"),
             Text.translatable("advancements.husbandry.root.description"),
             new Identifier("textures/gui/advancements/backgrounds/husbandry.png"),
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             false,
             false,
             false
@@ -168,12 +168,12 @@
          .build(advancementConsumer, "husbandry/root");
       AdvancementHolder lv2 = Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Items.WHEAT,
             Text.translatable("advancements.husbandry.plant_seed.title"),
             Text.translatable("advancements.husbandry.plant_seed.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -189,12 +189,12 @@
          .build(advancementConsumer, "husbandry/plant_seed");
       AdvancementHolder lv3 = Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Items.WHEAT,
             Text.translatable("advancements.husbandry.breed_an_animal.title"),
             Text.translatable("advancements.husbandry.breed_an_animal.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -205,12 +205,12 @@
       createBreedAllAnimalsAdvancement(lv3, advancementConsumer, BREEDABLE_ENTITIES.stream(), EGG_LAYING_ENTITIES.stream());
       appendEatAllFoodCriterion(Advancement.Builder.create())
          .parent(lv2)
-         .m_mopntkkx(
+         .display(
             Items.APPLE,
             Text.translatable("advancements.husbandry.balanced_diet.title"),
             Text.translatable("advancements.husbandry.balanced_diet.description"),
             null,
-            AdvancementComponent.CHALLENGE,
+            AdvancementType.CHALLENGE,
             true,
             true,
             false
@@ -219,12 +219,12 @@
          .build(advancementConsumer, "husbandry/balanced_diet");
       Advancement.Builder.create()
          .parent(lv2)
-         .m_mopntkkx(
+         .display(
             Items.NETHERITE_HOE,
             Text.translatable("advancements.husbandry.netherite_hoe.title"),
             Text.translatable("advancements.husbandry.netherite_hoe.description"),
             null,
-            AdvancementComponent.CHALLENGE,
+            AdvancementType.CHALLENGE,
             true,
             true,
             false
@@ -234,12 +234,12 @@
          .build(advancementConsumer, "husbandry/obtain_netherite_hoe");
       AdvancementHolder lv4 = Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Items.LEAD,
             Text.translatable("advancements.husbandry.tame_an_animal.title"),
             Text.translatable("advancements.husbandry.tame_an_animal.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -249,12 +249,12 @@
       AdvancementHolder lv5 = appendCatchAllFishCriterion(Advancement.Builder.create())
          .parent(lv)
          .merger(AdvancementRequirements.RequirementMerger.ANY)
-         .m_mopntkkx(
+         .display(
             Items.FISHING_ROD,
             Text.translatable("advancements.husbandry.fishy_business.title"),
             Text.translatable("advancements.husbandry.fishy_business.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -263,12 +263,12 @@
       AdvancementHolder lv6 = appendBucketAllFishCriterion(Advancement.Builder.create())
          .parent(lv5)
          .merger(AdvancementRequirements.RequirementMerger.ANY)
-         .m_mopntkkx(
+         .display(
             Items.PUFFERFISH_BUCKET,
             Text.translatable("advancements.husbandry.tactical_fishing.title"),
             Text.translatable("advancements.husbandry.tactical_fishing.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -281,12 +281,12 @@
             Registries.ITEM.getId(Items.AXOLOTL_BUCKET).getPath(),
             FilledBucketCriterionTrigger.Conditions.create(ItemPredicate.Builder.create().items(Items.AXOLOTL_BUCKET))
          )
-         .m_mopntkkx(
+         .display(
             Items.AXOLOTL_BUCKET,
             Text.translatable("advancements.husbandry.axolotl_in_a_bucket.title"),
             Text.translatable("advancements.husbandry.axolotl_in_a_bucket.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -295,12 +295,12 @@
       Advancement.Builder.create()
          .parent(lv7)
          .putCriteria("kill_axolotl_target", EffectsChangedCriterionTrigger.Conditions.createSource(EntityPredicate.Builder.create().type(EntityType.AXOLOTL)))
-         .m_mopntkkx(
+         .display(
             Items.TROPICAL_FISH_BUCKET,
             Text.translatable("advancements.husbandry.kill_axolotl_target.title"),
             Text.translatable("advancements.husbandry.kill_axolotl_target.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -308,12 +308,12 @@
          .build(advancementConsumer, "husbandry/kill_axolotl_target");
       appendTameAllCatVariantsCriterion(Advancement.Builder.create())
          .parent(lv4)
-         .m_mopntkkx(
+         .display(
             Items.COD,
             Text.translatable("advancements.husbandry.complete_catalogue.title"),
             Text.translatable("advancements.husbandry.complete_catalogue.description"),
             null,
-            AdvancementComponent.CHALLENGE,
+            AdvancementType.CHALLENGE,
             true,
             true,
             false
@@ -329,12 +329,12 @@
                ItemPredicate.Builder.create().items(Items.GLASS_BOTTLE)
             )
          )
-         .m_mopntkkx(
+         .display(
             Items.HONEY_BOTTLE,
             Text.translatable("advancements.husbandry.safely_harvest_honey.title"),
             Text.translatable("advancements.husbandry.safely_harvest_honey.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -342,12 +342,12 @@
          .build(advancementConsumer, "husbandry/safely_harvest_honey");
       AdvancementHolder lv9 = Advancement.Builder.create()
          .parent(lv8)
-         .m_mopntkkx(
+         .display(
             Items.HONEYCOMB,
             Text.translatable("advancements.husbandry.wax_on.title"),
             Text.translatable("advancements.husbandry.wax_on.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -363,12 +363,12 @@
          .build(advancementConsumer, "husbandry/wax_on");
       Advancement.Builder.create()
          .parent(lv9)
-         .m_mopntkkx(
+         .display(
             Items.STONE_AXE,
             Text.translatable("advancements.husbandry.wax_off.title"),
             Text.translatable("advancements.husbandry.wax_off.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -388,12 +388,12 @@
             Registries.ITEM.getId(Items.TADPOLE_BUCKET).getPath(),
             FilledBucketCriterionTrigger.Conditions.create(ItemPredicate.Builder.create().items(Items.TADPOLE_BUCKET))
          )
-         .m_mopntkkx(
+         .display(
             Items.TADPOLE_BUCKET,
             Text.translatable("advancements.husbandry.tadpole_in_a_bucket.title"),
             Text.translatable("advancements.husbandry.tadpole_in_a_bucket.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -401,12 +401,12 @@
          .build(advancementConsumer, "husbandry/tadpole_in_a_bucket");
       AdvancementHolder lv11 = appendLeashAllFrogTypesCriterion(Advancement.Builder.create())
          .parent(lv10)
-         .m_mopntkkx(
+         .display(
             Items.LEAD,
             Text.translatable("advancements.husbandry.leash_all_frog_variants.title"),
             Text.translatable("advancements.husbandry.leash_all_frog_variants.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -414,12 +414,12 @@
          .build(advancementConsumer, "husbandry/leash_all_frog_variants");
       Advancement.Builder.create()
          .parent(lv11)
-         .m_mopntkkx(
+         .display(
             Items.VERDANT_FROGLIGHT,
             Text.translatable("advancements.husbandry.froglights.title"),
             Text.translatable("advancements.husbandry.froglights.description"),
             null,
-            AdvancementComponent.CHALLENGE,
+            AdvancementType.CHALLENGE,
             true,
             true,
             false
@@ -438,12 +438,12 @@
                NumberRange.IntRange.exactly(3)
             )
          )
-         .m_mopntkkx(
+         .display(
             Blocks.BEE_NEST,
             Text.translatable("advancements.husbandry.silk_touch_nest.title"),
             Text.translatable("advancements.husbandry.silk_touch_nest.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -451,12 +451,12 @@
          .build(advancementConsumer, "husbandry/silk_touch_nest");
       Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Items.OAK_BOAT,
             Text.translatable("advancements.husbandry.ride_a_boat_with_a_goat.title"),
             Text.translatable("advancements.husbandry.ride_a_boat_with_a_goat.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -471,12 +471,12 @@
          .build(advancementConsumer, "husbandry/ride_a_boat_with_a_goat");
       Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Items.GLOW_INK_SAC,
             Text.translatable("advancements.husbandry.make_a_sign_glow.title"),
             Text.translatable("advancements.husbandry.make_a_sign_glow.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             false
@@ -491,12 +491,12 @@
          .build(advancementConsumer, "husbandry/make_a_sign_glow");
       AdvancementHolder lv12 = Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Items.COOKIE,
             Text.translatable("advancements.husbandry.allay_deliver_item_to_player.title"),
             Text.translatable("advancements.husbandry.allay_deliver_item_to_player.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             true
@@ -510,12 +510,12 @@
          .build(advancementConsumer, "husbandry/allay_deliver_item_to_player");
       Advancement.Builder.create()
          .parent(lv12)
-         .m_mopntkkx(
+         .display(
             Items.NOTE_BLOCK,
             Text.translatable("advancements.husbandry.allay_deliver_cake_to_note_block.title"),
             Text.translatable("advancements.husbandry.allay_deliver_cake_to_note_block.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             true
@@ -530,12 +530,12 @@
          .build(advancementConsumer, "husbandry/allay_deliver_cake_to_note_block");
       AdvancementHolder lv13 = Advancement.Builder.create()
          .parent(lv)
-         .m_mopntkkx(
+         .display(
             Items.SNIFFER_EGG,
             Text.translatable("advancements.husbandry.obtain_sniffer_egg.title"),
             Text.translatable("advancements.husbandry.obtain_sniffer_egg.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             true
@@ -544,12 +544,12 @@
          .build(advancementConsumer, "husbandry/obtain_sniffer_egg");
       AdvancementHolder lv14 = Advancement.Builder.create()
          .parent(lv13)
-         .m_mopntkkx(
+         .display(
             Items.TORCHFLOWER_SEEDS,
             Text.translatable("advancements.husbandry.feed_snifflet.title"),
             Text.translatable("advancements.husbandry.feed_snifflet.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             true
@@ -568,12 +568,12 @@
          .build(advancementConsumer, "husbandry/feed_snifflet");
       Advancement.Builder.create()
          .parent(lv14)
-         .m_mopntkkx(
+         .display(
             Items.PITCHER_POD,
             Text.translatable("advancements.husbandry.plant_any_sniffer_seed.title"),
             Text.translatable("advancements.husbandry.plant_any_sniffer_seed.description"),
             null,
-            AdvancementComponent.TASK,
+            AdvancementType.TASK,
             true,
             true,
             true
@@ -593,12 +593,12 @@
    ) {
       return appendBreedAllEntitiesCriterion(Advancement.Builder.create(), instantBreedingAnimals, eggLayingAnimals)
          .parent(advancement)
-         .m_mopntkkx(
+         .display(
             Items.GOLDEN_CARROT,
             Text.translatable("advancements.husbandry.breed_all_animals.title"),
             Text.translatable("advancements.husbandry.breed_all_animals.description"),
             null,
-            AdvancementComponent.CHALLENGE,
+            AdvancementType.CHALLENGE,
             true,
             true,
             false


The remaining diff is too long!

-Original file line number
+Diff line change
@@ -1,8 +1,10 @@
     CLASS net/minecraft/unmapped/C_kdwyuhdb net/minecraft/advancement/Advancement
+    	FIELD f_bpbcihch CRITERIA_CODEC Lcom/mojang/serialization/Codec;
     	FIELD f_cbfwvpgh parent Ljava/util/Optional;
     	FIELD f_emngvigd requirements Lnet/minecraft/unmapped/C_wbfyxnvb;
     	FIELD f_eqsfnrjr criteria Ljava/util/Map;
     	FIELD f_eykiurph display Ljava/util/Optional;
+    	FIELD f_ncipkedb CODEC Lcom/mojang/serialization/Codec;
     	FIELD f_njhcraol name Ljava/util/Optional;
     	FIELD f_nwvdgawt sendsTelemetryEvent Z
     	FIELD f_uhuyjydl rewards Lnet/minecraft/unmapped/C_wptigggq;
@@ Expand All @@
     		ARG 6 sendsTelemetryEvent
     	METHOD equals (Ljava/lang/Object;)Z
     		ARG 1 o
+    	METHOD m_ddukknkz (Ljava/util/Map;)Lcom/mojang/serialization/DataResult;
+    		ARG 0 map
     	METHOD m_ggypmlkv sendsTelemetryEvent ()Z
+    	METHOD m_gzpyltqd (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_cpwnhism;)Lnet/minecraft/unmapped/C_cpwnhism;
+    		ARG 1 style
     	METHOD m_hpxxrezd fromPacket (Lnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_kdwyuhdb;
     		ARG 0 buf
     	METHOD m_htjukofs parent ()Ljava/util/Optional;
+    	METHOD m_jvmczssc validateCriteria (Lnet/minecraft/unmapped/C_jtpvewkp;Lnet/minecraft/unmapped/C_srnkfpki;)V
+    		ARG 1 reporter
+    		ARG 2 dataLookup
+    	METHOD m_kxwbsmcw (Lnet/minecraft/unmapped/C_jtpvewkp;Lnet/minecraft/unmapped/C_srnkfpki;Ljava/lang/String;Lnet/minecraft/unmapped/C_rzypsigz;)V
+    		ARG 2 key
+    		ARG 3 criterion
+    	METHOD m_nlkunzez (Lnet/minecraft/unmapped/C_kdwyuhdb;)Ljava/util/Optional;
+    		ARG 0 advancement
+    	METHOD m_nltrnngb (Lnet/minecraft/unmapped/C_idfydwco;Lnet/minecraft/unmapped/C_bvqakncm;)V
+    		ARG 1 display
     	METHOD m_ofikdsfj rewards ()Lnet/minecraft/unmapped/C_wptigggq;
+    	METHOD m_pzwagfwo validate (Lnet/minecraft/unmapped/C_kdwyuhdb;)Lcom/mojang/serialization/DataResult;
+    		ARG 0 advancement
     	METHOD m_swogstqz getText (Lnet/minecraft/unmapped/C_unoypvme;)Lnet/minecraft/unmapped/C_rdaqiwdt;
     		ARG 0 advancementHolder
+    	METHOD m_szjzyjkp (Lnet/minecraft/unmapped/C_kdwyuhdb;Lnet/minecraft/unmapped/C_wbfyxnvb;)Lnet/minecraft/unmapped/C_kdwyuhdb;
+    		ARG 1 criterionKey
+    	METHOD m_tbqwjxrn (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/unmapped/C_wptigggq;Ljava/util/Map;Ljava/util/Optional;Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_kdwyuhdb;
+    		ARG 0 id
+    		ARG 1 display
+    		ARG 2 rewards
+    		ARG 3 criteria
+    		ARG 4 requirements
+    		ARG 5 sendsTelemetryEvent
     	METHOD m_vdmpoqil requirements ()Lnet/minecraft/unmapped/C_wbfyxnvb;
     	METHOD m_vfnevnhx name ()Ljava/util/Optional;
     	METHOD m_wngxatfp display ()Ljava/util/Optional;
     	METHOD m_wsihwdxp empty ()Z
     	METHOD m_xazdqguv criteria ()Ljava/util/Map;
     	METHOD m_xbcnitcp createText (Lnet/minecraft/unmapped/C_bvqakncm;)Lnet/minecraft/unmapped/C_rdaqiwdt;
     		ARG 0 display
+    	METHOD m_xeyczyky (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+    		ARG 0 instance
     	METHOD m_xfimowjn toPacket (Lnet/minecraft/unmapped/C_idfydwco;)V
     		ARG 1 buf
     	CLASS C_dukbjvrv Builder
@@ Expand All @@
     		FIELD f_wpvukjwy merger Lnet/minecraft/unmapped/C_wbfyxnvb$C_huwvdbdx;
     		METHOD m_ckalgnkc merger (Lnet/minecraft/unmapped/C_wbfyxnvb$C_huwvdbdx;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;
     			ARG 1 merger
+    		METHOD m_htowdhjv display (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_onnxqlfg;ZZZ)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;
+    			ARG 2 title
+    			ARG 3 description
+    			ARG 4 background
+    			ARG 5 type
+    			ARG 6 showToast
+    			ARG 7 announceToChat
+    			ARG 8 hidden
     		METHOD m_jlhvlwgp display (Lnet/minecraft/unmapped/C_bvqakncm;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;
     			ARG 1 display
     		METHOD m_liavgrzl putCriteria (Ljava/lang/String;Lnet/minecraft/unmapped/C_rzypsigz;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;
     			ARG 1 name
     			ARG 2 criterion
+    		METHOD m_mopntkkx display (Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_onnxqlfg;ZZZ)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;
+    			ARG 1 item
+    			ARG 2 title
+    			ARG 3 description
+    			ARG 4 background
+    			ARG 5 type
+    			ARG 6 showToast
+    			ARG 7 announceToChat
+    			ARG 8 hidden
     		METHOD m_mshncpue requirements (Lnet/minecraft/unmapped/C_wbfyxnvb;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;
     			ARG 1 requirements
     		METHOD m_ofouvzjr parent (Lnet/minecraft/unmapped/C_unoypvme;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,7 +1,10 @@
     CLASS net/minecraft/unmapped/C_rzypsigz net/minecraft/advancement/AdvancementCriterion
     	FIELD f_bjqitkog trigger Lnet/minecraft/unmapped/C_mysyaxfs;
+    	FIELD f_yezbocli MAP_CODEC Lcom/mojang/serialization/MapCodec;
     	FIELD f_yiamcoxx conditions Lnet/minecraft/unmapped/C_zkhebbek;
     	METHOD m_djfutiin trigger ()Lnet/minecraft/unmapped/C_mysyaxfs;
+    	METHOD m_hdyzfdac (Lnet/minecraft/unmapped/C_mysyaxfs;Lnet/minecraft/unmapped/C_zkhebbek;)Lnet/minecraft/unmapped/C_rzypsigz;
+    		ARG 1 conditions
     	METHOD m_iuvjqrcn conditions ()Lnet/minecraft/unmapped/C_zkhebbek;
-    	METHOD m_uxddutmc (Lnet/minecraft/unmapped/C_mysyaxfs;)Lcom/mojang/serialization/Codec;
+    	METHOD m_uxddutmc getCodec (Lnet/minecraft/unmapped/C_mysyaxfs;)Lcom/mojang/serialization/Codec;
     		ARG 0 trigger

-Original file line number
+Diff line change
@@ Expand Up @@
     	FIELD f_jzkkgjeq y F
     	FIELD f_mbfqtzfa showToast Z
     	FIELD f_pmsclssl description Lnet/minecraft/unmapped/C_rdaqiwdt;
+    	FIELD f_qnsndlza type Lnet/minecraft/unmapped/C_onnxqlfg;
     	FIELD f_rmagsfyq hidden Z
     	FIELD f_rrekahiq title Lnet/minecraft/unmapped/C_rdaqiwdt;
     	FIELD f_wlsljbis icon Lnet/minecraft/unmapped/C_sddaxwyk;
     	FIELD f_zkcdxfqd background Ljava/util/Optional;
     	METHOD m_asmgeqym fromPacket (Lnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_bvqakncm;
     		ARG 0 buf
     	METHOD m_axxsgbbh getTitle ()Lnet/minecraft/unmapped/C_rdaqiwdt;
+    	METHOD m_erpazfvp (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+    		ARG 0 instance
     	METHOD m_gxawxbty getDescription ()Lnet/minecraft/unmapped/C_rdaqiwdt;
     	METHOD m_hhbgzigh shouldAnnounceToChat ()Z
     	METHOD m_jhcmytjo toPacket (Lnet/minecraft/unmapped/C_idfydwco;)V
     		ARG 1 buf
     	METHOD m_pzykhctp getY ()F
     	METHOD m_qepjmlpk getX ()F
     	METHOD m_rrhjbvlh getBackground ()Ljava/util/Optional;
+    	METHOD m_spcgkfjs getType ()Lnet/minecraft/unmapped/C_onnxqlfg;
     	METHOD m_szkyblby shouldShowToast ()Z
     	METHOD m_taxswuiw setPos (FF)V
     		ARG 1 x
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,11 +1,16 @@
     CLASS net/minecraft/unmapped/C_wbfyxnvb net/minecraft/advancement/AdvancementRequirements
     	FIELD f_tkcwteeq EMPTY Lnet/minecraft/unmapped/C_wbfyxnvb;
     	FIELD f_wauysoso requirements Ljava/util/List;
+    	METHOD m_bnmpyfyz validate (Ljava/util/Set;)Lcom/mojang/serialization/DataResult;
+    		ARG 1 requirements
     	METHOD m_ehrayjiz length ()I
     	METHOD m_gzkxpsoh anyMatch (Ljava/util/List;Ljava/util/function/Predicate;)Z
+    		ARG 0 requirements
     		ARG 1 predicate
     	METHOD m_hdmfabfc allMatch (Ljava/util/function/Predicate;)Z
     		ARG 1 predicate
+    	METHOD m_hzrzuiom (Lnet/minecraft/unmapped/C_idfydwco;Ljava/util/List;)V
+    		ARG 1 requirements
     	METHOD m_jupbcyte anyOf (Ljava/util/Collection;)Lnet/minecraft/unmapped/C_wbfyxnvb;
     		ARG 0 collection
     	METHOD m_nxtypetc toSet ()Ljava/util/Set;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    CLASS net/minecraft/unmapped/C_onnxqlfg net/minecraft/text/component/AdvancementComponent
+    CLASS net/minecraft/unmapped/C_onnxqlfg net/minecraft/advancement/AdvancementType
     	FIELD f_vfxofohl toast Lnet/minecraft/unmapped/C_rdaqiwdt;
     	FIELD f_wnqqatxq formatting Lnet/minecraft/unmapped/C_tnezalvh;
     	FIELD f_xzhurgdz key Ljava/lang/String;
@@ Expand Down @@

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 `50aab4a`

github-actions bot commented on `50aab4a` Dec 31, 2023

github-actions bot commented on `50aab4a` Dec 31, 2023

github-actions bot commented on `50aab4a` Dec 31, 2023

Commit

There are no files selected for viewing

3 comments on commit 50aab4a

github-actions bot commented on 50aab4a Dec 31, 2023

Choose a reason for hiding this comment

github-actions bot commented on 50aab4a Dec 31, 2023

Choose a reason for hiding this comment

github-actions bot commented on 50aab4a Dec 31, 2023

Choose a reason for hiding this comment

3 comments on commit `50aab4a`

github-actions bot commented on `50aab4a` Dec 31, 2023

github-actions bot commented on `50aab4a` Dec 31, 2023

github-actions bot commented on `50aab4a` Dec 31, 2023