diff --git a/build.gradle b/build.gradle index b2aebd8b9f..76c7922a81 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.19.3-pre1" +def minecraft_version = "1.19.3-pre2" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/NoteBlock.mapping b/mappings/net/minecraft/block/NoteBlock.mapping index 9dabbe3ac4..a95bc77732 100644 --- a/mappings/net/minecraft/block/NoteBlock.mapping +++ b/mappings/net/minecraft/block/NoteBlock.mapping @@ -13,7 +13,4 @@ CLASS net/minecraft/class_2428 net/minecraft/block/NoteBlock ARG 1 world ARG 2 pos ARG 3 state - METHOD method_47886 getCustomSound (Lnet/minecraft/class_2766;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3414; - ARG 1 instrument - ARG 2 world - ARG 3 pos + METHOD method_47886 getCustomSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/block/enums/ChestType.mapping b/mappings/net/minecraft/block/enums/ChestType.mapping index f78ace13d6..d529abc9e0 100644 --- a/mappings/net/minecraft/block/enums/ChestType.mapping +++ b/mappings/net/minecraft/block/enums/ChestType.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_2745 net/minecraft/block/enums/ChestType - FIELD field_12568 opposite I - FIELD field_12570 VALUES [Lnet/minecraft/class_2745; FIELD field_12572 name Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;I)V + METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name - ARG 4 opposite METHOD method_11824 getOpposite ()Lnet/minecraft/class_2745; diff --git a/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping b/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping index bba5bddcfc..22eeac4ac1 100644 --- a/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping @@ -7,12 +7,8 @@ CLASS net/minecraft/class_418 net/minecraft/client/gui/screen/DeathScreen METHOD (Lnet/minecraft/class_2561;Z)V ARG 1 message ARG 2 isHardcore - METHOD method_19808 (Lnet/minecraft/class_4185;)V - ARG 1 button METHOD method_19809 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_20373 onConfirmQuit (Z)V - ARG 1 quit METHOD method_2164 getTextComponentUnderMouse (I)Lnet/minecraft/class_2583; ARG 1 mouseX METHOD method_22364 quitLevel ()V diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index e1501c66ca..f80d54dab5 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -22,7 +22,6 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen FIELD field_33822 narrator Lnet/minecraft/class_6385; FIELD field_33823 elementNarrationStartTime J FIELD field_33824 screenNarrationStartTime J - FIELD field_41105 tooltip Ljava/util/List; METHOD (Lnet/minecraft/class_2561;)V ARG 1 title METHOD method_25393 tick ()V @@ -122,7 +121,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 2 lines ARG 3 x ARG 4 y - METHOD method_32633 renderTooltipFromComponents (Lnet/minecraft/class_4587;Ljava/util/List;II)V + METHOD method_32633 renderTooltipFromComponents (Lnet/minecraft/class_4587;Ljava/util/List;IILnet/minecraft/class_8000;)V ARG 1 matrices ARG 2 components ARG 3 x @@ -170,7 +169,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen 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;)V + METHOD method_47412 setTooltip (Lnet/minecraft/class_7919;Lnet/minecraft/class_8000;Z)V ARG 1 tooltip METHOD method_47413 renderWithTooltip (Lnet/minecraft/class_4587;IIF)V ARG 1 matrices diff --git a/mappings/net/minecraft/client/option/AoMode.mapping b/mappings/net/minecraft/client/option/AoMode.mapping index aa17ce7b8b..99ba1b8fa8 100644 --- a/mappings/net/minecraft/client/option/AoMode.mapping +++ b/mappings/net/minecraft/client/option/AoMode.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4060 net/minecraft/client/option/AoMode - FIELD field_18147 VALUES [Lnet/minecraft/class_4060; + FIELD field_18147 VALUES Ljava/util/function/IntFunction; FIELD field_18148 id I FIELD field_18149 translationKey Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/option/AttackIndicator.mapping b/mappings/net/minecraft/client/option/AttackIndicator.mapping index 3af7778022..9aa1c34a9b 100644 --- a/mappings/net/minecraft/client/option/AttackIndicator.mapping +++ b/mappings/net/minecraft/client/option/AttackIndicator.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4061 net/minecraft/client/option/AttackIndicator - FIELD field_18154 VALUES [Lnet/minecraft/class_4061; + FIELD field_18154 VALUES Ljava/util/function/IntFunction; FIELD field_18155 id I FIELD field_18156 translationKey Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/option/ChatVisibility.mapping b/mappings/net/minecraft/client/option/ChatVisibility.mapping index 9d5284d65a..3fa17b48ec 100644 --- a/mappings/net/minecraft/client/option/ChatVisibility.mapping +++ b/mappings/net/minecraft/client/option/ChatVisibility.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1659 net/minecraft/client/option/ChatVisibility - FIELD field_7534 VALUES [Lnet/minecraft/class_1659; + FIELD field_7534 VALUES Ljava/util/function/IntFunction; FIELD field_7535 id I FIELD field_7540 translationKey Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/option/GraphicsMode.mapping b/mappings/net/minecraft/client/option/GraphicsMode.mapping index 74f7f0bc0b..58c65a0787 100644 --- a/mappings/net/minecraft/client/option/GraphicsMode.mapping +++ b/mappings/net/minecraft/client/option/GraphicsMode.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5365 net/minecraft/client/option/GraphicsMode - FIELD field_25430 VALUES [Lnet/minecraft/class_5365; + FIELD field_25430 VALUES Ljava/util/function/IntFunction; FIELD field_25431 id I FIELD field_25432 translationKey Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/option/NarratorMode.mapping b/mappings/net/minecraft/client/option/NarratorMode.mapping index 00d4a18729..fde43a474c 100644 --- a/mappings/net/minecraft/client/option/NarratorMode.mapping +++ b/mappings/net/minecraft/client/option/NarratorMode.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_4065 net/minecraft/client/option/NarratorMode COMMENT The narrator narrates chat messages. FIELD field_18179 Lnet/minecraft/class_4065; COMMENT The narrator narrates system text, including screens. - FIELD field_18180 VALUES [Lnet/minecraft/class_4065; + FIELD field_18180 VALUES Ljava/util/function/IntFunction; FIELD field_18181 id I FIELD field_24212 name Lnet/minecraft/class_2561; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/option/ParticlesMode.mapping b/mappings/net/minecraft/client/option/ParticlesMode.mapping index e5af6dd599..46524c3391 100644 --- a/mappings/net/minecraft/client/option/ParticlesMode.mapping +++ b/mappings/net/minecraft/client/option/ParticlesMode.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4066 net/minecraft/client/option/ParticlesMode - FIELD field_18200 VALUES [Lnet/minecraft/class_4066; + FIELD field_18200 VALUES Ljava/util/function/IntFunction; FIELD field_18201 id I FIELD field_18202 translationKey Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/render/ChunkBuilderMode.mapping b/mappings/net/minecraft/client/render/ChunkBuilderMode.mapping index ff0403d881..35607ec99e 100644 --- a/mappings/net/minecraft/client/render/ChunkBuilderMode.mapping +++ b/mappings/net/minecraft/client/render/ChunkBuilderMode.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_6597 net/minecraft/client/render/ChunkBuilderMode - FIELD field_34791 modes [Lnet/minecraft/class_6597; + FIELD field_34791 modes Ljava/util/function/IntFunction; FIELD field_34792 id I FIELD field_34793 name Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/datafixer/fix/ObjectiveRenderTypeFix.mapping b/mappings/net/minecraft/datafixer/fix/ObjectiveRenderTypeFix.mapping index de9aa65d9e..b81c151a13 100644 --- a/mappings/net/minecraft/datafixer/fix/ObjectiveRenderTypeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ObjectiveRenderTypeFix.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_1199 net/minecraft/datafixer/fix/ObjectiveRenderTypeFix - METHOD method_5112 parseLegacyRenderType (Ljava/lang/String;)Lnet/minecraft/class_274$class_275; + METHOD method_5112 parseLegacyRenderType (Ljava/lang/String;)Ljava/lang/String; ARG 0 oldName diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 4b7195d5f2..35b20c7057 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -147,13 +147,6 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_42150 isInAttackRange (Lnet/minecraft/class_1309;)Z ARG 1 entity METHOD method_42646 getItemPickUpRangeExpander ()Lnet/minecraft/class_2382; - METHOD method_44330 getPotentialEscapePositions ()Ljava/lang/Iterable; - COMMENT {@return the list of positions that the entity should try to pathfind to when escaping} - COMMENT - COMMENT @implNote This is used when the current position's {@linkplain #getPathfindingPenalty - COMMENT pathfinding penalty} is negative (i.e. dangerous). Note that currently - COMMENT {@link net.minecraft.entity.ai.pathing.BirdPathNodeMaker} is the only node maker - COMMENT utilizing this method. METHOD method_46644 getSlotToEquip (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1304; ARG 1 stack METHOD method_47824 (Lnet/minecraft/class_1352;)Z diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping index 02cde1ba9b..8643ff06e9 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping @@ -44,7 +44,6 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity FIELD field_33485 HYDRATION_BY_POTION I FIELD field_33764 modelAngles Ljava/util/Map; FIELD field_34005 MAX_REGENERATION_BUFF_DURATION I - FIELD field_37260 LOGGER Lorg/slf4j/Logger; METHOD method_33219 setVariant (Lnet/minecraft/class_5762$class_5767;)V ARG 1 variant METHOD method_33221 shouldBabyBeDifferent (Lnet/minecraft/class_5819;)Z @@ -83,7 +82,7 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity METHOD (Lnet/minecraft/class_5762;)V ARG 1 axolotl CLASS class_5767 Variant - FIELD field_28346 VARIANTS [Lnet/minecraft/class_5762$class_5767; + FIELD field_28346 VARIANTS Ljava/util/function/IntFunction; FIELD field_28347 id I FIELD field_28348 name Ljava/lang/String; FIELD field_28349 natural Z diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index b90f09f64a..4e775cdc95 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -168,7 +168,7 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity METHOD method_18432 canNotCalmDown ()Z CLASS class_4038 MoveToHuntGoal CLASS class_4039 Type - FIELD field_17998 TYPES [Lnet/minecraft/class_4019$class_4039; + FIELD field_17998 TYPES Ljava/util/function/IntFunction; FIELD field_18000 id I FIELD field_18001 key Ljava/lang/String; FIELD field_41548 CODEC Lnet/minecraft/class_3542$class_7292; diff --git a/mappings/net/minecraft/entity/passive/HorseColor.mapping b/mappings/net/minecraft/entity/passive/HorseColor.mapping index 380ebaf597..c5e97e5649 100644 --- a/mappings/net/minecraft/entity/passive/HorseColor.mapping +++ b/mappings/net/minecraft/entity/passive/HorseColor.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5149 net/minecraft/entity/passive/HorseColor - FIELD field_23823 VALUES [Lnet/minecraft/class_5149; + FIELD field_23823 VALUES Ljava/util/function/IntFunction; FIELD field_23824 index I FIELD field_41595 CODEC Lcom/mojang/serialization/Codec; FIELD field_41596 name Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/passive/HorseMarking.mapping b/mappings/net/minecraft/entity/passive/HorseMarking.mapping index 1b98a02546..d4f90cf1cf 100644 --- a/mappings/net/minecraft/entity/passive/HorseMarking.mapping +++ b/mappings/net/minecraft/entity/passive/HorseMarking.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5148 net/minecraft/entity/passive/HorseMarking - FIELD field_23813 VALUES [Lnet/minecraft/class_5148; + FIELD field_23813 VALUES Ljava/util/function/IntFunction; FIELD field_23814 index I METHOD (Ljava/lang/String;II)V ARG 3 index diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index 07b898d841..4665b92e8d 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -45,7 +45,7 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity ARG 1 llama CLASS class_7993 Variant FIELD field_41590 CODEC Lcom/mojang/serialization/Codec; - FIELD field_41591 VALUES [Lnet/minecraft/class_1501$class_7993; + FIELD field_41591 VALUES Ljava/util/function/IntFunction; FIELD field_41592 index I FIELD field_41593 name Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index 6e9c694226..831fcf0377 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -109,7 +109,7 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity METHOD method_6561 isBambooClose ()Z CLASS class_1443 Gene FIELD field_6785 id I - FIELD field_6786 VALUES [Lnet/minecraft/class_1440$class_1443; + FIELD field_6786 VALUES Ljava/util/function/IntFunction; FIELD field_6790 recessive Z FIELD field_6797 name Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;Z)V @@ -119,7 +119,6 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity METHOD method_17688 createRandom (Lnet/minecraft/class_5819;)Lnet/minecraft/class_1440$class_1443; ARG 0 random METHOD method_6564 getId ()I - METHOD method_6565 getName ()Ljava/lang/String; METHOD method_6566 byId (I)Lnet/minecraft/class_1440$class_1443; ARG 0 id METHOD method_6567 byName (Ljava/lang/String;)Lnet/minecraft/class_1440$class_1443; diff --git a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping index f87e8272b8..a024de46b5 100644 --- a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping @@ -40,7 +40,7 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity METHOD method_38066 locateTree ()Lnet/minecraft/class_243; CLASS class_7989 Variant FIELD field_41555 CODEC Lcom/mojang/serialization/Codec; - FIELD field_41556 VALUES [Lnet/minecraft/class_1453$class_7989; + FIELD field_41556 VALUES Ljava/util/function/IntFunction; FIELD field_41557 index I FIELD field_41558 name Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index ddd34bd97e..aeea97b894 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -84,5 +84,3 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity METHOD method_47856 getIndex ()I METHOD method_47857 byIndex (I)Lnet/minecraft/class_1463$class_7990; ARG 0 index - METHOD method_47858 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V - ARG 0 map diff --git a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping index b8c3599419..5c159d8879 100644 --- a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping @@ -40,8 +40,6 @@ CLASS net/minecraft/class_1474 net/minecraft/entity/passive/TropicalFishEntity METHOD method_47867 getSize ()Lnet/minecraft/class_1474$class_7991; METHOD method_47868 fromId (I)Lnet/minecraft/class_1474$class_1475; ARG 0 id - METHOD method_47869 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V - ARG 0 map METHOD method_47870 getId ()I METHOD method_47871 getText ()Lnet/minecraft/class_2561; CLASS class_1476 TropicalFishData diff --git a/mappings/net/minecraft/item/FireworkRocketItem.mapping b/mappings/net/minecraft/item/FireworkRocketItem.mapping index 47cb8ec0f2..ccb23799c9 100644 --- a/mappings/net/minecraft/item/FireworkRocketItem.mapping +++ b/mappings/net/minecraft/item/FireworkRocketItem.mapping @@ -16,13 +16,11 @@ CLASS net/minecraft/class_1781 net/minecraft/item/FireworkRocketItem CLASS class_1782 Type FIELD field_7971 name Ljava/lang/String; FIELD field_7972 id I - FIELD field_7975 TYPES [Lnet/minecraft/class_1781$class_1782; + FIELD field_7975 TYPES Ljava/util/function/IntFunction; METHOD (Ljava/lang/String;IILjava/lang/String;)V ARG 3 id ARG 4 name METHOD method_7812 getName ()Ljava/lang/String; METHOD method_7813 byId (I)Lnet/minecraft/class_1781$class_1782; ARG 0 id - METHOD method_7814 (Lnet/minecraft/class_1781$class_1782;)I - ARG 0 type METHOD method_7816 getId ()I diff --git a/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping index 3b15ce903f..4ba44e89ba 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardCriterion.mapping @@ -36,7 +36,6 @@ CLASS net/minecraft/class_274 net/minecraft/scoreboard/ScoreboardCriterion METHOD method_37271 getAllSimpleCriteria ()Ljava/util/Set; CLASS class_275 RenderType FIELD field_1469 name Ljava/lang/String; - FIELD field_1470 CRITERION_TYPES Ljava/util/Map; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name METHOD method_1228 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/server/command/LocateCommand.mapping b/mappings/net/minecraft/server/command/LocateCommand.mapping index 94e369df49..4dbac887c8 100644 --- a/mappings/net/minecraft/server/command/LocateCommand.mapping +++ b/mappings/net/minecraft/server/command/LocateCommand.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand ARG 2 style METHOD method_13448 (Lnet/minecraft/class_2168;)Z ARG 0 source - METHOD method_24499 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;Z)I + METHOD method_24499 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_7066$class_7068;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;ZLjava/time/Duration;)I ARG 0 source ARG 1 structure ARG 2 currentPos @@ -63,14 +63,14 @@ CLASS net/minecraft/class_3079 net/minecraft/server/command/LocateCommand ARG 0 id METHOD method_45147 getKeyString (Lcom/mojang/datafixers/util/Pair;)Ljava/lang/String; ARG 0 result - METHOD method_45148 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_7737$class_7741;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;Z)I + METHOD method_45148 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_7737$class_7741;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;ZLjava/time/Duration;)I ARG 0 source ARG 1 predicate ARG 2 currentPos ARG 3 result ARG 4 successMessage ARG 5 includeY - METHOD method_45149 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;ZLjava/lang/String;)I + METHOD method_45149 sendCoordinates (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;ZLjava/lang/String;Ljava/time/Duration;)I ARG 0 source ARG 1 currentPos ARG 2 result diff --git a/mappings/net/minecraft/sound/SoundEvent.mapping b/mappings/net/minecraft/sound/SoundEvent.mapping index ba196a5ee6..898696bd4e 100644 --- a/mappings/net/minecraft/sound/SoundEvent.mapping +++ b/mappings/net/minecraft/sound/SoundEvent.mapping @@ -1,19 +1,11 @@ CLASS net/minecraft/class_3414 net/minecraft/sound/SoundEvent FIELD field_14533 id Lnet/minecraft/class_2960; - FIELD field_24628 CODEC Lcom/mojang/serialization/Codec; FIELD field_38690 distanceToTravel F FIELD field_38691 staticDistance Z - METHOD (Lnet/minecraft/class_2960;)V - ARG 1 id - METHOD (Lnet/minecraft/class_2960;F)V - ARG 1 id - ARG 2 distanceToTravel METHOD (Lnet/minecraft/class_2960;FZ)V ARG 1 id ARG 2 distanceToTravel ARG 3 useStaticDistance METHOD method_14833 getId ()Lnet/minecraft/class_2960; - METHOD method_28132 (Lnet/minecraft/class_3414;)Lnet/minecraft/class_2960; - ARG 0 soundEvent METHOD method_43044 getDistanceToTravel (F)F ARG 1 volume diff --git a/mappings/net/minecraft/util/DyeColor.mapping b/mappings/net/minecraft/util/DyeColor.mapping index 3fb9459d08..70847eaa29 100644 --- a/mappings/net/minecraft/util/DyeColor.mapping +++ b/mappings/net/minecraft/util/DyeColor.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_1767 net/minecraft/util/DyeColor FIELD field_7948 name Ljava/lang/String; FIELD field_7950 BY_FIREWORK_COLOR Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap; FIELD field_7956 mapColor Lnet/minecraft/class_3620; - FIELD field_7959 VALUES [Lnet/minecraft/class_1767; + FIELD field_7959 VALUES Ljava/util/function/IntFunction; FIELD field_7960 fireworkColor I FIELD field_7965 id I METHOD (Ljava/lang/String;IILjava/lang/String;ILnet/minecraft/class_3620;II)V diff --git a/mappings/net/minecraft/village/VillageGossipType.mapping b/mappings/net/minecraft/village/VillageGossipType.mapping index bc261e3af6..8d485590af 100644 --- a/mappings/net/minecraft/village/VillageGossipType.mapping +++ b/mappings/net/minecraft/village/VillageGossipType.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_4139 net/minecraft/village/VillageGossipType FIELD field_18431 multiplier I FIELD field_18432 maxValue I FIELD field_18434 shareDecrement I - FIELD field_18435 BY_KEY Ljava/util/Map; FIELD field_19354 decay I FIELD field_30240 MAX_TRADING_REPUTATION I FIELD field_30241 TRADING_GOSSIP_SHARE_DECREMENT I @@ -14,7 +13,3 @@ CLASS net/minecraft/class_4139 net/minecraft/village/VillageGossipType ARG 5 maxReputation ARG 6 decay ARG 7 shareDecrement - METHOD method_19089 (Lnet/minecraft/class_4139;)Ljava/lang/String; - ARG 0 type - METHOD method_19090 byKey (Ljava/lang/String;)Lnet/minecraft/class_4139; - ARG 0 key diff --git a/mappings/net/minecraft/village/VillagerGossips.mapping b/mappings/net/minecraft/village/VillagerGossips.mapping index db7a322a0c..ec9ecca7af 100644 --- a/mappings/net/minecraft/village/VillagerGossips.mapping +++ b/mappings/net/minecraft/village/VillagerGossips.mapping @@ -18,8 +18,7 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips ARG 3 right METHOD method_19066 deserialize (Lcom/mojang/serialization/Dynamic;)V ARG 1 dynamic - METHOD method_19067 serialize (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; - ARG 1 ops + METHOD method_19067 serialize (Lcom/mojang/serialization/DynamicOps;)Ljava/lang/Object; METHOD method_19069 (Ljava/util/Map$Entry;)Ljava/util/stream/Stream; ARG 0 entry METHOD method_19070 pickGossips (Lnet/minecraft/class_5819;I)Ljava/util/Collection; @@ -40,10 +39,6 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips METHOD method_19076 (Ljava/util/UUID;)Lnet/minecraft/class_4136$class_4137; ARG 0 uuid METHOD method_20651 decay ()V - METHOD method_28350 (Lcom/mojang/serialization/DataResult;)Ljava/util/stream/Stream; - ARG 0 result - METHOD method_28351 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_4136$class_4138;)Lcom/mojang/serialization/Dynamic; - ARG 1 entry METHOD method_35120 getEntityReputationAssociatedGossips ()Ljava/util/Map; METHOD method_35121 remove (Lnet/minecraft/class_4139;)V ARG 1 type @@ -80,18 +75,14 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips METHOD method_20655 remove (Lnet/minecraft/class_4139;)V ARG 1 gossipType CLASS class_4138 GossipEntry - FIELD field_18421 target Ljava/util/UUID; - FIELD field_18422 type Lnet/minecraft/class_4139; - FIELD field_18423 value I - FIELD field_30237 TARGET_KEY Ljava/lang/String; - FIELD field_30238 TYPE_KEY Ljava/lang/String; - FIELD field_30239 VALUE_KEY Ljava/lang/String; + FIELD comp_1180 target Ljava/util/UUID; + FIELD comp_1181 type Lnet/minecraft/class_4139; + FIELD comp_1182 value I METHOD (Ljava/util/UUID;Lnet/minecraft/class_4139;I)V ARG 1 target ARG 2 type ARG 3 value + METHOD comp_1180 target ()Ljava/util/UUID; + METHOD comp_1181 type ()Lnet/minecraft/class_4139; + METHOD comp_1182 value ()I METHOD method_19083 getValue ()I - METHOD method_19084 deserialize (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/DataResult; - ARG 0 dynamic - METHOD method_19087 serialize (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; - ARG 1 ops diff --git a/mappings/net/minecraft/world/Difficulty.mapping b/mappings/net/minecraft/world/Difficulty.mapping index d40cb281a1..f9c4cb46c4 100644 --- a/mappings/net/minecraft/world/Difficulty.mapping +++ b/mappings/net/minecraft/world/Difficulty.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1267 net/minecraft/world/Difficulty - FIELD field_5800 BY_NAME [Lnet/minecraft/class_1267; + FIELD field_5800 BY_NAME Ljava/util/function/IntFunction; FIELD field_5803 id I FIELD field_5806 name Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/world/GameMode.mapping b/mappings/net/minecraft/world/GameMode.mapping index 9943c78323..39d62022b5 100644 --- a/mappings/net/minecraft/world/GameMode.mapping +++ b/mappings/net/minecraft/world/GameMode.mapping @@ -17,9 +17,6 @@ CLASS net/minecraft/class_1934 net/minecraft/world/GameMode ARG 0 name ARG 1 defaultMode METHOD method_8379 getId ()I - METHOD method_8380 byId (ILnet/minecraft/class_1934;)Lnet/minecraft/class_1934; - ARG 0 id - ARG 1 defaultMode METHOD method_8381 getName ()Ljava/lang/String; METHOD method_8382 setAbilities (Lnet/minecraft/class_1656;)V ARG 1 abilities diff --git a/mappings/net/minecraft/world/gen/structure/Structure.mapping b/mappings/net/minecraft/world/gen/structure/Structure.mapping index b5d2955b69..ef84a49f9d 100644 --- a/mappings/net/minecraft/world/gen/structure/Structure.mapping +++ b/mappings/net/minecraft/world/gen/structure/Structure.mapping @@ -31,11 +31,8 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/structure/Structure ARG 0 context ARG 1 heightmap ARG 2 generator - METHOD method_41613 isBiomeValid (Lnet/minecraft/class_3195$class_7150;Lnet/minecraft/class_2794;Lnet/minecraft/class_7138;Ljava/util/function/Predicate;)Z + METHOD method_41613 isBiomeValid (Lnet/minecraft/class_3195$class_7150;Lnet/minecraft/class_3195$class_7149;)Z ARG 0 result - ARG 1 chunkGenerator - ARG 2 noiseConfig - ARG 3 validBiomes METHOD method_41614 createStructureStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_7138;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; ARG 1 dynamicRegistryManager ARG 2 chunkGenerator