From 5a8fadee70cf63d0033873cc7ddc8ff7bde3e8ef Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 22 Nov 2023 15:02:39 +0000 Subject: [PATCH] 1.20.3-pre2 --- build.gradle | 2 +- .../net/minecraft/client/gui/hud/SubtitlesHud.mapping | 5 +---- .../client/sound/SoundInstanceListener.mapping | 2 +- .../net/minecraft/client/sound/SoundListener.mapping | 7 ------- .../minecraft/entity/effect/StatusEffectUtil.mapping | 2 +- mappings/net/minecraft/nbt/NbtIo.mapping | 6 ------ mappings/net/minecraft/potion/PotionUtil.mapping | 4 ++-- mappings/net/minecraft/scoreboard/Scoreboard.mapping | 10 ++++------ mappings/net/minecraft/scoreboard/Scores.mapping | 4 +--- .../minecraft/server/command/FunctionCommand.mapping | 2 -- mappings/net/minecraft/util/StringHelper.mapping | 2 +- .../minecraft/world/level/storage/LevelStorage.mapping | 1 - 12 files changed, 12 insertions(+), 35 deletions(-) diff --git a/build.gradle b/build.gradle index 099834dfd3..8d3c61a10f 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.20.3-pre1" +def minecraft_version = "1.20.3-pre2" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping index 4418290988..81a350d128 100644 --- a/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping @@ -3,17 +3,14 @@ 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 - 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; - METHOD (Lnet/minecraft/class_2561;Lnet/minecraft/class_243;)V + METHOD (Lnet/minecraft/class_2561;FLnet/minecraft/class_243;)V ARG 1 text - ARG 2 pos METHOD method_1958 reset (Lnet/minecraft/class_243;)V ARG 1 pos METHOD method_1959 getPosition ()Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/client/sound/SoundInstanceListener.mapping b/mappings/net/minecraft/client/sound/SoundInstanceListener.mapping index d5ed0df8ee..e8bea1f37b 100644 --- a/mappings/net/minecraft/client/sound/SoundInstanceListener.mapping +++ b/mappings/net/minecraft/client/sound/SoundInstanceListener.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_1145 net/minecraft/client/sound/SoundInstanceListener - METHOD method_4884 onSoundPlayed (Lnet/minecraft/class_1113;Lnet/minecraft/class_1146;)V + METHOD method_4884 onSoundPlayed (Lnet/minecraft/class_1113;Lnet/minecraft/class_1146;F)V ARG 1 sound ARG 2 soundSet diff --git a/mappings/net/minecraft/client/sound/SoundListener.mapping b/mappings/net/minecraft/client/sound/SoundListener.mapping index ed7bee9db0..9ec0d48bab 100644 --- a/mappings/net/minecraft/client/sound/SoundListener.mapping +++ b/mappings/net/minecraft/client/sound/SoundListener.mapping @@ -1,13 +1,6 @@ CLASS net/minecraft/class_4227 net/minecraft/client/sound/SoundListener FIELD field_18906 volume F - FIELD field_24051 pos Lnet/minecraft/class_243; METHOD method_19669 getVolume ()F METHOD method_19670 setVolume (F)V ARG 1 volume - METHOD method_19671 setPosition (Lnet/minecraft/class_243;)V - ARG 1 position - METHOD method_19672 setOrientation (Lorg/joml/Vector3f;Lorg/joml/Vector3f;)V - ARG 1 at - ARG 2 up METHOD method_19673 init ()V - METHOD method_27268 getPos ()Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping b/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping index 5180b60e8a..dfde556970 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectUtil.mapping @@ -16,6 +16,6 @@ CLASS net/minecraft/class_1292 net/minecraft/entity/effect/StatusEffectUtil ARG 0 entity METHOD method_5576 hasHaste (Lnet/minecraft/class_1309;)Z ARG 0 entity - METHOD method_5577 getDurationText (Lnet/minecraft/class_1293;F)Lnet/minecraft/class_2561; + METHOD method_5577 getDurationText (Lnet/minecraft/class_1293;FF)Lnet/minecraft/class_2561; ARG 0 effect ARG 1 multiplier diff --git a/mappings/net/minecraft/nbt/NbtIo.mapping b/mappings/net/minecraft/nbt/NbtIo.mapping index a507bbb666..518ac52c4d 100644 --- a/mappings/net/minecraft/nbt/NbtIo.mapping +++ b/mappings/net/minecraft/nbt/NbtIo.mapping @@ -162,12 +162,6 @@ CLASS net/minecraft/class_2507 net/minecraft/nbt/NbtIo COMMENT @throws NbtSizeValidationException if the {@code tracker}'s validation fails ARG 0 input ARG 1 tracker - METHOD method_54661 toCompressedBytes (Lnet/minecraft/class_2487;)[B - COMMENT {@return the compressed byte array serialization of {@code nbt}} - ARG 0 nbt - METHOD method_54662 toBytes (Lnet/minecraft/class_2487;)[B - COMMENT {@return the byte array serialization of {@code nbt}} - ARG 0 nbt METHOD method_54906 compress (Ljava/io/OutputStream;)Ljava/io/DataOutputStream; COMMENT {@return a new output stream that compresses the input {@code stream}} ARG 0 stream diff --git a/mappings/net/minecraft/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping index e72b9f18f3..829083a8b8 100644 --- a/mappings/net/minecraft/potion/PotionUtil.mapping +++ b/mappings/net/minecraft/potion/PotionUtil.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil FIELD field_30944 CUSTOM_POTION_COLOR_KEY Ljava/lang/String; FIELD field_30945 POTION_KEY Ljava/lang/String; FIELD field_30946 DEFAULT_COLOR I - METHOD method_47372 buildTooltip (Lnet/minecraft/class_1799;Ljava/util/List;F)V + METHOD method_47372 buildTooltip (Lnet/minecraft/class_1799;Ljava/util/List;FF)V ARG 0 stack ARG 1 list ARG 2 durationMultiplier @@ -32,7 +32,7 @@ CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil ARG 0 stack METHOD method_8064 getColor (Lnet/minecraft/class_1799;)I ARG 0 stack - METHOD method_8065 buildTooltip (Ljava/util/List;Ljava/util/List;F)V + METHOD method_8065 buildTooltip (Ljava/util/List;Ljava/util/List;FF)V ARG 0 statusEffects ARG 1 list ARG 2 durationMultiplier diff --git a/mappings/net/minecraft/scoreboard/Scoreboard.mapping b/mappings/net/minecraft/scoreboard/Scoreboard.mapping index c70a01f766..96087f7980 100644 --- a/mappings/net/minecraft/scoreboard/Scoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/Scoreboard.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard - FIELD field_1426 teams Ljava/util/Map; - FIELD field_1427 teamsByScoreHolder Ljava/util/Map; - FIELD field_1428 objectives Ljava/util/Map; - FIELD field_1429 objectivesByCriterion Ljava/util/Map; + FIELD field_1426 teams Lit/unimi/dsi/fastutil/objects/Object2ObjectMap; + FIELD field_1427 teamsByScoreHolder Lit/unimi/dsi/fastutil/objects/Object2ObjectMap; + FIELD field_1428 objectives Lit/unimi/dsi/fastutil/objects/Object2ObjectMap; + FIELD field_1429 objectivesByCriterion Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap; FIELD field_1431 scores Ljava/util/Map; FIELD field_1432 objectiveSlots Ljava/util/Map; FIELD field_36309 LOGGER Lorg/slf4j/Logger; @@ -60,8 +60,6 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 2 objective ARG 3 score METHOD method_1178 getKnownScoreHolders ()Ljava/util/Collection; - METHOD method_1179 (Lnet/minecraft/class_274;)Ljava/util/List; - ARG 0 criterionx METHOD method_1180 getOrCreateScore (Lnet/minecraft/class_9015;Lnet/minecraft/class_266;)Lnet/minecraft/class_9014; ARG 1 scoreHolder ARG 2 objective diff --git a/mappings/net/minecraft/scoreboard/Scores.mapping b/mappings/net/minecraft/scoreboard/Scores.mapping index 454fa841f1..6fe5462c59 100644 --- a/mappings/net/minecraft/scoreboard/Scores.mapping +++ b/mappings/net/minecraft/scoreboard/Scores.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_9012 net/minecraft/scoreboard/Scores - FIELD field_47529 scores Ljava/util/Map; + FIELD field_47529 scores Lit/unimi/dsi/fastutil/objects/Reference2ObjectOpenHashMap; METHOD method_55388 hasScores ()Z METHOD method_55389 get (Lnet/minecraft/class_266;)Lnet/minecraft/class_267; ARG 1 objective @@ -12,8 +12,6 @@ CLASS net/minecraft/class_9012 net/minecraft/scoreboard/Scores METHOD method_55392 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_266;Lnet/minecraft/class_267;)V ARG 1 objective ARG 2 score - METHOD method_55393 (Ljava/util/function/Consumer;Lnet/minecraft/class_266;)Lnet/minecraft/class_267; - ARG 1 objective2 METHOD method_55394 getScoresAsIntMap ()Lit/unimi/dsi/fastutil/objects/Object2IntMap; METHOD method_55395 remove (Lnet/minecraft/class_266;)Z ARG 1 objective diff --git a/mappings/net/minecraft/server/command/FunctionCommand.mapping b/mappings/net/minecraft/server/command/FunctionCommand.mapping index 89c3d1d068..ce52d50738 100644 --- a/mappings/net/minecraft/server/command/FunctionCommand.mapping +++ b/mappings/net/minecraft/server/command/FunctionCommand.mapping @@ -78,8 +78,6 @@ CLASS net/minecraft/class_3062 net/minecraft/server/command/FunctionCommand CLASS class_8833 Command METHOD method_54277 getArguments (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2487; ARG 1 context - METHOD method_54282 (Lcom/mojang/datafixers/util/Either;)Ljava/util/Collection; - ARG 0 functionOrTag CLASS class_8932 ReturnValueAdder FIELD field_47152 successful Z FIELD field_47153 returnValue I diff --git a/mappings/net/minecraft/util/StringHelper.mapping b/mappings/net/minecraft/util/StringHelper.mapping index 1ac5366114..ad6c088195 100644 --- a/mappings/net/minecraft/util/StringHelper.mapping +++ b/mappings/net/minecraft/util/StringHelper.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_3544 net/minecraft/util/StringHelper METHOD method_15438 isEmpty (Ljava/lang/String;)Z COMMENT {@return true if {@code text} is {@code null} or empty, false otherwise} ARG 0 text - METHOD method_15439 formatTicks (I)Ljava/lang/String; + METHOD method_15439 formatTicks (IF)Ljava/lang/String; 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 diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index e2616fc2ad..3854667f61 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage FIELD field_44951 DEFAULT_ALLOWED_SYMLINK_MATCHER Ljava/nio/file/PathMatcher; FIELD field_44952 symlinkFinder Lnet/minecraft/class_8580; FIELD field_46830 MAX_LEVEL_DATA_SIZE I - FIELD field_46831 handlingError Z METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_8580;Lcom/mojang/datafixers/DataFixer;)V ARG 1 savesDirectory ARG 2 backupsDirectory