From b35ad99fd6d5769aced0b65869aa912afd047939 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 23 Nov 2023 02:55:27 +1100 Subject: [PATCH] 1.20.3-pre2 stuff (#3738) --- .../net/minecraft/client/gui/hud/SubtitlesHud.mapping | 8 ++++++++ .../minecraft/client/sound/SoundInstanceListener.mapping | 1 + mappings/net/minecraft/client/sound/SoundListener.mapping | 4 ++++ .../minecraft/client/sound/SoundListenerTransform.mapping | 3 +++ mappings/net/minecraft/client/sound/SoundManager.mapping | 1 + mappings/net/minecraft/client/sound/SoundSystem.mapping | 1 + .../net/minecraft/command/CommandExecutionContext.mapping | 1 + .../command/argument/CommandFunctionArgumentType.mapping | 5 +++++ .../command/argument/ScoreHolderArgumentType.mapping | 6 ++++++ .../net/minecraft/entity/ai/goal/EatGrassGoal.mapping | 2 +- .../net/minecraft/entity/effect/StatusEffectUtil.mapping | 1 + .../entity/projectile/ExplosiveProjectileEntity.mapping | 1 + mappings/net/minecraft/potion/PotionUtil.mapping | 2 ++ mappings/net/minecraft/util/StringHelper.mapping | 1 + 14 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 mappings/net/minecraft/client/sound/SoundListenerTransform.mapping diff --git a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping index 81a350d128..7b0037d42d 100644 --- a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping @@ -3,16 +3,24 @@ CLASS net/minecraft/class_359 net/minecraft/client/gui/hud/SubtitlesHud FIELD field_2183 entries Ljava/util/List; FIELD field_2184 enabled Z FIELD field_32214 REMOVE_DELAY J + FIELD field_47672 audibleEntries Ljava/util/List; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client METHOD method_1957 render (Lnet/minecraft/class_332;)V ARG 1 context CLASS class_360 SubtitleEntry FIELD field_2185 time J FIELD field_2186 pos Lnet/minecraft/class_243; FIELD field_2188 text Lnet/minecraft/class_2561; + FIELD field_47673 range F METHOD (Lnet/minecraft/class_2561;FLnet/minecraft/class_243;)V ARG 1 text + ARG 2 range + ARG 3 pos METHOD method_1958 reset (Lnet/minecraft/class_243;)V ARG 1 pos METHOD method_1959 getPosition ()Lnet/minecraft/class_243; METHOD method_1960 getText ()Lnet/minecraft/class_2561; METHOD method_1961 getTime ()J + METHOD method_55589 canHearFrom (Lnet/minecraft/class_243;)Z + ARG 1 pos diff --git a/mappings/net/minecraft/client/sound/SoundInstanceListener.mapping b/mappings/net/minecraft/client/sound/SoundInstanceListener.mapping index e8bea1f37b..a6b148f970 100644 --- a/mappings/net/minecraft/client/sound/SoundInstanceListener.mapping +++ b/mappings/net/minecraft/client/sound/SoundInstanceListener.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_1145 net/minecraft/client/sound/SoundInstanceListener METHOD method_4884 onSoundPlayed (Lnet/minecraft/class_1113;Lnet/minecraft/class_1146;F)V ARG 1 sound ARG 2 soundSet + ARG 3 range diff --git a/mappings/net/minecraft/client/sound/SoundListener.mapping b/mappings/net/minecraft/client/sound/SoundListener.mapping index 9ec0d48bab..deec36403e 100644 --- a/mappings/net/minecraft/client/sound/SoundListener.mapping +++ b/mappings/net/minecraft/client/sound/SoundListener.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/class_4227 net/minecraft/client/sound/SoundListener FIELD field_18906 volume F + FIELD field_47670 transform Lnet/minecraft/class_9054; METHOD method_19669 getVolume ()F METHOD method_19670 setVolume (F)V ARG 1 volume METHOD method_19673 init ()V + METHOD method_55584 setTransform (Lnet/minecraft/class_9054;)V + ARG 1 transform + METHOD method_55585 getTransform ()Lnet/minecraft/class_9054; diff --git a/mappings/net/minecraft/client/sound/SoundListenerTransform.mapping b/mappings/net/minecraft/client/sound/SoundListenerTransform.mapping new file mode 100644 index 0000000000..8073e6ccd0 --- /dev/null +++ b/mappings/net/minecraft/client/sound/SoundListenerTransform.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9054 net/minecraft/client/sound/SoundListenerTransform + FIELD field_47671 DEFAULT Lnet/minecraft/class_9054; + METHOD method_55586 right ()Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/client/sound/SoundManager.mapping b/mappings/net/minecraft/client/sound/SoundManager.mapping index 67b7982284..caeba2a6d0 100644 --- a/mappings/net/minecraft/client/sound/SoundManager.mapping +++ b/mappings/net/minecraft/client/sound/SoundManager.mapping @@ -52,6 +52,7 @@ CLASS net/minecraft/class_1144 net/minecraft/client/sound/SoundManager METHOD method_4881 stopAll ()V METHOD method_4882 close ()V METHOD method_54649 stopAbruptly ()V + METHOD method_55593 getListenerTransform ()Lnet/minecraft/class_9054; CLASS class_4009 SoundList FIELD field_17908 loadedSounds Ljava/util/Map; FIELD field_40577 foundSounds Ljava/util/Map; diff --git a/mappings/net/minecraft/client/sound/SoundSystem.mapping b/mappings/net/minecraft/client/sound/SoundSystem.mapping index fe616806d2..96f16cffcf 100644 --- a/mappings/net/minecraft/client/sound/SoundSystem.mapping +++ b/mappings/net/minecraft/client/sound/SoundSystem.mapping @@ -109,4 +109,5 @@ CLASS net/minecraft/class_1140 net/minecraft/client/sound/SoundSystem METHOD method_4856 stop ()V METHOD method_4857 tick ()V METHOD method_54648 stopAbruptly ()V + METHOD method_55592 getListenerTransform ()Lnet/minecraft/class_9054; CLASS class_6665 DeviceChangeStatus diff --git a/mappings/net/minecraft/command/CommandExecutionContext.mapping b/mappings/net/minecraft/command/CommandExecutionContext.mapping index e3c2d949c1..892b78860a 100644 --- a/mappings/net/minecraft/command/CommandExecutionContext.mapping +++ b/mappings/net/minecraft/command/CommandExecutionContext.mapping @@ -41,3 +41,4 @@ CLASS net/minecraft/class_8854 net/minecraft/command/CommandExecutionContext ARG 1 returnValueConsumer METHOD method_54890 getEscapeControl (I)Lnet/minecraft/class_8937$class_8938; ARG 1 depth + METHOD method_55594 queuePendingCommands ()V diff --git a/mappings/net/minecraft/command/argument/CommandFunctionArgumentType.mapping b/mappings/net/minecraft/command/argument/CommandFunctionArgumentType.mapping index 4a31c9fcc1..f3f4907d1d 100644 --- a/mappings/net/minecraft/command/argument/CommandFunctionArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/CommandFunctionArgumentType.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_2284 net/minecraft/command/argument/CommandFunctionArg FIELD field_10782 UNKNOWN_FUNCTION_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_10783 EXAMPLES Ljava/util/Collection; FIELD field_10784 UNKNOWN_FUNCTION_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + METHOD method_55590 getIdentifiedFunctions (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lcom/mojang/datafixers/util/Pair; + ARG 0 context + ARG 1 name METHOD method_9760 commandFunction ()Lnet/minecraft/class_2284; METHOD method_9761 getFunction (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2960;)Lnet/minecraft/class_2158; ARG 0 context @@ -22,6 +25,8 @@ CLASS net/minecraft/class_2284 net/minecraft/command/argument/CommandFunctionArg METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; ARG 1 reader CLASS class_2285 FunctionArgument + METHOD method_55591 getIdentifiedFunctions (Lcom/mojang/brigadier/context/CommandContext;)Lcom/mojang/datafixers/util/Pair; + ARG 1 context METHOD method_9770 getFunctionOrTag (Lcom/mojang/brigadier/context/CommandContext;)Lcom/mojang/datafixers/util/Pair; ARG 1 context METHOD method_9771 getFunctions (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; diff --git a/mappings/net/minecraft/command/argument/ScoreHolderArgumentType.mapping b/mappings/net/minecraft/command/argument/ScoreHolderArgumentType.mapping index ba9d943df3..64689a8c15 100644 --- a/mappings/net/minecraft/command/argument/ScoreHolderArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ScoreHolderArgumentType.mapping @@ -5,6 +5,12 @@ CLASS net/minecraft/class_2233 net/minecraft/command/argument/ScoreHolderArgumen FIELD field_9951 SUGGESTION_PROVIDER Lcom/mojang/brigadier/suggestion/SuggestionProvider; METHOD (Z)V ARG 1 multiple + METHOD method_55587 (Ljava/lang/String;Ljava/util/List;Lnet/minecraft/class_2168;Ljava/util/function/Supplier;)Ljava/util/Collection; + ARG 2 source + ARG 3 holders + METHOD method_55588 (Ljava/util/UUID;Ljava/util/List;Lnet/minecraft/class_2168;Ljava/util/function/Supplier;)Ljava/util/Collection; + ARG 2 source + ARG 3 holders METHOD method_9447 scoreHolder ()Lnet/minecraft/class_2233; METHOD method_9448 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)V ARG 1 builderx diff --git a/mappings/net/minecraft/entity/ai/goal/EatGrassGoal.mapping b/mappings/net/minecraft/entity/ai/goal/EatGrassGoal.mapping index 95c8101533..93de6235f1 100644 --- a/mappings/net/minecraft/entity/ai/goal/EatGrassGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/EatGrassGoal.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_1345 net/minecraft/entity/ai/goal/EatGrassGoal FIELD field_30203 MAX_TIMER I FIELD field_6421 world Lnet/minecraft/class_1937; FIELD field_6422 timer I - FIELD field_6423 GRASS_PREDICATE Ljava/util/function/Predicate; + FIELD field_6423 SHORT_GRASS_PREDICATE Ljava/util/function/Predicate; FIELD field_6424 mob Lnet/minecraft/class_1308; METHOD (Lnet/minecraft/class_1308;)V ARG 1 mob diff --git a/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping b/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping index dfde556970..496daec456 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping @@ -19,3 +19,4 @@ CLASS net/minecraft/class_1292 net/minecraft/entity/effect/StatusEffectUtil METHOD method_5577 getDurationText (Lnet/minecraft/class_1293;FF)Lnet/minecraft/class_2561; ARG 0 effect ARG 1 multiplier + ARG 2 tickRate diff --git a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping index 9b447cba62..d7557881be 100644 --- a/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ExplosiveProjectileEntity.mapping @@ -25,6 +25,7 @@ CLASS net/minecraft/class_1668 net/minecraft/entity/projectile/ExplosiveProjecti ARG 7 directionZ ARG 9 world METHOD method_55053 getRaycastShapeType ()Lnet/minecraft/class_3959$class_3960; + METHOD method_55583 getDragInWater ()F METHOD method_7466 getDrag ()F METHOD method_7467 getParticleType ()Lnet/minecraft/class_2394; METHOD method_7468 isBurning ()Z diff --git a/mappings/net/minecraft/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping index 829083a8b8..f549803bf9 100644 --- a/mappings/net/minecraft/potion/PotionUtil.mapping +++ b/mappings/net/minecraft/potion/PotionUtil.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil ARG 0 stack ARG 1 list ARG 2 durationMultiplier + ARG 3 tickRate METHOD method_8055 getColor (Ljava/util/Collection;)I ARG 0 effects METHOD method_8056 setCustomPotionEffects (Lnet/minecraft/class_1799;Ljava/util/Collection;)Lnet/minecraft/class_1799; @@ -36,6 +37,7 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil ARG 0 statusEffects ARG 1 list ARG 2 durationMultiplier + ARG 3 tickRate METHOD method_8066 getPotionEffects (Lnet/minecraft/class_2487;)Ljava/util/List; ARG 0 nbt METHOD method_8067 getPotionEffects (Lnet/minecraft/class_1799;)Ljava/util/List; diff --git a/mappings/net/minecraft/util/StringHelper.mapping b/mappings/net/minecraft/util/StringHelper.mapping index ad6c088195..92f207032b 100644 --- a/mappings/net/minecraft/util/StringHelper.mapping +++ b/mappings/net/minecraft/util/StringHelper.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_3544 net/minecraft/util/StringHelper COMMENT {@return the length of the {@code tick} in the MM:SS format, where COMMENT the MM is the minutes and SS is the seconds (optionally zero-padded)} ARG 0 ticks + ARG 1 tickRate METHOD method_15440 stripTextFormat (Ljava/lang/String;)Ljava/lang/String; COMMENT {@return the {@code text} with all formatting codes removed} COMMENT