From 1fc3291ea557ae42f2f50d52f39b4d40ede3fab8 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sat, 16 Mar 2024 23:19:53 +0900 Subject: [PATCH] 24w11a stuff (#3818) * 24w11a stuff * Fix javadoc, ArmorMaterial name * Merge Shnupbups' PR * Update mappings/net/minecraft/data/Main.mapping Co-authored-by: Shnupbups --------- Co-authored-by: Shnupbups --- .../minecraft/block/HeavyCoreBlock.mapping | 2 +- .../entity/OneTwentyOneBannerPatterns.mapping | 2 +- .../net/minecraft/block/entity/Sherds.mapping | 2 + .../minecraft/client/gl/Framebuffer.mapping | 2 +- .../gui/RotatingCubeMapRenderer.mapping | 4 +- .../client/gui/screen/Screen.mapping | 2 + .../client/gui/widget/EntryListWidget.mapping | 6 ++- .../client/gui/widget/TabButtonWidget.mapping | 10 ++--- mappings/net/minecraft/data/Main.mapping | 2 + .../datafixer/schema/Schema3822.mapping | 2 + .../net/minecraft/entity/LivingEntity.mapping | 1 + .../attribute/EntityAttributeInstance.mapping | 6 +-- .../entity/effect/StatusEffect.mapping | 10 ++--- .../effect/StatusEffectInstance.mapping | 2 +- .../entity/passive/WolfVariants.mapping | 2 +- .../ExplosiveProjectileEntity.mapping | 2 +- .../net/minecraft/item/ArmorMaterial.mapping | 45 ++----------------- .../OneTwentyOneArmorTrimPatterns.mapping | 2 +- .../function/SetBookCoverLootFunction.mapping | 8 ++-- .../SetComponentsLootFunction.mapping | 2 + .../SetFireworkExplosionLootFunction.mapping | 14 +++--- .../function/SetFireworksLootFunction.mapping | 14 +++--- .../SetWritableBookPagesLootFunction.mapping | 10 ++--- .../SetWrittenBookPagesLootFunction.mapping | 10 ++--- .../c2s/common/CustomPayloadC2SPacket.mapping | 4 ++ .../s2c/common/CustomPayloadS2CPacket.mapping | 2 + .../EntityEffectParticleEffect.mapping | 8 ++-- ...ate.mapping => EntitySubPredicate.mapping} | 2 +- .../entity/EntitySubPredicateTypes.mapping | 13 +++--- ....mapping => ComponentSubPredicate.mapping} | 2 +- .../item/CustomDataPredicate.mapping | 4 +- .../predicate/item/DamagePredicate.mapping | 2 +- .../item/EnchantmentsPredicate.mapping | 14 +++--- .../predicate/item/ItemSubPredicate.mapping | 2 +- .../item/PotionContentsPredicate.mapping | 2 +- mappings/net/minecraft/util/Colors.mapping | 5 ++- .../collection/ListOperation.mapping} | 30 ++++++------- .../net/minecraft/util/math/BlockArea.mapping | 27 ----------- .../net/minecraft/util/math/BlockPos.mapping | 8 ++-- .../util/math/ImmutableBlockBox.mapping | 27 +++++++++++ .../util/shape/BitSetVoxelSet.mapping | 4 ++ unpick-definitions/colors.unpick | 2 +- 42 files changed, 153 insertions(+), 167 deletions(-) rename mappings/net/minecraft/predicate/entity/{TypeSpecificPredicate.mapping => EntitySubPredicate.mapping} (76%) rename mappings/net/minecraft/predicate/item/{ComponentPredicate.mapping => ComponentSubPredicate.mapping} (92%) rename mappings/net/minecraft/{loot/function/ListModifier.mapping => util/collection/ListOperation.mapping} (61%) delete mode 100644 mappings/net/minecraft/util/math/BlockArea.mapping create mode 100644 mappings/net/minecraft/util/math/ImmutableBlockBox.mapping diff --git a/mappings/net/minecraft/block/HeavyCoreBlock.mapping b/mappings/net/minecraft/block/HeavyCoreBlock.mapping index 1d89de0c1d..844f6007d9 100644 --- a/mappings/net/minecraft/block/HeavyCoreBlock.mapping +++ b/mappings/net/minecraft/block/HeavyCoreBlock.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_9366 net/minecraft/block/HeavyCoreBlock FIELD field_49831 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_49832 ORIENTATION Lnet/minecraft/class_2754; - FIELD field_49833 SHAPE Lnet/minecraft/class_265; + FIELD field_49833 OUTLINE_SHAPE Lnet/minecraft/class_265; diff --git a/mappings/net/minecraft/block/entity/OneTwentyOneBannerPatterns.mapping b/mappings/net/minecraft/block/entity/OneTwentyOneBannerPatterns.mapping index 250ec8f3fc..4cd2e33d89 100644 --- a/mappings/net/minecraft/block/entity/OneTwentyOneBannerPatterns.mapping +++ b/mappings/net/minecraft/block/entity/OneTwentyOneBannerPatterns.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_9367 net/minecraft/block/entity/OneTwentyOneBannerPatterns METHOD method_58189 bootstrap (Lnet/minecraft/class_7891;)V - ARG 0 registry + ARG 0 bannerPatternRegisterable diff --git a/mappings/net/minecraft/block/entity/Sherds.mapping b/mappings/net/minecraft/block/entity/Sherds.mapping index fff3b9cb3f..bb6d179e21 100644 --- a/mappings/net/minecraft/block/entity/Sherds.mapping +++ b/mappings/net/minecraft/block/entity/Sherds.mapping @@ -17,3 +17,5 @@ CLASS net/minecraft/class_8526 net/minecraft/block/entity/Sherds ARG 1 index METHOD method_51516 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_8526; ARG 0 nbt + METHOD method_57592 (Ljava/util/Optional;)Lnet/minecraft/class_1792; + ARG 0 item diff --git a/mappings/net/minecraft/client/gl/Framebuffer.mapping b/mappings/net/minecraft/client/gl/Framebuffer.mapping index 55b2f0256b..b86bc6c920 100644 --- a/mappings/net/minecraft/client/gl/Framebuffer.mapping +++ b/mappings/net/minecraft/client/gl/Framebuffer.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer ARG 3 getError METHOD method_1232 setTexFilter (IZ)V ARG 1 texFilter - ARG 2 forceUpdate + ARG 2 force METHOD method_1233 drawInternal (IIZ)V ARG 1 width ARG 2 height diff --git a/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping b/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping index c861d47bff..3e79fa31c0 100644 --- a/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping +++ b/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_766 net/minecraft/client/gui/RotatingCubeMapRenderer FIELD field_40511 yaw F FIELD field_4139 client Lnet/minecraft/class_310; FIELD field_4141 cubeMap Lnet/minecraft/class_751; - FIELD field_49905 PANORAMA_OVERLAY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_49905 OVERLAY_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_751;)V ARG 1 cubeMap METHOD method_3317 render (Lnet/minecraft/class_332;IIFF)V @@ -11,7 +11,7 @@ CLASS net/minecraft/class_766 net/minecraft/client/gui/RotatingCubeMapRenderer ARG 2 width ARG 3 height ARG 4 alpha - ARG 5 delta + ARG 5 tickDelta METHOD method_45780 wrapOnce (FF)F ARG 0 a ARG 1 b diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index 0856de9157..89ea084fb0 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -167,6 +167,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen COMMENT Called when the screen is displayed using {@link MinecraftClient#setScreen} COMMENT before {@link #init()} or {@link #initTabNavigation()} is called. METHOD method_50024 getMusic ()Lnet/minecraft/class_5195; + METHOD method_52221 (Ljava/lang/Runnable;)V + ARG 1 runnable METHOD method_52752 renderInGameBackground (Lnet/minecraft/class_332;)V COMMENT Renders the translucent background gradient used as the in-game screen background. ARG 1 context diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 098dcd279a..34b8447c14 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -68,7 +68,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 1 index METHOD method_25328 ensureVisible (Lnet/minecraft/class_350$class_351;)V ARG 1 entry - METHOD method_25329 getScrollbarPositionX ()I + METHOD method_25329 getScrollbarX ()I METHOD method_25330 removeEntry (Lnet/minecraft/class_350$class_351;)Z ARG 1 entry METHOD method_25331 getMaxScroll ()I @@ -128,6 +128,8 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 1 context METHOD method_53812 isSelectButton (I)Z ARG 1 button + METHOD method_57710 getBorderBoxLeft ()I + METHOD method_57711 getBorderBoxRight ()I METHOD method_57712 position (ILnet/minecraft/class_8132;)V ARG 1 width ARG 2 layout @@ -139,7 +141,9 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 3 y METHOD method_57715 drawMenuListBackground (Lnet/minecraft/class_332;)V ARG 1 context + METHOD method_57716 getScrollbarMarginX ()I METHOD method_57717 isScrollbarVisible ()Z + METHOD method_57718 getDefaultScrollbarX ()I CLASS class_351 Entry FIELD field_22752 parentList Lnet/minecraft/class_350; METHOD method_25343 render (Lnet/minecraft/class_332;IIIIIIIZF)V diff --git a/mappings/net/minecraft/client/gui/widget/TabButtonWidget.mapping b/mappings/net/minecraft/client/gui/widget/TabButtonWidget.mapping index 48efec6401..4962ca8ed5 100644 --- a/mappings/net/minecraft/client/gui/widget/TabButtonWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TabButtonWidget.mapping @@ -17,9 +17,9 @@ CLASS net/minecraft/class_8209 net/minecraft/client/gui/widget/TabButtonWidget ARG 2 textRenderer ARG 3 color METHOD method_49611 isCurrentTab ()Z - METHOD method_58230 drawBackgroundTexture (Lnet/minecraft/class_332;IIII)V + METHOD method_58230 renderBackgroundTexture (Lnet/minecraft/class_332;IIII)V ARG 1 context - ARG 2 x1 - ARG 3 y1 - ARG 4 x2 - ARG 5 y2 + ARG 2 left + ARG 3 top + ARG 4 right + ARG 5 bottom diff --git a/mappings/net/minecraft/data/Main.mapping b/mappings/net/minecraft/data/Main.mapping index dacbd8472f..32cf433b69 100644 --- a/mappings/net/minecraft/data/Main.mapping +++ b/mappings/net/minecraft/data/Main.mapping @@ -36,3 +36,5 @@ CLASS net/minecraft/data/Main ARG 0 outputx METHOD method_55309 (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_2474;Lnet/minecraft/class_7784;)Lnet/minecraft/class_8995; ARG 2 outputx + METHOD method_58266 (Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_2474;Lnet/minecraft/class_7784;)Lnet/minecraft/class_9382; + ARG 2 outputx diff --git a/mappings/net/minecraft/datafixer/schema/Schema3822.mapping b/mappings/net/minecraft/datafixer/schema/Schema3822.mapping index b34c5b0a67..910f7d5563 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema3822.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema3822.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_9352 net/minecraft/datafixer/schema/Schema3822 + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 6c55a69c75..d19f4f524b 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_42108 limbAnimator Lnet/minecraft/class_8080; FIELD field_45123 serverHeadYaw D FIELD field_45740 ACTIVE_EFFECTS_NBT_KEY Ljava/lang/String; + FIELD field_47757 prevScale F FIELD field_48826 syncedBodyArmorStack Lnet/minecraft/class_1799; FIELD field_49792 POTION_SWIRLS Lnet/minecraft/class_2940; FIELD field_6210 bodyTrackingIncrements I diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping index 1cc0842b95..b093824243 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping @@ -37,9 +37,9 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns COMMENT Computes this attribute's value, taking modifiers into account. COMMENT COMMENT

Attribute modifiers are applied in order by operation: - COMMENT

  • {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION ADDITION} // Adds the value of the modifier to the attribute's base value.
    • - COMMENT
  • {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#MULTIPLY_BASE MULTIPLY_BASE} // Multiplies the value of the modifier to the attributes base value, and then adds it to the total value.
    • - COMMENT
  • {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#MULTIPLY_TOTAL MULTIPLY_TOTAL} // Adds 1 to the value of the attribute modifier. Then multiplies the attribute's value by the total value of the attribute after addition and multiplication of the base value occur.
    • + COMMENT
    • {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADD_VALUE ADD_VALUE} // Adds the value of the modifier to the attribute's base value.
      • + COMMENT
    • {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADD_MULTIPLIED_BASE ADD_MULTIPLIED_BASE} // Multiplies the value of the modifier to the attributes base value, and then adds it to the total value.
      • + COMMENT
    • {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADD_MULTIPLIED_TOTAL ADD_MULTIPLIED_TOTAL} // Adds 1 to the value of the attribute modifier. Then multiplies the attribute's value by the total value of the attribute after addition and multiplication of the base value occur.
      • COMMENT
    METHOD method_27304 tryRemoveModifier (Ljava/util/UUID;)Z ARG 1 uuid diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index 966f1b4976..848143012d 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect FIELD field_18270 category Lnet/minecraft/class_4081; FIELD field_47738 fadeTicks I FIELD field_49789 AMBIENT_PARTICLE_ALPHA I - FIELD field_49790 particleEffectFactory Ljava/util/function/Function; + FIELD field_49790 particleFactory Ljava/util/function/Function; FIELD field_5883 translationKey Ljava/lang/String; FIELD field_5885 attributeModifiers Ljava/util/Map; FIELD field_5886 color I @@ -59,11 +59,11 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect ARG 2 amplifier METHOD method_5573 isBeneficial ()Z METHOD method_58145 (ILnet/minecraft/class_1293;)Lnet/minecraft/class_2394; - ARG 1 effectInstance - METHOD method_58146 createParticleEffect (Lnet/minecraft/class_1293;)Lnet/minecraft/class_2394; - ARG 1 effectInstance + ARG 1 effect + METHOD method_58146 createParticle (Lnet/minecraft/class_1293;)Lnet/minecraft/class_2394; + ARG 1 effect METHOD method_58147 (Lnet/minecraft/class_2394;Lnet/minecraft/class_1293;)Lnet/minecraft/class_2394; - ARG 1 effectInstance + ARG 1 effect CLASS class_8634 EffectAttributeModifierCreator FIELD comp_2182 uuid Ljava/util/UUID; FIELD comp_2183 baseValue D diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index 9c8ed04af8..84643a1be4 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -109,7 +109,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD method_56667 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1293$class_9195;)Lnet/minecraft/class_1293; ARG 1 parametersx METHOD method_56668 asParameters ()Lnet/minecraft/class_1293$class_9195; - METHOD method_58148 createParticleEffect ()Lnet/minecraft/class_2394; + METHOD method_58148 createParticle ()Lnet/minecraft/class_2394; CLASS class_9063 Fading COMMENT Computes the factor (multiplier) for effect fade-in and fade-out. COMMENT diff --git a/mappings/net/minecraft/entity/passive/WolfVariants.mapping b/mappings/net/minecraft/entity/passive/WolfVariants.mapping index 5f8f1bc04c..7b9ffeaa3e 100644 --- a/mappings/net/minecraft/entity/passive/WolfVariants.mapping +++ b/mappings/net/minecraft/entity/passive/WolfVariants.mapping @@ -22,4 +22,4 @@ CLASS net/minecraft/class_9347 net/minecraft/entity/passive/WolfVariants ARG 0 registry ARG 1 key ARG 2 textureName - ARG 3 biomeList + ARG 3 biomes diff --git a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping index 286b6d1aa2..243677ee08 100644 --- a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping @@ -26,7 +26,7 @@ CLASS net/minecraft/class_1668 net/minecraft/entity/projectile/ExplosiveProjecti ARG 9 world METHOD method_55053 getRaycastShapeType ()Lnet/minecraft/class_3959$class_3960; METHOD method_55583 getDragInWater ()F - METHOD method_58184 calculatePower (DDD)V + METHOD method_58184 setPower (DDD)V ARG 1 velocityX ARG 3 velocityY ARG 5 velocityZ diff --git a/mappings/net/minecraft/item/ArmorMaterial.mapping b/mappings/net/minecraft/item/ArmorMaterial.mapping index 66beb487a8..6d8b59e111 100644 --- a/mappings/net/minecraft/item/ArmorMaterial.mapping +++ b/mappings/net/minecraft/item/ArmorMaterial.mapping @@ -3,55 +3,16 @@ CLASS net/minecraft/class_1741 net/minecraft/item/ArmorMaterial COMMENT COMMENT

    COMMENT To view available vanilla armor materials, visit {@link ArmorMaterials}. - FIELD comp_2299 getEnchantability I - FIELD comp_2300 getEquipSound Lnet/minecraft/class_6880; - FIELD comp_2301 getRepairIngredient Ljava/util/function/Supplier; - FIELD comp_2303 getToughness F - FIELD comp_2304 getKnockbackResistance F + FIELD comp_2299 enchantability I FIELD field_48840 CODEC Lcom/mojang/serialization/Codec; - METHOD comp_2299 getEnchantability ()I - COMMENT Returns the base enchantment value used by {@link ArmorItem} with this material. - COMMENT - COMMENT

    - COMMENT By default, {@link ArmorItem} will override {@link Item#getEnchantability()} - COMMENT and delegate the call back to this method. - COMMENT - COMMENT

    - COMMENT A higher return value will result in better enchantment results when using an {@code Enchanting Table}. - COMMENT The highest enchantability value in vanilla is Netherite, at {@code 37}. - COMMENT - COMMENT @return the enchantment value sent back to {@link Item#getEnchantability()} for armor using this material - METHOD comp_2300 getEquipSound ()Lnet/minecraft/class_6880; - COMMENT @return the {@link SoundEvent} played when a {@link net.minecraft.entity.LivingEntity} equips an {@link ArmorItem} using this {@link ArmorMaterial} - METHOD comp_2301 getRepairIngredient ()Ljava/util/function/Supplier; - COMMENT Returns the {@link Ingredient} used to repair items using this {@link ArmorMaterial}. - COMMENT - COMMENT

    - COMMENT By default, {@link ArmorItem} will delegate {@link Item#canRepair(ItemStack, ItemStack)} - COMMENT back to this method. - COMMENT - COMMENT @return the {@link Ingredient} required to repair items with this {@link ArmorMaterial} - METHOD comp_2303 getToughness ()F - COMMENT Returns the toughness value of an {@link ArmorItem} piece using this {@link ArmorMaterial}. - COMMENT - COMMENT

    - COMMENT {@link ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_ARMOR_TOUGHNESS} - COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type. - COMMENT - COMMENT @return the toughness value of any {@link ArmorItem} using this {@link ArmorMaterial} - METHOD comp_2304 getKnockbackResistance ()F - COMMENT {@return the knockback resistance value of an {@link ArmorItem} piece using this {@link ArmorMaterial}} - COMMENT - COMMENT

    - COMMENT {@link ArmorItem} will cover the value returned here into the {@link net.minecraft.entity.attribute.EntityAttributes#GENERIC_KNOCKBACK_RESISTANCE} - COMMENT statistic with the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier type. + METHOD comp_2299 enchantability ()I METHOD method_48403 getProtection (Lnet/minecraft/class_1738$class_8051;)I COMMENT Returns the amount of armor protection points offered by an {@link ArmorItem} COMMENT using this {@link ArmorMaterial} while it is worn by a player. COMMENT COMMENT

    COMMENT The protection value returned here is applied as an {@link net.minecraft.entity.attribute.EntityAttributeModifier} - COMMENT to a player wearing the {@link ArmorItem} piece via the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADDITION} modifier. + COMMENT to a player wearing the {@link ArmorItem} piece via the {@link net.minecraft.entity.attribute.EntityAttributeModifier.Operation#ADD_VALUE} modifier. COMMENT COMMENT @return the amount of armor protection points offered by an {@link ArmorItem} with this {@link ArmorMaterial} ARG 1 type diff --git a/mappings/net/minecraft/item/trim/OneTwentyOneArmorTrimPatterns.mapping b/mappings/net/minecraft/item/trim/OneTwentyOneArmorTrimPatterns.mapping index d4d3e5c6bd..03dfcc4cbc 100644 --- a/mappings/net/minecraft/item/trim/OneTwentyOneArmorTrimPatterns.mapping +++ b/mappings/net/minecraft/item/trim/OneTwentyOneArmorTrimPatterns.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_9363 net/minecraft/item/trim/OneTwentyOneArmorTrimPatterns METHOD method_58185 bootstrap (Lnet/minecraft/class_7891;)V - ARG 0 registry + ARG 0 armorTrimPatternRegisterable diff --git a/mappings/net/minecraft/loot/function/SetBookCoverLootFunction.mapping b/mappings/net/minecraft/loot/function/SetBookCoverLootFunction.mapping index 4bf5df8fc8..e37e8ebe11 100644 --- a/mappings/net/minecraft/loot/function/SetBookCoverLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetBookCoverLootFunction.mapping @@ -9,12 +9,12 @@ CLASS net/minecraft/class_9374 net/minecraft/loot/function/SetBookCoverLootFunct ARG 3 author ARG 4 generation METHOD method_58200 apply (Lnet/minecraft/class_9302;)Lnet/minecraft/class_9302; - ARG 1 writtenBookContent + ARG 1 current METHOD method_58201 (Lnet/minecraft/class_9374;)Ljava/util/Optional; - ARG 0 lootFunction + ARG 0 function METHOD method_58202 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_58203 (Lnet/minecraft/class_9374;)Ljava/util/Optional; - ARG 0 lootFunction + ARG 0 function METHOD method_58204 (Lnet/minecraft/class_9374;)Ljava/util/Optional; - ARG 0 lootFunction + ARG 0 function diff --git a/mappings/net/minecraft/loot/function/SetComponentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetComponentsLootFunction.mapping index e57e159f05..b431347d88 100644 --- a/mappings/net/minecraft/loot/function/SetComponentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetComponentsLootFunction.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_9320 net/minecraft/loot/function/SetComponentsLootFunc METHOD (Ljava/util/List;Lnet/minecraft/class_9326;)V ARG 1 conditions ARG 2 changes + METHOD method_57649 (Lnet/minecraft/class_9320;)Lnet/minecraft/class_9326; + ARG 0 function METHOD method_57650 builder (Lnet/minecraft/class_9331;Ljava/lang/Object;)Lnet/minecraft/class_120$class_121; ARG 0 componentType ARG 1 value diff --git a/mappings/net/minecraft/loot/function/SetFireworkExplosionLootFunction.mapping b/mappings/net/minecraft/loot/function/SetFireworkExplosionLootFunction.mapping index 28b3327a27..5edf517291 100644 --- a/mappings/net/minecraft/loot/function/SetFireworkExplosionLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetFireworkExplosionLootFunction.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_9375 net/minecraft/loot/function/SetFireworkExplosionLootFunction FIELD field_49874 CODEC Lcom/mojang/serialization/Codec; - FIELD field_49875 DEFAULT Lnet/minecraft/class_9283; + FIELD field_49875 DEFAULT_EXPLOSION Lnet/minecraft/class_9283; FIELD field_49876 shape Ljava/util/Optional; FIELD field_49877 colors Ljava/util/Optional; FIELD field_49878 fadeColors Ljava/util/Optional; @@ -14,16 +14,16 @@ CLASS net/minecraft/class_9375 net/minecraft/loot/function/SetFireworkExplosionL ARG 5 trail ARG 6 twinkle METHOD method_58205 apply (Lnet/minecraft/class_9283;)Lnet/minecraft/class_9283; - ARG 1 fireworkExplosion + ARG 1 current METHOD method_58206 (Lnet/minecraft/class_9375;)Ljava/util/Optional; - ARG 0 lootFunction + ARG 0 function METHOD method_58207 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_58208 (Lnet/minecraft/class_9375;)Ljava/util/Optional; - ARG 0 lootFunction + ARG 0 function METHOD method_58209 (Lnet/minecraft/class_9375;)Ljava/util/Optional; - ARG 0 lootFunction + ARG 0 function METHOD method_58210 (Lnet/minecraft/class_9375;)Ljava/util/Optional; - ARG 0 lootFunction + ARG 0 function METHOD method_58211 (Lnet/minecraft/class_9375;)Ljava/util/Optional; - ARG 0 lootFunction + ARG 0 function diff --git a/mappings/net/minecraft/loot/function/SetFireworksLootFunction.mapping b/mappings/net/minecraft/loot/function/SetFireworksLootFunction.mapping index ea887fd21c..458b7ce4ae 100644 --- a/mappings/net/minecraft/loot/function/SetFireworksLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetFireworksLootFunction.mapping @@ -1,21 +1,21 @@ CLASS net/minecraft/class_9376 net/minecraft/loot/function/SetFireworksLootFunction FIELD field_49881 CODEC Lcom/mojang/serialization/Codec; - FIELD field_49882 DEFAULT Lnet/minecraft/class_9284; + FIELD field_49882 DEFAULT_FIREWORKS Lnet/minecraft/class_9284; FIELD field_49883 explosions Ljava/util/List; - FIELD field_49884 listModifier Lnet/minecraft/class_9368; + FIELD field_49884 operation Lnet/minecraft/class_9368; FIELD field_49885 flightDuration Ljava/util/Optional; METHOD (Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_9368;Ljava/util/Optional;)V ARG 1 conditions ARG 2 explosions - ARG 3 listModifier + ARG 3 operation ARG 4 flightDuration METHOD method_58212 apply (Lnet/minecraft/class_9284;)Lnet/minecraft/class_9284; - ARG 1 fireworks + ARG 1 current METHOD method_58213 (Lnet/minecraft/class_9376;)Ljava/util/Optional; - ARG 0 lootFunction + ARG 0 function METHOD method_58214 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_58215 (Lnet/minecraft/class_9376;)Lnet/minecraft/class_9368; - ARG 0 lootFunction + ARG 0 function METHOD method_58216 (Lnet/minecraft/class_9376;)Ljava/util/List; - ARG 0 lootFunction + ARG 0 function diff --git a/mappings/net/minecraft/loot/function/SetWritableBookPagesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetWritableBookPagesLootFunction.mapping index 4e5eda90cb..615253383c 100644 --- a/mappings/net/minecraft/loot/function/SetWritableBookPagesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetWritableBookPagesLootFunction.mapping @@ -1,16 +1,16 @@ CLASS net/minecraft/class_9377 net/minecraft/loot/function/SetWritableBookPagesLootFunction FIELD field_49886 CODEC Lcom/mojang/serialization/Codec; FIELD field_49887 pages Ljava/util/List; - FIELD field_49888 listModifier Lnet/minecraft/class_9368; + FIELD field_49888 operation Lnet/minecraft/class_9368; METHOD (Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_9368;)V ARG 1 conditions ARG 2 pages - ARG 3 listModifier + ARG 3 operation METHOD method_58217 apply (Lnet/minecraft/class_9301;)Lnet/minecraft/class_9301; - ARG 1 writableBookContent + ARG 1 current METHOD method_58218 (Lnet/minecraft/class_9377;)Lnet/minecraft/class_9368; - ARG 0 lootFunction + ARG 0 function METHOD method_58219 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_58220 (Lnet/minecraft/class_9377;)Ljava/util/List; - ARG 0 lootFunction + ARG 0 function diff --git a/mappings/net/minecraft/loot/function/SetWrittenBookPagesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetWrittenBookPagesLootFunction.mapping index 10312bd8e8..bef074c2fe 100644 --- a/mappings/net/minecraft/loot/function/SetWrittenBookPagesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetWrittenBookPagesLootFunction.mapping @@ -1,16 +1,16 @@ CLASS net/minecraft/class_9378 net/minecraft/loot/function/SetWrittenBookPagesLootFunction FIELD field_49889 CODEC Lcom/mojang/serialization/Codec; FIELD field_49890 pages Ljava/util/List; - FIELD field_49891 listModifier Lnet/minecraft/class_9368; + FIELD field_49891 operation Lnet/minecraft/class_9368; METHOD (Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_9368;)V ARG 1 conditions ARG 2 pages - ARG 3 listModifier + ARG 3 operation METHOD method_58221 apply (Lnet/minecraft/class_9302;)Lnet/minecraft/class_9302; - ARG 1 writtenBookContent + ARG 1 current METHOD method_58222 (Lnet/minecraft/class_9378;)Lnet/minecraft/class_9368; - ARG 0 lootFunction + ARG 0 function METHOD method_58223 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_58224 (Lnet/minecraft/class_9378;)Ljava/util/List; - ARG 0 lootFunction + ARG 0 function diff --git a/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping index cee7580934..016d4473d8 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_2817 net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket FIELD field_33361 MAX_PAYLOAD_SIZE I FIELD field_48646 CODEC Lnet/minecraft/class_9139; + METHOD method_56475 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_9139; + ARG 0 id + METHOD method_58271 (Ljava/util/ArrayList;)V + ARG 0 types diff --git a/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping index 9499766a54..bd7617b130 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket.mapping @@ -6,3 +6,5 @@ CLASS net/minecraft/class_2658 net/minecraft/network/packet/s2c/common/CustomPay ARG 0 id METHOD method_56461 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_9139; ARG 0 id + METHOD method_58270 (Ljava/util/ArrayList;)V + ARG 0 types diff --git a/mappings/net/minecraft/particle/EntityEffectParticleEffect.mapping b/mappings/net/minecraft/particle/EntityEffectParticleEffect.mapping index 06862a639e..597c5dbe95 100644 --- a/mappings/net/minecraft/particle/EntityEffectParticleEffect.mapping +++ b/mappings/net/minecraft/particle/EntityEffectParticleEffect.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_9381 net/minecraft/particle/EntityEffectParticleEffect - FIELD field_49908 FACTORY Lnet/minecraft/class_2394$class_2395; + FIELD field_49908 PARAMETERS_FACTORY Lnet/minecraft/class_2394$class_2395; FIELD field_49909 type Lnet/minecraft/class_2396; FIELD field_49910 color I METHOD (Lnet/minecraft/class_2396;I)V ARG 1 type ARG 2 color - METHOD method_58252 colorValueOf (F)I - ARG 0 f + METHOD method_58252 toInt (F)I + ARG 0 value METHOD method_58253 (Lnet/minecraft/class_9381;)Ljava/lang/Integer; ARG 0 particleEffect METHOD method_58254 createCodec (Lnet/minecraft/class_2396;)Lcom/mojang/serialization/Codec; @@ -27,7 +27,7 @@ CLASS net/minecraft/class_9381 net/minecraft/particle/EntityEffectParticleEffect ARG 1 color METHOD method_58259 getRed ()F METHOD method_58260 (Lnet/minecraft/class_9381;)Ljava/lang/Integer; - ARG 0 particleEffect + ARG 0 effect METHOD method_58261 createPacketCodec (Lnet/minecraft/class_2396;)Lnet/minecraft/class_9139; ARG 0 type METHOD method_58262 (Lnet/minecraft/class_2396;Ljava/lang/Integer;)Lnet/minecraft/class_9381; diff --git a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntitySubPredicate.mapping similarity index 76% rename from mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping rename to mappings/net/minecraft/predicate/entity/EntitySubPredicate.mapping index b8563fbaad..dbfc2fb1c9 100644 --- a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntitySubPredicate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7376 net/minecraft/predicate/entity/TypeSpecificPredicate +CLASS net/minecraft/class_7376 net/minecraft/predicate/entity/EntitySubPredicate FIELD field_45747 CODEC Lcom/mojang/serialization/Codec; METHOD method_22497 test (Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z ARG 1 entity diff --git a/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping b/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping index d0d31500e7..9cbe56ef48 100644 --- a/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping +++ b/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping @@ -42,23 +42,22 @@ CLASS net/minecraft/class_7378 net/minecraft/predicate/entity/EntitySubPredicate ARG 0 entity METHOD method_47839 (Lnet/minecraft/class_1297;)Ljava/util/Optional; ARG 0 entity - METHOD method_58153 createPredicate (Lnet/minecraft/class_7375;)Lnet/minecraft/class_7376; + METHOD method_58153 catVariant (Lnet/minecraft/class_7375;)Lnet/minecraft/class_7376; ARG 0 catVariant - METHOD method_58154 createPredicate (Lnet/minecraft/class_7106;)Lnet/minecraft/class_7376; + METHOD method_58154 frogVariant (Lnet/minecraft/class_7106;)Lnet/minecraft/class_7376; ARG 0 frogVariant METHOD method_58155 register (Ljava/lang/String;Lnet/minecraft/class_7378$class_7380;)Lnet/minecraft/class_7378$class_7380; ARG 0 id - ARG 1 entityVariantPredicateType + ARG 1 type METHOD method_58156 register (Ljava/lang/String;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec; ARG 0 id ARG 1 codec METHOD method_58157 getDefault (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/MapCodec; - ARG 0 registry - CLASS class_7380 EntityVariantPredicateType + CLASS class_7380 VariantType FIELD field_38741 variantGetter Ljava/util/function/Function; FIELD field_49794 codec Lcom/mojang/serialization/MapCodec; METHOD (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)V - ARG 1 codec + ARG 1 variantCodec ARG 2 variantGetter METHOD method_43115 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 2 instance @@ -74,7 +73,7 @@ CLASS net/minecraft/class_7378 net/minecraft/predicate/entity/EntitySubPredicate ARG 0 predicate METHOD method_58159 (Ljava/lang/Object;)Lnet/minecraft/class_7378$class_7380$class_9353; ARG 1 variant - CLASS class_9353 Predicate + CLASS class_9353 VariantPredicate FIELD field_49796 variant Ljava/lang/Object; METHOD (Lnet/minecraft/class_7378$class_7380;Ljava/lang/Object;)V ARG 2 variant diff --git a/mappings/net/minecraft/predicate/item/ComponentPredicate.mapping b/mappings/net/minecraft/predicate/item/ComponentSubPredicate.mapping similarity index 92% rename from mappings/net/minecraft/predicate/item/ComponentPredicate.mapping rename to mappings/net/minecraft/predicate/item/ComponentSubPredicate.mapping index ffa00c3887..c10c0d2020 100644 --- a/mappings/net/minecraft/predicate/item/ComponentPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ComponentSubPredicate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_9365 net/minecraft/predicate/item/ComponentPredicate +CLASS net/minecraft/class_9365 net/minecraft/predicate/item/ComponentSubPredicate METHOD method_58163 getComponentType ()Lnet/minecraft/class_9331; METHOD method_58167 test (Lnet/minecraft/class_1799;Ljava/lang/Object;)Z ARG 1 stack diff --git a/mappings/net/minecraft/predicate/item/CustomDataPredicate.mapping b/mappings/net/minecraft/predicate/item/CustomDataPredicate.mapping index 70e9ea3919..95f3f9c2b3 100644 --- a/mappings/net/minecraft/predicate/item/CustomDataPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/CustomDataPredicate.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_9354 net/minecraft/predicate/item/CustomDataPredicate FIELD field_49797 CODEC Lcom/mojang/serialization/Codec; - METHOD method_58162 of (Lnet/minecraft/class_2105;)Lnet/minecraft/class_9354; - ARG 0 nbtPredicate + METHOD method_58162 customData (Lnet/minecraft/class_2105;)Lnet/minecraft/class_9354; + ARG 0 value diff --git a/mappings/net/minecraft/predicate/item/DamagePredicate.mapping b/mappings/net/minecraft/predicate/item/DamagePredicate.mapping index 61c9f80b79..036d6d989a 100644 --- a/mappings/net/minecraft/predicate/item/DamagePredicate.mapping +++ b/mappings/net/minecraft/predicate/item/DamagePredicate.mapping @@ -2,5 +2,5 @@ CLASS net/minecraft/class_9355 net/minecraft/predicate/item/DamagePredicate FIELD field_49798 CODEC Lcom/mojang/serialization/Codec; METHOD method_58164 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_58165 of (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_9355; + METHOD method_58165 durability (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_9355; ARG 0 durability diff --git a/mappings/net/minecraft/predicate/item/EnchantmentsPredicate.mapping b/mappings/net/minecraft/predicate/item/EnchantmentsPredicate.mapping index 83f48e4be3..0ba0b4917f 100644 --- a/mappings/net/minecraft/predicate/item/EnchantmentsPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/EnchantmentsPredicate.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_9356 net/minecraft/predicate/item/EnchantmentsPredicate - FIELD field_49799 enchantmentPredicates Ljava/util/List; + FIELD field_49799 enchantments Ljava/util/List; METHOD (Ljava/util/List;)V - ARG 1 enchantmentPredicates + ARG 1 enchantments METHOD method_58173 enchantments (Ljava/util/List;)Lnet/minecraft/class_9356$class_9357; - ARG 0 enchantmentPredicates - METHOD method_58174 getCodec (Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; - ARG 0 factory - METHOD method_58175 getEnchantmentPredicates ()Ljava/util/List; + ARG 0 enchantments + METHOD method_58174 createCodec (Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; + ARG 0 predicateFunction + METHOD method_58175 getEnchantments ()Ljava/util/List; METHOD method_58176 storedEnchantments (Ljava/util/List;)Lnet/minecraft/class_9356$class_9358; - ARG 0 enchantmentPredicates + ARG 0 storedEnchantments CLASS class_9357 Enchantments FIELD field_49800 CODEC Lcom/mojang/serialization/Codec; CLASS class_9358 StoredEnchantments diff --git a/mappings/net/minecraft/predicate/item/ItemSubPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemSubPredicate.mapping index 4f6d010140..657b6fde23 100644 --- a/mappings/net/minecraft/predicate/item/ItemSubPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemSubPredicate.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_9360 net/minecraft/predicate/item/ItemSubPredicate - FIELD field_49805 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49805 PREDICATES_MAP_CODEC Lcom/mojang/serialization/Codec; METHOD method_58161 test (Lnet/minecraft/class_1799;)Z ARG 1 stack CLASS class_8745 Type diff --git a/mappings/net/minecraft/predicate/item/PotionContentsPredicate.mapping b/mappings/net/minecraft/predicate/item/PotionContentsPredicate.mapping index af8e9dba06..bf494e5a3f 100644 --- a/mappings/net/minecraft/predicate/item/PotionContentsPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/PotionContentsPredicate.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_9359 net/minecraft/predicate/item/PotionContentsPredicate FIELD field_49802 CODEC Lcom/mojang/serialization/Codec; - METHOD method_58178 of (Lnet/minecraft/class_6885;)Lnet/minecraft/class_9360; + METHOD method_58178 potionContents (Lnet/minecraft/class_6885;)Lnet/minecraft/class_9360; ARG 0 potions diff --git a/mappings/net/minecraft/util/Colors.mapping b/mappings/net/minecraft/util/Colors.mapping index 00aef34d03..c020433bc4 100644 --- a/mappings/net/minecraft/util/Colors.mapping +++ b/mappings/net/minecraft/util/Colors.mapping @@ -16,5 +16,6 @@ CLASS net/minecraft/class_8012 net/minecraft/util/Colors COMMENT Represents the color yellow, {@code 0xFFFFFF00}. FIELD field_46768 LIGHT_YELLOW I COMMENT Represents the color light yellow, {@code 0xFFFFFF55}. - FIELD field_49788 LIGHTER_GRAY I - COMMENT Represents the color lighter gray, {code 0xFFBABABA}. + FIELD field_49788 ALTERNATE_WHITE I + COMMENT Represents a variant of the color white, used so that the two alternate with + COMMENT each other, {@code 0xFFBABABA}. diff --git a/mappings/net/minecraft/loot/function/ListModifier.mapping b/mappings/net/minecraft/util/collection/ListOperation.mapping similarity index 61% rename from mappings/net/minecraft/loot/function/ListModifier.mapping rename to mappings/net/minecraft/util/collection/ListOperation.mapping index ac5e426e95..1148f96d5b 100644 --- a/mappings/net/minecraft/loot/function/ListModifier.mapping +++ b/mappings/net/minecraft/util/collection/ListOperation.mapping @@ -1,36 +1,36 @@ -CLASS net/minecraft/class_9368 net/minecraft/loot/function/ListModifier - METHOD method_58191 getMode ()Lnet/minecraft/class_9368$class_9373; +CLASS net/minecraft/class_9368 net/minecraft/util/collection/ListOperation + METHOD method_58191 getType ()Lnet/minecraft/class_9368$class_9373; METHOD method_58192 apply (Ljava/util/List;Ljava/util/List;I)Ljava/util/List; - ARG 1 base - ARG 2 toApply + ARG 1 current + ARG 2 values ARG 3 maxSize CLASS class_9369 Append FIELD field_49847 INSTANCE Lnet/minecraft/class_9368$class_9369; - FIELD field_49848 MAP_CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_49848 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_49849 LOGGER Lorg/slf4j/Logger; CLASS class_9370 Insert - FIELD field_49850 MAP_CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_49850 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_49851 LOGGER Lorg/slf4j/Logger; METHOD method_58194 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance CLASS class_9371 ReplaceAll FIELD field_49852 INSTANCE Lnet/minecraft/class_9368$class_9371; - FIELD field_49853 MAP_CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_49853 CODEC Lcom/mojang/serialization/MapCodec; CLASS class_9372 ReplaceSection - FIELD field_49854 MAP_CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_49854 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_49855 LOGGER Lorg/slf4j/Logger; METHOD (I)V ARG 1 offset METHOD method_58196 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - CLASS class_9373 Mode + CLASS class_9373 Type FIELD field_49860 CODEC Lcom/mojang/serialization/Codec; FIELD field_49861 MAP_CODEC Lcom/mojang/serialization/MapCodec; - FIELD field_49862 name Ljava/lang/String; - FIELD field_49863 mapCodec Lcom/mojang/serialization/MapCodec; + FIELD field_49862 id Ljava/lang/String; + FIELD field_49863 codec Lcom/mojang/serialization/MapCodec; METHOD (Ljava/lang/String;ILjava/lang/String;Lcom/mojang/serialization/MapCodec;)V - ARG 3 name - ARG 4 mapCodec - METHOD method_58197 getMapCodec ()Lcom/mojang/serialization/MapCodec; + ARG 3 id + ARG 4 codec + METHOD method_58197 getCodec ()Lcom/mojang/serialization/MapCodec; METHOD method_58198 (Lnet/minecraft/class_9368$class_9373;)Lcom/mojang/serialization/Codec; - ARG 0 mode + ARG 0 type diff --git a/mappings/net/minecraft/util/math/BlockArea.mapping b/mappings/net/minecraft/util/math/BlockArea.mapping deleted file mode 100644 index e2b5ecd0ef..0000000000 --- a/mappings/net/minecraft/util/math/BlockArea.mapping +++ /dev/null @@ -1,27 +0,0 @@ -CLASS net/minecraft/class_9380 net/minecraft/util/math/BlockArea - FIELD field_49907 PACKET_CODEC Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)V - ARG 1 min - ARG 2 max - METHOD method_58235 isSingleBlock ()Z - METHOD method_58236 of (Lnet/minecraft/class_2338;)Lnet/minecraft/class_9380; - ARG 0 pos - METHOD method_58237 of (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Lnet/minecraft/class_9380; - ARG 0 min - ARG 1 max - METHOD method_58238 extend (Lnet/minecraft/class_2350;I)Lnet/minecraft/class_9380; - ARG 1 direction - ARG 2 amount - METHOD method_58239 offset (Lnet/minecraft/class_2382;)Lnet/minecraft/class_9380; - ARG 1 amount - METHOD method_58240 asBox ()Lnet/minecraft/class_238; - METHOD method_58241 extendTo (Lnet/minecraft/class_2338;)Lnet/minecraft/class_9380; - ARG 1 pos - METHOD method_58242 offset (Lnet/minecraft/class_2350;I)Lnet/minecraft/class_9380; - ARG 1 direction - ARG 2 amount - METHOD method_58243 getSizeX ()I - METHOD method_58244 contains (Lnet/minecraft/class_2338;)Z - ARG 1 pos - METHOD method_58245 getSizeY ()I - METHOD method_58246 getSizeZ ()I diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index d535d9054b..68a8f83428 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -216,11 +216,11 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos METHOD method_51686 streamSouthEastSquare (Lnet/minecraft/class_2338;)Ljava/util/stream/Stream; ARG 0 pos METHOD method_58249 min (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; - ARG 0 pos1 - ARG 1 pos2 + ARG 0 a + ARG 1 b METHOD method_58250 max (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; - ARG 0 pos1 - ARG 1 pos2 + ARG 0 a + ARG 1 b CLASS 2 FIELD field_48405 pos Lnet/minecraft/class_2338$class_2339; FIELD field_48406 remaining I diff --git a/mappings/net/minecraft/util/math/ImmutableBlockBox.mapping b/mappings/net/minecraft/util/math/ImmutableBlockBox.mapping new file mode 100644 index 0000000000..9305145eb2 --- /dev/null +++ b/mappings/net/minecraft/util/math/ImmutableBlockBox.mapping @@ -0,0 +1,27 @@ +CLASS net/minecraft/class_9380 net/minecraft/util/math/ImmutableBlockBox + FIELD field_49907 PACKET_CODEC Lnet/minecraft/class_9139; + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)V + ARG 1 first + ARG 2 second + METHOD method_58235 isSingleBlock ()Z + METHOD method_58236 of (Lnet/minecraft/class_2338;)Lnet/minecraft/class_9380; + ARG 0 pos + METHOD method_58237 of (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Lnet/minecraft/class_9380; + ARG 0 first + ARG 1 second + METHOD method_58238 expand (Lnet/minecraft/class_2350;I)Lnet/minecraft/class_9380; + ARG 1 direction + ARG 2 offset + METHOD method_58239 move (Lnet/minecraft/class_2382;)Lnet/minecraft/class_9380; + ARG 1 offset + METHOD method_58240 enclosingBox ()Lnet/minecraft/class_238; + METHOD method_58241 encompass (Lnet/minecraft/class_2338;)Lnet/minecraft/class_9380; + ARG 1 pos + METHOD method_58242 move (Lnet/minecraft/class_2350;I)Lnet/minecraft/class_9380; + ARG 1 direction + ARG 2 offset + METHOD method_58243 getBlockCountX ()I + METHOD method_58244 includes (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_58245 getBlockCountY ()I + METHOD method_58246 getBlockCountZ ()I diff --git a/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping b/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping index b6b09bf18c..2a0af36afb 100644 --- a/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping +++ b/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping @@ -66,3 +66,7 @@ CLASS net/minecraft/class_244 net/minecraft/util/shape/BitSetVoxelSet ARG 2 z2 ARG 3 x ARG 4 y + METHOD method_58225 surrounded (III)Z + ARG 1 x + ARG 2 y + ARG 3 z diff --git a/unpick-definitions/colors.unpick b/unpick-definitions/colors.unpick index 40718755e9..bc53028df5 100644 --- a/unpick-definitions/colors.unpick +++ b/unpick-definitions/colors.unpick @@ -4,7 +4,7 @@ constant argb_color net/minecraft/util/Colors WHITE constant argb_color net/minecraft/util/Colors BLACK constant argb_color net/minecraft/util/Colors GRAY constant argb_color net/minecraft/util/Colors LIGHT_GRAY -constant argb_color net/minecraft/util/Colors LIGHTER_GRAY +constant argb_color net/minecraft/util/Colors ALTERNATE_WHITE constant argb_color net/minecraft/util/Colors RED constant argb_color net/minecraft/util/Colors LIGHT_RED constant argb_color net/minecraft/util/Colors YELLOW