diff --git a/build.gradle b/build.gradle index 9b01c1e0d1..89e3f9a31e 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "24w10a" +def minecraft_version = "24w11a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/class_9360.mapping b/mappings/net/minecraft/class_9360.mapping new file mode 100644 index 0000000000..35d4971598 --- /dev/null +++ b/mappings/net/minecraft/class_9360.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9360 + CLASS class_8745 Type diff --git a/mappings/net/minecraft/class_9364.mapping b/mappings/net/minecraft/class_9364.mapping new file mode 100644 index 0000000000..8855cd46da --- /dev/null +++ b/mappings/net/minecraft/class_9364.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9364 + METHOD comp_2422 comp_2418 ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/gl/Framebuffer.mapping b/mappings/net/minecraft/client/gl/Framebuffer.mapping index c071a53b64..ed455c7566 100644 --- a/mappings/net/minecraft/client/gl/Framebuffer.mapping +++ b/mappings/net/minecraft/client/gl/Framebuffer.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer ARG 1 width ARG 2 height ARG 3 getError - METHOD method_1232 setTexFilter (I)V + METHOD method_1232 setTexFilter (IZ)V ARG 1 texFilter METHOD method_1233 drawInternal (IIZ)V ARG 1 width diff --git a/mappings/net/minecraft/client/gl/PostEffectPass.mapping b/mappings/net/minecraft/client/gl/PostEffectPass.mapping index b36b226db8..8ec128fb03 100644 --- a/mappings/net/minecraft/client/gl/PostEffectPass.mapping +++ b/mappings/net/minecraft/client/gl/PostEffectPass.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_283 net/minecraft/client/gl/PostEffectPass FIELD field_1538 output Lnet/minecraft/class_276; FIELD field_1539 samplerNames Ljava/util/List; FIELD field_1540 program Lnet/minecraft/class_280; - METHOD (Lnet/minecraft/class_5912;Ljava/lang/String;Lnet/minecraft/class_276;Lnet/minecraft/class_276;)V + METHOD (Lnet/minecraft/class_5912;Ljava/lang/String;Lnet/minecraft/class_276;Lnet/minecraft/class_276;Z)V ARG 2 programName ARG 3 input ARG 4 output diff --git a/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping b/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping index 5eae9e9efa..8c35fd9264 100644 --- a/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping +++ b/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping @@ -30,7 +30,7 @@ CLASS net/minecraft/class_279 net/minecraft/client/gl/PostEffectProcessor ARG 1 name ARG 2 width ARG 3 height - METHOD method_1262 addPass (Ljava/lang/String;Lnet/minecraft/class_276;Lnet/minecraft/class_276;)Lnet/minecraft/class_283; + METHOD method_1262 addPass (Ljava/lang/String;Lnet/minecraft/class_276;Lnet/minecraft/class_276;Z)Lnet/minecraft/class_283; ARG 1 programName ARG 2 source ARG 3 dest diff --git a/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping b/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping index 6b8760c109..c99b90f3fa 100644 --- a/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping +++ b/mappings/net/minecraft/client/gui/RotatingCubeMapRenderer.mapping @@ -5,11 +5,7 @@ CLASS net/minecraft/class_766 net/minecraft/client/gui/RotatingCubeMapRenderer FIELD field_4141 cubeMap Lnet/minecraft/class_751; METHOD (Lnet/minecraft/class_751;)V ARG 1 cubeMap - METHOD method_3317 render (FF)V - ARG 1 delta - ARG 2 alpha + METHOD method_3317 render (Lnet/minecraft/class_332;IIFF)V METHOD method_45780 wrapOnce (FF)F ARG 0 a ARG 1 b - METHOD method_57798 render (F)V - ARG 1 delta diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index cae117f19f..84988238e9 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -25,7 +25,6 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen FIELD field_44944 executor Ljava/util/concurrent/Executor; FIELD field_49508 PANORAMA_RENDERER Lnet/minecraft/class_751; FIELD field_49509 ROTATING_PANORAMA_RENDERER Lnet/minecraft/class_766; - FIELD field_49510 PANORAMA_OVERLAY_TEXTURE Lnet/minecraft/class_2960; FIELD field_49511 MENU_BACKGROUND_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2561;)V ARG 1 title @@ -128,8 +127,6 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen METHOD method_37071 updateNarrator ()V METHOD method_37072 applyNarratorModeChangeDelay ()V METHOD method_37073 isNarratorActive ()Z - METHOD method_40041 hide ([Lnet/minecraft/class_339;)V - ARG 0 widgets METHOD method_41843 clearAndInit ()V METHOD method_47412 setTooltip (Lnet/minecraft/class_7919;Lnet/minecraft/class_8000;Z)V ARG 1 tooltip @@ -183,12 +180,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 3 y ARG 4 width ARG 5 height - METHOD method_57737 renderBackgroundTexture (Lnet/minecraft/class_332;IIII)V + METHOD method_57737 renderBackgroundTexture (Lnet/minecraft/class_332;Lnet/minecraft/class_2960;IIFFII)V ARG 0 context - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height CLASS class_6390 SelectedElementNarrationData FIELD field_33825 selectable Lnet/minecraft/class_6379; FIELD field_33826 index I diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index 84fbefdf68..85ef90776a 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -13,8 +13,6 @@ CLASS net/minecraft/class_525 net/minecraft/client/gui/screen/world/CreateWorldS FIELD field_42173 tabManager Lnet/minecraft/class_8088; FIELD field_42501 EXPERIMENTS_TEXT Lnet/minecraft/class_2561; FIELD field_42502 recreated Z - FIELD field_43081 HEADER_SEPARATOR_TEXTURE Lnet/minecraft/class_2960; - FIELD field_43082 FOOTER_SEPARATOR_TEXTURE Lnet/minecraft/class_2960; FIELD field_45568 symlinkFinder Lnet/minecraft/class_8580; FIELD field_49557 layout Lnet/minecraft/class_8132; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_437;Lnet/minecraft/class_7193;Ljava/util/Optional;Ljava/util/OptionalLong;)V diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index 99b7294675..404852b0ef 100644 --- a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -108,9 +108,3 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget METHOD method_55445 setDimensions (II)V ARG 1 width ARG 2 height - METHOD method_57719 drawBackground (Lnet/minecraft/class_332;IIII)V - ARG 1 context - ARG 2 startX - ARG 3 startY - ARG 4 endX - ARG 5 endY diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 61c6395d6f..f02cffa028 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -131,13 +131,11 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget ARG 1 width ARG 2 layout METHOD method_57713 drawHeaderAndFooterSeparators (Lnet/minecraft/class_332;)V - ARG 1 context METHOD method_57714 position (III)V ARG 1 width ARG 2 height ARG 3 y METHOD method_57715 drawMenuListBackground (Lnet/minecraft/class_332;)V - ARG 1 context METHOD method_57717 isScrollbarVisible ()Z CLASS class_351 Entry FIELD field_22752 parentList Lnet/minecraft/class_350; diff --git a/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping b/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping index fe72ac4ce5..bd4b01e348 100644 --- a/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/OptionListWidget.mapping @@ -6,9 +6,7 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/OptionListWidget ARG 4 optionsScreen METHOD method_20406 addSingleOptionEntry (Lnet/minecraft/class_7172;)V ARG 1 option - METHOD method_20407 addOptionEntry (Lnet/minecraft/class_7172;Lnet/minecraft/class_7172;)V - ARG 1 firstOption - ARG 2 secondOption + METHOD method_20407 addOptionEntry (Lnet/minecraft/class_339;Lnet/minecraft/class_339;)V METHOD method_20408 addAll ([Lnet/minecraft/class_7172;)V ARG 1 options METHOD method_29624 getHoveredWidget (DD)Ljava/util/Optional; @@ -18,17 +16,6 @@ CLASS net/minecraft/class_353 net/minecraft/client/gui/widget/OptionListWidget ARG 1 option CLASS class_354 WidgetEntry FIELD field_18214 widgets Ljava/util/List; - FIELD field_27983 optionsToWidgets Ljava/util/Map; - FIELD field_49485 optionsScreen Lnet/minecraft/class_4667; - METHOD (Ljava/util/Map;Lnet/minecraft/class_4667;)V - ARG 1 optionsToWidgets - ARG 2 optionsScreen - METHOD method_20409 create (Lnet/minecraft/class_315;Lnet/minecraft/class_7172;Lnet/minecraft/class_4667;)Lnet/minecraft/class_353$class_354; - ARG 0 options - ARG 1 option - ARG 2 optionsSCreen - METHOD method_20410 create (Lnet/minecraft/class_315;Lnet/minecraft/class_7172;Lnet/minecraft/class_7172;Lnet/minecraft/class_4667;)Lnet/minecraft/class_353$class_354; - ARG 0 options - ARG 1 firstOption - ARG 2 secondOption - ARG 3 optionsScreen + FIELD field_49485 optionsScreen Lnet/minecraft/class_437; + METHOD method_20409 create (Ljava/util/List;Lnet/minecraft/class_437;)Lnet/minecraft/class_353$class_354; + METHOD method_20410 create (Lnet/minecraft/class_339;Lnet/minecraft/class_339;Lnet/minecraft/class_437;)Lnet/minecraft/class_353$class_354; diff --git a/mappings/net/minecraft/client/particle/SpellParticle.mapping b/mappings/net/minecraft/client/particle/SpellParticle.mapping index 584fea4b28..778a657dc9 100644 --- a/mappings/net/minecraft/client/particle/SpellParticle.mapping +++ b/mappings/net/minecraft/client/particle/SpellParticle.mapping @@ -11,10 +11,6 @@ CLASS net/minecraft/class_711 net/minecraft/client/particle/SpellParticle ARG 12 velocityZ ARG 14 spriteProvider METHOD method_37102 isInvisible ()Z - CLASS class_712 EntityAmbientFactory - FIELD field_17871 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider CLASS class_713 InstantFactory FIELD field_17872 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 6f2543c991..ea7e278211 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -65,7 +65,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_3992 renderHand Z FIELD field_3993 LOGGER Lorg/slf4j/Logger; FIELD field_3994 random Lnet/minecraft/class_5819; - FIELD field_3996 SUPER_SECRET_SETTING_PROGRAMS [Lnet/minecraft/class_2960; FIELD field_3997 lastSkyDarkness F FIELD field_3998 lastWindowFocusedTime J FIELD field_3999 lastFovMultiplier F @@ -77,14 +76,12 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_4006 floatingItem Lnet/minecraft/class_1799; FIELD field_4007 floatingItemTimeLeft I FIELD field_4009 blockOutlineEnabled Z - FIELD field_4010 SUPER_SECRET_SETTING_COUNT I FIELD field_4012 firstPersonRenderer Lnet/minecraft/class_759; FIELD field_4013 postProcessorEnabled Z FIELD field_4015 client Lnet/minecraft/class_310; FIELD field_4017 lastWorldIconUpdate J FIELD field_4018 resourceManager Lnet/minecraft/class_3300; FIELD field_4019 fovMultiplier F - FIELD field_4023 superSecretSettingIndex I FIELD field_4024 postProcessor Lnet/minecraft/class_279; FIELD field_4025 viewDistance F FIELD field_4026 mapRenderer Lnet/minecraft/class_330; @@ -129,7 +126,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 1 scaledWidth ARG 2 scaledHeight ARG 3 tickDelta - METHOD method_3172 renderHand (Lnet/minecraft/class_4184;F)V + METHOD method_3172 renderHand (Lnet/minecraft/class_4184;FLorg/joml/Matrix4f;)V ARG 1 camera ARG 2 tickDelta METHOD method_3174 getNightVisionStrength (Lnet/minecraft/class_1309;F)F @@ -257,7 +254,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 1 blockOutlineEnabled METHOD method_35770 setRenderingPanorama (Z)V ARG 1 renderingPanorama - METHOD method_35771 cycleSuperSecretSetting ()V METHOD method_35772 getClient ()Lnet/minecraft/class_310; METHOD method_36432 getRenderTypeTextIntensityProgram ()Lnet/minecraft/class_5944; METHOD method_36433 getRenderTypeTextIntensitySeeThroughProgram ()Lnet/minecraft/class_5944; diff --git a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping index 5ecce41da0..09764a4b1e 100644 --- a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping +++ b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_9302 net/minecraft/component/type/WrittenBookContentComponent + FIELD comp_2422 comp_2418 Ljava/util/List; FIELD field_49375 MAX_SERIALIZED_PAGE_LENGTH I FIELD field_49376 MAX_PAGE_COUNT I FIELD field_49378 MAX_TITLE_LENGTH I diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 9e27e93dcd..6e062bcd0a 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -25,7 +25,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_45123 serverHeadYaw D FIELD field_45740 ACTIVE_EFFECTS_NBT_KEY Ljava/lang/String; FIELD field_48826 syncedBodyArmorStack Lnet/minecraft/class_1799; - FIELD field_49720 DEFAULT_POTION_SWIRLS_COLOR I FIELD field_6210 bodyTrackingIncrements I FIELD field_6212 sidewaysSpeed F FIELD field_6213 deathTime I @@ -50,7 +49,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_6236 attacking Lnet/minecraft/class_1309; FIELD field_6238 playerHitTimer I FIELD field_6239 fallFlyingTicks I - FIELD field_6240 POTION_SWIRLS_COLOR Lnet/minecraft/class_2940; FIELD field_6241 headYaw F FIELD field_6243 leaningPitch F FIELD field_6244 randomLargeSeed F diff --git a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping index 4c13d605d4..4dc6083ca3 100644 --- a/mappings/net/minecraft/entity/mob/RavagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/RavagerEntity.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_1584 net/minecraft/entity/mob/RavagerEntity - FIELD field_30483 STUNNED_PARTICLE_Z_VELOCITY D - FIELD field_30484 STUNNED_PARTICLE_Y_VELOCITY D - FIELD field_30485 STUNNED_PARTICLE_X_VELOCITY D + FIELD field_30483 STUNNED_PARTICLE_Z_VELOCITY F + FIELD field_30484 STUNNED_PARTICLE_Y_VELOCITY F + FIELD field_30485 STUNNED_PARTICLE_X_VELOCITY F FIELD field_7301 IS_NOT_RAVAGER Ljava/util/function/Predicate; FIELD field_7302 stunTick I FIELD field_7303 attackTick I diff --git a/mappings/net/minecraft/item/SmithingTemplateItem.mapping b/mappings/net/minecraft/item/SmithingTemplateItem.mapping index 080beae689..7e514c8e9f 100644 --- a/mappings/net/minecraft/item/SmithingTemplateItem.mapping +++ b/mappings/net/minecraft/item/SmithingTemplateItem.mapping @@ -35,7 +35,7 @@ CLASS net/minecraft/class_8052 net/minecraft/item/SmithingTemplateItem FIELD field_41992 EMPTY_SLOT_HOE_TEXTURE Lnet/minecraft/class_2960; FIELD field_41993 EMPTY_SLOT_AXE_TEXTURE Lnet/minecraft/class_2960; FIELD field_42472 EMPTY_SLOT_AMETHYST_SHARD_TEXTURE Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/util/List;Ljava/util/List;)V + METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Ljava/util/List;Ljava/util/List;[Lnet/minecraft/class_7696;)V ARG 1 appliesToText ARG 2 ingredientsText ARG 3 titleText @@ -48,9 +48,9 @@ CLASS net/minecraft/class_8052 net/minecraft/item/SmithingTemplateItem METHOD method_48415 getArmorTrimEmptyAdditionsSlotTextures ()Ljava/util/List; METHOD method_48416 getNetheriteUpgradeEmptyBaseSlotTextures ()Ljava/util/List; METHOD method_48417 getNetheriteUpgradeEmptyAdditionsSlotTextures ()Ljava/util/List; - METHOD method_48418 of (Lnet/minecraft/class_5321;)Lnet/minecraft/class_8052; + METHOD method_48418 of (Lnet/minecraft/class_5321;[Lnet/minecraft/class_7696;)Lnet/minecraft/class_8052; ARG 0 trimPattern - METHOD method_48419 of (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8052; + METHOD method_48419 of (Lnet/minecraft/class_2960;[Lnet/minecraft/class_7696;)Lnet/minecraft/class_8052; ARG 0 trimPatternIn METHOD method_48420 createNetheriteUpgrade ()Lnet/minecraft/class_8052; METHOD method_48421 getBaseSlotDescription ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/predicate/entity/Deserializers.mapping b/mappings/net/minecraft/predicate/entity/Deserializers.mapping new file mode 100644 index 0000000000..3c19caa94b --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/Deserializers.mapping @@ -0,0 +1,58 @@ +CLASS net/minecraft/class_7378 net/minecraft/predicate/entity/Deserializers + FIELD field_38725 LIGHTNING Lcom/mojang/serialization/MapCodec; + FIELD field_38726 FISHING_HOOK Lcom/mojang/serialization/MapCodec; + FIELD field_38727 PLAYER Lcom/mojang/serialization/MapCodec; + FIELD field_38728 SLIME Lcom/mojang/serialization/MapCodec; + FIELD field_38729 CAT Lnet/minecraft/class_7378$class_7380; + FIELD field_38730 FROG Lnet/minecraft/class_7378$class_7380; + FIELD field_41534 AXOLOTL Lnet/minecraft/class_7378$class_7380; + FIELD field_41535 BOAT Lnet/minecraft/class_7378$class_7380; + FIELD field_41536 FOX Lnet/minecraft/class_7378$class_7380; + FIELD field_41537 MOOSHROOM Lnet/minecraft/class_7378$class_7380; + FIELD field_41538 PAINTING Lnet/minecraft/class_7378$class_7380; + FIELD field_41539 RABBIT Lnet/minecraft/class_7378$class_7380; + FIELD field_41540 HORSE Lnet/minecraft/class_7378$class_7380; + FIELD field_41541 LLAMA Lnet/minecraft/class_7378$class_7380; + FIELD field_41542 VILLAGER Lnet/minecraft/class_7378$class_7380; + FIELD field_41543 PARROT Lnet/minecraft/class_7378$class_7380; + FIELD field_41544 TROPICAL_FISH Lnet/minecraft/class_7378$class_7380; + METHOD method_43100 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_43102 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47829 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47830 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47831 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47832 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47833 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47834 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47835 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47836 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47837 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47838 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_47839 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + CLASS class_7380 VariantPredicates + FIELD field_38741 variantGetter Ljava/util/function/Function; + METHOD (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)V + ARG 2 variantGetter + METHOD method_43115 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 2 instance + METHOD method_43116 create (Lnet/minecraft/class_2378;Ljava/util/function/Function;)Lnet/minecraft/class_7378$class_7380; + ARG 0 registry + ARG 1 variantGetter + METHOD method_43117 createPredicate (Ljava/lang/Object;)Lnet/minecraft/class_7376; + ARG 1 variant + METHOD method_47840 create (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lnet/minecraft/class_7378$class_7380; + ARG 0 codec + ARG 1 variantGetter diff --git a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping index 4af3874325..36f9000720 100644 --- a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping @@ -4,57 +4,3 @@ CLASS net/minecraft/class_7376 net/minecraft/predicate/entity/TypeSpecificPredic ARG 1 entity ARG 2 world ARG 3 pos - METHOD method_43095 cat (Lnet/minecraft/class_7375;)Lnet/minecraft/class_7376; - ARG 0 variant - METHOD method_43096 frog (Lnet/minecraft/class_7106;)Lnet/minecraft/class_7376; - ARG 0 variant - METHOD method_53142 (Lnet/minecraft/class_7376$class_8745;)Lcom/mojang/serialization/Codec; - ARG 0 type - CLASS class_7378 Deserializers - FIELD field_38724 ANY Lnet/minecraft/class_7376$class_8745; - FIELD field_38725 LIGHTNING Lnet/minecraft/class_7376$class_8745; - FIELD field_38726 FISHING_HOOK Lnet/minecraft/class_7376$class_8745; - FIELD field_38727 PLAYER Lnet/minecraft/class_7376$class_8745; - FIELD field_38728 SLIME Lnet/minecraft/class_7376$class_8745; - FIELD field_38729 CAT Lnet/minecraft/class_7380; - FIELD field_38730 FROG Lnet/minecraft/class_7380; - FIELD field_38731 TYPES Lcom/google/common/collect/BiMap; - FIELD field_41534 AXOLOTL Lnet/minecraft/class_7380; - FIELD field_41535 BOAT Lnet/minecraft/class_7380; - FIELD field_41536 FOX Lnet/minecraft/class_7380; - FIELD field_41537 MOOSHROOM Lnet/minecraft/class_7380; - FIELD field_41538 PAINTING Lnet/minecraft/class_7380; - FIELD field_41539 RABBIT Lnet/minecraft/class_7380; - FIELD field_41540 HORSE Lnet/minecraft/class_7380; - FIELD field_41541 LLAMA Lnet/minecraft/class_7380; - FIELD field_41542 VILLAGER Lnet/minecraft/class_7380; - FIELD field_41543 PARROT Lnet/minecraft/class_7380; - FIELD field_41544 TROPICAL_FISH Lnet/minecraft/class_7380; - FIELD field_45748 TYPE_CODEC Lcom/mojang/serialization/Codec; - METHOD method_43100 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_43102 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47829 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47830 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47831 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47832 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47833 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47834 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47835 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47836 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47837 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47838 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - METHOD method_47839 (Lnet/minecraft/class_1297;)Ljava/util/Optional; - ARG 0 entity - CLASS class_8745 Type diff --git a/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping b/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping deleted file mode 100644 index 0a5270165b..0000000000 --- a/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping +++ /dev/null @@ -1,20 +0,0 @@ -CLASS net/minecraft/class_7380 net/minecraft/predicate/entity/VariantPredicates - FIELD field_38741 variantGetter Ljava/util/function/Function; - FIELD field_38742 deserializer Lnet/minecraft/class_7376$class_8745; - METHOD (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)V - ARG 1 codec - ARG 2 variantGetter - METHOD method_43114 getDeserializer ()Lnet/minecraft/class_7376$class_8745; - METHOD method_43115 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 2 instance - METHOD method_43116 create (Lnet/minecraft/class_2378;Ljava/util/function/Function;)Lnet/minecraft/class_7380; - ARG 0 registry - ARG 1 variantGetter - METHOD method_43117 createPredicate (Ljava/lang/Object;)Lnet/minecraft/class_7380$class_8746; - ARG 1 variant - METHOD method_47840 create (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lnet/minecraft/class_7380; - ARG 0 codec - ARG 1 variantGetter - CLASS class_8746 Predicate - METHOD method_53148 (Ljava/lang/Object;)Z - ARG 1 variant diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index d6b0b9e35c..afec7c8ee8 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -5,33 +5,18 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate METHOD method_8970 test (Lnet/minecraft/class_1799;)Z ARG 1 stack CLASS class_2074 Builder - FIELD field_20690 storedEnchantments Lcom/google/common/collect/ImmutableList$Builder; - FIELD field_49234 nbtPredicate Ljava/util/Optional; FIELD field_49235 componentPredicate Lnet/minecraft/class_9329; FIELD field_9648 count Lnet/minecraft/class_2096$class_2100; - FIELD field_9649 enchantments Lcom/google/common/collect/ImmutableList$Builder; FIELD field_9650 item Ljava/util/Optional; - FIELD field_9651 potion Ljava/util/Optional; - FIELD field_9653 durability Lnet/minecraft/class_2096$class_2100; - METHOD method_35232 potion (Lnet/minecraft/class_6885;)Lnet/minecraft/class_2073$class_2074; - ARG 1 potion METHOD method_35233 count (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2073$class_2074; ARG 1 count - METHOD method_35234 storedEnchantment (Lnet/minecraft/class_2035;)Lnet/minecraft/class_2073$class_2074; - ARG 1 enchantment - METHOD method_35235 durability (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2073$class_2074; - ARG 1 durability METHOD method_53166 (Lnet/minecraft/class_1935;)Lnet/minecraft/class_6880; ARG 0 item METHOD method_57299 component (Lnet/minecraft/class_9329;)Lnet/minecraft/class_2073$class_2074; ARG 1 componentPredicate - METHOD method_57300 nbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2073$class_2074; - ARG 1 nbt METHOD method_8973 create ()Lnet/minecraft/class_2073$class_2074; METHOD method_8975 tag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2073$class_2074; ARG 1 tag METHOD method_8976 build ()Lnet/minecraft/class_2073; METHOD method_8977 items ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_2073$class_2074; ARG 1 items - METHOD method_8978 enchantment (Lnet/minecraft/class_2035;)Lnet/minecraft/class_2073$class_2074; - ARG 1 enchantment diff --git a/mappings/net/minecraft/structure/StructureTemplate.mapping b/mappings/net/minecraft/structure/StructureTemplate.mapping index 2332cd1bc2..9b3ec5b755 100644 --- a/mappings/net/minecraft/structure/StructureTemplate.mapping +++ b/mappings/net/minecraft/structure/StructureTemplate.mapping @@ -57,11 +57,6 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate ARG 4 placementData ARG 5 random ARG 6 flags - METHOD method_15173 (IIILnet/minecraft/class_1936;ILnet/minecraft/class_2350;III)V - ARG 5 direction - ARG 6 x - ARG 7 y - ARG 8 z METHOD method_15174 saveFromWorld (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;ZLnet/minecraft/class_2248;)V ARG 1 world ARG 2 start