Skip to content

Commit

Permalink
add mappings for LocationPredicate.Builder fields and setter methods (#…
Browse files Browse the repository at this point in the history 
…680)

* add mappings for LocationPredicate.Builder fields and setter methods

* Update mappings/net/minecraft/predicate/entity/LocationPredicate.mapping

Co-authored-by: Will <[email protected]>

* Update mappings/net/minecraft/predicate/entity/LocationPredicate.mapping

Co-authored-by: Will <[email protected]>

* Update mappings/net/minecraft/predicate/entity/LocationPredicate.mapping

Co-authored-by: Will <[email protected]>

* Update mappings/net/minecraft/predicate/entity/LocationPredicate.mapping

Co-authored-by: Will <[email protected]>

* Update mappings/net/minecraft/predicate/entity/LocationPredicate.mapping

Co-authored-by: Will <[email protected]>

---------

Co-authored-by: Will <[email protected]>
  • Loading branch information
@TheLadyLuthien @supersaiyansubtlety
TheLadyLuthien and supersaiyansubtlety authored Jan 6, 2025
1 parent 50b9667 commit a87dacd
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions mappings/net/minecraft/predicate/entity/LocationPredicate.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ CLASS net/minecraft/unmapped/C_ypvebgnl net/minecraft/predicate/entity/LocationP
ARG 2 x
ARG 4 y
ARG 6 z
METHOD m_yciuynsr (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
CLASS C_gcijxrat PositionRange
METHOD m_bhbuulsr (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD m_gjufjxkq z ()Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;
METHOD m_msjfphrw test (DDD)Z
ARG 1 x
Expand All @@ -22,16 +26,22 @@ CLASS net/minecraft/unmapped/C_ypvebgnl net/minecraft/predicate/entity/LocationP
ARG 2 z
METHOD m_zitylnny x ()Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;
CLASS C_okutxubz Builder
FIELD f_botkjajr structures Ljava/util/Optional;
FIELD f_dnpxvyqk fluid Ljava/util/Optional;
FIELD f_dsialmis block Ljava/util/Optional;
FIELD f_fhwlhfkz z Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;
FIELD f_hgqqelqt biomes Ljava/util/Optional;
FIELD f_hyqkkafq x Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;
FIELD f_pdhpiijj canSeeSky Ljava/util/Optional;
FIELD f_qasujtxj dimension Ljava/util/Optional;
FIELD f_vgpejppz y Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;
FIELD f_xezgeelf light Ljava/util/Optional;
FIELD f_yijrvruc smokey Ljava/util/Optional;
METHOD m_diuvndpc light (Lnet/minecraft/unmapped/C_ammgthmo$C_kadjxsdu;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
ARG 1 builder
METHOD m_dkdenbmq structures (Lnet/minecraft/unmapped/C_odfnijdo;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
ARG 1 structures

METHOD m_dsbslmxh z (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
ARG 1 z
METHOD m_dxvijcur fluid (Lnet/minecraft/unmapped/C_fjarvlro$C_ahtnwewe;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
Expand All @@ -43,9 +53,17 @@ CLASS net/minecraft/unmapped/C_ypvebgnl net/minecraft/predicate/entity/LocationP
METHOD m_hibprzfm block (Lnet/minecraft/unmapped/C_uuwlfkxz$C_nlqurblw;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
ARG 1 builder
METHOD m_idydmjlz create ()Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
METHOD m_jklecett structure (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
ARG 0 structure
METHOD m_lsutwusu biome (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
ARG 0 biome
METHOD m_mkgxbhcm canSeeSky (Z)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
ARG 1 canSeeSky
METHOD m_onghaezr dimension (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
ARG 1 dimension
METHOD m_qkyrpclg createWithY (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
METHOD m_sizzovtm biomes (Lnet/minecraft/unmapped/C_odfnijdo;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
ARG 1 biomes
METHOD m_umdksspn x (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
ARG 1 x
METHOD m_xrknskqs createWithWorld (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
Expand Down

1 comment on commit a87dacd

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

With commit a87dacd, 7 file(s) were updated with 37 line(s) added and 36 removed compared to the latest Quilt Mappings version.

View the diff here: 
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	2025-01-06 01:28:45.561831742 +0000
+++ namedSrc/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.java	2025-01-06 01:27:30.642000452 +0000
@@ -573,7 +573,7 @@
             "play_jukebox_in_meadows",
             ItemUsedOnLocationCriterionTrigger.Conditions.createUseOnBlock(
                LocationPredicate.Builder.create()
-                  .m_sizzovtm(HolderSet.createDirect(provider.getLookupOrThrow(RegistryKeys.BIOME).getHolderOrThrow(Biomes.MEADOW)))
+                  .biomes(HolderSet.createDirect(provider.getLookupOrThrow(RegistryKeys.BIOME).getHolderOrThrow(Biomes.MEADOW)))
                   .block(BlockPredicate.Builder.create().blocks(Blocks.JUKEBOX)),
                ItemPredicate.Builder.create().m_bbzmjpaw(ItemSubPredicateTypes.JUKEBOX_PLAYABLE, C_wxjcdmgq.m_jbkzlrxk())
             )
@@ -760,9 +760,7 @@
          .putCriteria(
             "minecraft_trials_edition",
             LocationCriterionTrigger.Conditions.create(
-               LocationPredicate.Builder.m_jklecett(
-                  provider.getLookupOrThrow(RegistryKeys.STRUCTURE_FEATURE).getHolderOrThrow(BuiltInStructures.TRIAL_CHAMBERS)
-               )
+               LocationPredicate.Builder.structure(provider.getLookupOrThrow(RegistryKeys.STRUCTURE_FEATURE).getHolderOrThrow(BuiltInStructures.TRIAL_CHAMBERS))
             )
          )
          .build(advancementConsumer, "adventure/minecraft_trials_edition");
@@ -1101,7 +1099,7 @@
       HolderProvider<Biome> lv = biomeProvider.getLookupOrThrow(RegistryKeys.BIOME);
 
       for (RegistryKey<Biome> lv2 : biomes) {
-         task.putCriteria(lv2.getValue().toString(), LocationCriterionTrigger.Conditions.create(LocationPredicate.Builder.m_lsutwusu(lv.getHolderOrThrow(lv2))));
+         task.putCriteria(lv2.getValue().toString(), LocationCriterionTrigger.Conditions.create(LocationPredicate.Builder.biome(lv.getHolderOrThrow(lv2))));
       }
 
       return task;
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	2025-01-06 01:28:45.365832171 +0000
+++ namedSrc/net/minecraft/data/server/advancement/EndAdvancementTabGenerator.java	2025-01-06 01:27:30.422001144 +0000
@@ -106,7 +106,7 @@
          .putCriteria(
             "in_city",
             LocationCriterionTrigger.Conditions.create(
-               LocationPredicate.Builder.m_jklecett(provider.getLookupOrThrow(RegistryKeys.STRUCTURE_FEATURE).getHolderOrThrow(BuiltInStructures.END_CITY))
+               LocationPredicate.Builder.structure(provider.getLookupOrThrow(RegistryKeys.STRUCTURE_FEATURE).getHolderOrThrow(BuiltInStructures.END_CITY))
             )
          )
          .build(advancementConsumer, "end/find_end_city");
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/NetherAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/NetherAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/NetherAdvancementTabGenerator.java	2025-01-06 01:28:45.325832258 +0000
+++ namedSrc/net/minecraft/data/server/advancement/NetherAdvancementTabGenerator.java	2025-01-06 01:27:30.366001320 +0000
@@ -149,7 +149,7 @@
          .putCriteria(
             "fortress",
             LocationCriterionTrigger.Conditions.create(
-               LocationPredicate.Builder.m_jklecett(provider.getLookupOrThrow(RegistryKeys.STRUCTURE_FEATURE).getHolderOrThrow(BuiltInStructures.FORTRESS))
+               LocationPredicate.Builder.structure(provider.getLookupOrThrow(RegistryKeys.STRUCTURE_FEATURE).getHolderOrThrow(BuiltInStructures.FORTRESS))
             )
          )
          .build(advancementConsumer, "nether/find_fortress");
@@ -529,7 +529,7 @@
          .putCriteria(
             "bastion",
             LocationCriterionTrigger.Conditions.create(
-               LocationPredicate.Builder.m_jklecett(
+               LocationPredicate.Builder.structure(
                   provider.getLookupOrThrow(RegistryKeys.STRUCTURE_FEATURE).getHolderOrThrow(BuiltInStructures.BASTION_REMNANT)
                )
             )
diff -bur namedTargetSrc/net/minecraft/data/server/advancement/StoryAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/StoryAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/StoryAdvancementTabGenerator.java	2025-01-06 01:28:45.469831943 +0000
+++ namedSrc/net/minecraft/data/server/advancement/StoryAdvancementTabGenerator.java	2025-01-06 01:27:30.562000704 +0000
@@ -262,7 +262,7 @@
          .putCriteria(
             "in_stronghold",
             LocationCriterionTrigger.Conditions.create(
-               LocationPredicate.Builder.m_jklecett(provider.getLookupOrThrow(RegistryKeys.STRUCTURE_FEATURE).getHolderOrThrow(BuiltInStructures.STRONGHOLD))
+               LocationPredicate.Builder.structure(provider.getLookupOrThrow(RegistryKeys.STRUCTURE_FEATURE).getHolderOrThrow(BuiltInStructures.STRONGHOLD))
             )
          )
          .build(advancementConsumer, "story/follow_ender_eye");
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/FishingLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/FishingLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/FishingLootTableGenerator.java	2025-01-06 01:28:45.313832284 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/FishingLootTableGenerator.java	2025-01-06 01:27:30.350001370 +0000
@@ -82,7 +82,7 @@
                         .conditionally(
                            LocationCheckLootCondition.builder(
                               LocationPredicate.Builder.create()
-                                 .m_sizzovtm(
+                                 .biomes(
                                     HolderSet.createDirect(
                                        lv.getHolderOrThrow(Biomes.JUNGLE), lv.getHolderOrThrow(Biomes.SPARSE_JUNGLE), lv.getHolderOrThrow(Biomes.BAMBOO_JUNGLE)
                                     )
diff -bur namedTargetSrc/net/minecraft/enchantment/Enchantments.java namedSrc/net/minecraft/enchantment/Enchantments.java
--- namedTargetSrc/net/minecraft/enchantment/Enchantments.java	2025-01-06 01:28:45.369832162 +0000
+++ namedSrc/net/minecraft/enchantment/Enchantments.java	2025-01-06 01:27:30.426001132 +0000
@@ -1028,7 +1028,7 @@
                AllOfLootCondition.builder(
                   WeatherCheckLootCondition.create().thundering(true),
                   EntityPropertiesLootCondition.builder(
-                     LootContext.EntityTarget.THIS, EntityPredicate.Builder.create().location(LocationPredicate.Builder.create().m_mkgxbhcm(true))
+                     LootContext.EntityTarget.THIS, EntityPredicate.Builder.create().location(LocationPredicate.Builder.create().canSeeSky(true))
                   ),
                   EntityPropertiesLootCondition.builder(LootContext.EntityTarget.DIRECT_ATTACKER, EntityPredicate.Builder.create().type(EntityType.TRIDENT))
                )
@@ -1042,7 +1042,7 @@
                AllOfLootCondition.builder(
                   WeatherCheckLootCondition.create().thundering(true),
                   EntityPropertiesLootCondition.builder(LootContext.EntityTarget.THIS, EntityPredicate.Builder.create().type(EntityType.TRIDENT)),
-                  LocationCheckLootCondition.builder(LocationPredicate.Builder.create().m_mkgxbhcm(true)),
+                  LocationCheckLootCondition.builder(LocationPredicate.Builder.create().canSeeSky(true)),
                   BlockStatePropertyLootCondition.builder(Blocks.LIGHTNING_ROD)
                )
             )
diff -bur namedTargetSrc/net/minecraft/predicate/entity/LocationPredicate.java namedSrc/net/minecraft/predicate/entity/LocationPredicate.java
--- namedTargetSrc/net/minecraft/predicate/entity/LocationPredicate.java	2025-01-06 01:28:45.465831953 +0000
+++ namedSrc/net/minecraft/predicate/entity/LocationPredicate.java	2025-01-06 01:27:30.558000716 +0000
@@ -111,13 +111,15 @@
        */
       private NumberRange.FloatRange z = NumberRange.FloatRange.ANY;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_hgqqelqt Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;f_hgqqelqt:Ljava/util/Optional;}
+       * @mapping {@literal named biomes Lnet/minecraft/predicate/entity/LocationPredicate$Builder;biomes:Ljava/util/Optional;}
        */
-      private Optional<HolderSet<Biome>> f_hgqqelqt = Optional.empty();
+      private Optional<HolderSet<Biome>> biomes = Optional.empty();
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_botkjajr Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;f_botkjajr:Ljava/util/Optional;}
+       * @mapping {@literal named structures Lnet/minecraft/predicate/entity/LocationPredicate$Builder;structures:Ljava/util/Optional;}
        */
-      private Optional<HolderSet<StructureFeature>> f_botkjajr = Optional.empty();
+      private Optional<HolderSet<StructureFeature>> structures = Optional.empty();
       /**
        * @mapping {@literal hashed f_qasujtxj Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;f_qasujtxj:Ljava/util/Optional;}
        * @mapping {@literal named dimension Lnet/minecraft/predicate/entity/LocationPredicate$Builder;dimension:Ljava/util/Optional;}
@@ -144,9 +146,10 @@
        */
       private Optional<FluidPredicate> fluid = Optional.empty();
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_pdhpiijj Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;f_pdhpiijj:Ljava/util/Optional;}
+       * @mapping {@literal named canSeeSky Lnet/minecraft/predicate/entity/LocationPredicate$Builder;canSeeSky:Ljava/util/Optional;}
        */
-      private Optional<Boolean> f_pdhpiijj = Optional.empty();
+      private Optional<Boolean> canSeeSky = Optional.empty();
 
       /**
        * @mapping {@literal hashed m_idydmjlz Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;m_idydmjlz()Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;}
@@ -157,10 +160,11 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_lsutwusu Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;m_lsutwusu(Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;}
+       * @mapping {@literal named biome Lnet/minecraft/predicate/entity/LocationPredicate$Builder;biome(Lnet/minecraft/registry/Holder;)Lnet/minecraft/predicate/entity/LocationPredicate$Builder;}
        */
-      public static LocationPredicate.Builder m_lsutwusu(Holder<Biome> arg) {
-         return create().m_sizzovtm(HolderSet.createDirect(arg));
+      public static LocationPredicate.Builder biome(Holder<Biome> biome) {
+         return create().biomes(HolderSet.createDirect(biome));
       }
 
       /**
@@ -172,10 +176,11 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_jklecett Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;m_jklecett(Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;}
+       * @mapping {@literal named structure Lnet/minecraft/predicate/entity/LocationPredicate$Builder;structure(Lnet/minecraft/registry/Holder;)Lnet/minecraft/predicate/entity/LocationPredicate$Builder;}
        */
-      public static LocationPredicate.Builder m_jklecett(Holder<StructureFeature> arg) {
-         return create().m_dkdenbmq(HolderSet.createDirect(arg));
+      public static LocationPredicate.Builder structure(Holder<StructureFeature> structure) {
+         return create().structures(HolderSet.createDirect(structure));
       }
 
       /**
@@ -215,19 +220,19 @@
 
       /**
        * @mapping {@literal hashed m_sizzovtm Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;m_sizzovtm(Lnet/minecraft/unmapped/C_odfnijdo;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;}
-       * @mapping {@literal named m_sizzovtm Lnet/minecraft/predicate/entity/LocationPredicate$Builder;m_sizzovtm(Lnet/minecraft/registry/HolderSet;)Lnet/minecraft/predicate/entity/LocationPredicate$Builder;}
+       * @mapping {@literal named biomes Lnet/minecraft/predicate/entity/LocationPredicate$Builder;biomes(Lnet/minecraft/registry/HolderSet;)Lnet/minecraft/predicate/entity/LocationPredicate$Builder;}
        */
-      public LocationPredicate.Builder m_sizzovtm(HolderSet<Biome> value) {
-         this.f_hgqqelqt = Optional.of(value);
+      public LocationPredicate.Builder biomes(HolderSet<Biome> biomes) {
+         this.biomes = Optional.of(biomes);
          return this;
       }
 
       /**
        * @mapping {@literal hashed m_dkdenbmq Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;m_dkdenbmq(Lnet/minecraft/unmapped/C_odfnijdo;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;}
-       * @mapping {@literal named m_dkdenbmq Lnet/minecraft/predicate/entity/LocationPredicate$Builder;m_dkdenbmq(Lnet/minecraft/registry/HolderSet;)Lnet/minecraft/predicate/entity/LocationPredicate$Builder;}
+       * @mapping {@literal named structures Lnet/minecraft/predicate/entity/LocationPredicate$Builder;structures(Lnet/minecraft/registry/HolderSet;)Lnet/minecraft/predicate/entity/LocationPredicate$Builder;}
        */
-      public LocationPredicate.Builder m_dkdenbmq(HolderSet<StructureFeature> value) {
-         this.f_botkjajr = Optional.of(value);
+      public LocationPredicate.Builder structures(HolderSet<StructureFeature> structures) {
+         this.structures = Optional.of(structures);
          return this;
       }
 
@@ -278,10 +283,10 @@
 
       /**
        * @mapping {@literal hashed m_mkgxbhcm Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;m_mkgxbhcm(Z)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;}
-       * @mapping {@literal named m_mkgxbhcm Lnet/minecraft/predicate/entity/LocationPredicate$Builder;m_mkgxbhcm(Z)Lnet/minecraft/predicate/entity/LocationPredicate$Builder;}
+       * @mapping {@literal named canSeeSky Lnet/minecraft/predicate/entity/LocationPredicate$Builder;canSeeSky(Z)Lnet/minecraft/predicate/entity/LocationPredicate$Builder;}
        */
-      public LocationPredicate.Builder m_mkgxbhcm(boolean b) {
-         this.f_pdhpiijj = Optional.of(b);
+      public LocationPredicate.Builder canSeeSky(boolean canSeeSky) {
+         this.canSeeSky = Optional.of(canSeeSky);
          return this;
       }
 
@@ -291,9 +296,7 @@
        */
       public LocationPredicate build() {
          Optional<LocationPredicate.PositionRange> optional = LocationPredicate.PositionRange.create(this.x, this.y, this.z);
-         return new LocationPredicate(
-            optional, this.f_hgqqelqt, this.f_botkjajr, this.dimension, this.smokey, this.light, this.block, this.fluid, this.f_pdhpiijj
-         );
+         return new LocationPredicate(optional, this.biomes, this.structures, this.dimension, this.smokey, this.light, this.block, this.fluid, this.canSeeSky);
       }
    }

Please sign in to comment.