diff --git a/build.gradle b/build.gradle index 76c7922a81..34242257d4 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.19.3-pre2" +def minecraft_version = "1.19.3-pre3" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/enums/Instrument.mapping b/mappings/net/minecraft/block/enums/Instrument.mapping index bce9515ec7..18db383d26 100644 --- a/mappings/net/minecraft/block/enums/Instrument.mapping +++ b/mappings/net/minecraft/block/enums/Instrument.mapping @@ -1,12 +1,11 @@ CLASS net/minecraft/class_2766 net/minecraft/block/enums/Instrument FIELD field_12646 name Ljava/lang/String; - FIELD field_12649 sound Lnet/minecraft/class_3414; + FIELD field_12649 sound Lnet/minecraft/class_6880; FIELD field_41605 type Lnet/minecraft/class_2766$class_7994; - METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_3414;Lnet/minecraft/class_2766$class_7994;)V + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_6880;Lnet/minecraft/class_2766$class_7994;)V ARG 3 name - ARG 4 sound ARG 5 type - METHOD method_11886 getSound ()Lnet/minecraft/class_3414; + METHOD method_11886 getSound ()Lnet/minecraft/class_6880; METHOD method_47590 fromAboveState (Lnet/minecraft/class_2680;)Ljava/util/Optional; ARG 0 state METHOD method_47592 fromBelowState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2766; diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index cf43f0482e..e556d511d4 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -206,7 +206,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1495 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD method_1496 isIntegratedServerRunning ()Z METHOD method_1498 isHudEnabled ()Z - METHOD method_1499 addBlockEntityNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2586;)Lnet/minecraft/class_1799; + METHOD method_1499 addBlockEntityNbt (Lnet/minecraft/class_1799;Lnet/minecraft/class_2586;)V ARG 1 stack ARG 2 blockEntity METHOD method_1502 (Lnet/minecraft/class_1799;)Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/client/render/entity/model/VexEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/VexEntityModel.mapping index 20b8c50cb2..58e5c8327e 100644 --- a/mappings/net/minecraft/client/render/entity/model/VexEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/VexEntityModel.mapping @@ -36,9 +36,3 @@ CLASS net/minecraft/class_617 net/minecraft/client/render/entity/model/VexEntity METHOD (Lnet/minecraft/class_630;)V ARG 1 root METHOD method_32063 getTexturedModelData ()Lnet/minecraft/class_5607; - METHOD method_47434 translateArmToPivot (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_47435 rotateArm (Lnet/minecraft/class_4587;)V - ARG 1 matrices - METHOD method_47436 translateArmAfterScale (Lnet/minecraft/class_4587;)V - ARG 1 matrices diff --git a/mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping b/mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping index 23e0adb0f7..cbdc663e7c 100644 --- a/mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping +++ b/mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping @@ -13,11 +13,9 @@ CLASS net/minecraft/class_4897 net/minecraft/client/sound/BiomeEffectSoundPlayer ARG 1 player ARG 2 soundManager ARG 3 biomeAccess - METHOD method_25459 (Lnet/minecraft/class_3414;Lnet/minecraft/class_1959;Lnet/minecraft/class_4897$class_4898;)Lnet/minecraft/class_4897$class_4898; + METHOD method_25459 (Lnet/minecraft/class_6880;Lnet/minecraft/class_1959;Lnet/minecraft/class_4897$class_4898;)Lnet/minecraft/class_4897$class_4898; ARG 2 sound ARG 3 loop - METHOD method_25460 (Lnet/minecraft/class_1959;Lnet/minecraft/class_3414;)V - ARG 2 sound METHOD method_26270 (Lnet/minecraft/class_4967;)V ARG 1 sound METHOD method_26271 (Lnet/minecraft/class_4968;)V diff --git a/mappings/net/minecraft/client/sound/MusicType.mapping b/mappings/net/minecraft/client/sound/MusicType.mapping index 043d9cffee..e5d1bfc2df 100644 --- a/mappings/net/minecraft/client/sound/MusicType.mapping +++ b/mappings/net/minecraft/client/sound/MusicType.mapping @@ -11,5 +11,4 @@ CLASS net/minecraft/class_1143 net/minecraft/client/sound/MusicType FIELD field_5583 END Lnet/minecraft/class_5195; FIELD field_5585 MENU Lnet/minecraft/class_5195; FIELD field_5586 GAME Lnet/minecraft/class_5195; - METHOD method_27283 createIngameMusic (Lnet/minecraft/class_3414;)Lnet/minecraft/class_5195; - ARG 0 event + METHOD method_27283 createIngameMusic (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5195; diff --git a/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping b/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping index 86b266795b..9464a1bab7 100644 --- a/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping +++ b/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping @@ -1,12 +1,9 @@ CLASS net/minecraft/class_1146 net/minecraft/client/sound/WeightedSoundSet FIELD field_5599 subtitle Lnet/minecraft/class_2561; FIELD field_5600 sounds Ljava/util/List; - FIELD field_5601 random Lnet/minecraft/class_5819; - FIELD field_5602 id Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;)V ARG 1 id ARG 2 subtitle - METHOD method_35812 getId ()Lnet/minecraft/class_2960; METHOD method_4885 add (Lnet/minecraft/class_1148;)V ARG 1 container METHOD method_4886 getSubtitle ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/util/NarratorManager.mapping b/mappings/net/minecraft/client/util/NarratorManager.mapping index a904b632d2..26e3692756 100644 --- a/mappings/net/minecraft/client/util/NarratorManager.mapping +++ b/mappings/net/minecraft/client/util/NarratorManager.mapping @@ -34,9 +34,7 @@ CLASS net/minecraft/class_333 net/minecraft/client/util/NarratorManager COMMENT in a development environment}, logs a debug message for a narrated string. ARG 1 message COMMENT the narrated message - METHOD method_44708 narrateChatMessage (Ljava/util/function/Supplier;)V + METHOD method_44708 narrateChatMessage (Lnet/minecraft/class_2561;)V COMMENT Narrates a lazily supplied chat message. COMMENT COMMENT @see NarratorMode#shouldNarrateChat - ARG 1 messageSupplier - COMMENT the message to narrate diff --git a/mappings/net/minecraft/client/util/telemetry/PerformanceMetricsEvent.mapping b/mappings/net/minecraft/client/util/telemetry/PerformanceMetricsEvent.mapping index b3826b8eee..6f44711e06 100644 --- a/mappings/net/minecraft/client/util/telemetry/PerformanceMetricsEvent.mapping +++ b/mappings/net/minecraft/client/util/telemetry/PerformanceMetricsEvent.mapping @@ -3,12 +3,7 @@ CLASS net/minecraft/class_7977 net/minecraft/client/util/telemetry/PerformanceMe FIELD field_41511 frameRateSamples Lit/unimi/dsi/fastutil/longs/LongList; FIELD field_41512 renderTimeSamples Lit/unimi/dsi/fastutil/longs/LongList; FIELD field_41513 usedMemorySamples Lit/unimi/dsi/fastutil/longs/LongList; - FIELD field_41514 sender Lnet/minecraft/class_7965; - METHOD (Lnet/minecraft/class_7965;)V - ARG 1 sender METHOD method_47785 toKilos (J)J ARG 0 bytes - METHOD method_47787 (Lnet/minecraft/class_7973$class_7974;)V - ARG 1 builder METHOD method_47788 clearSamples ()V METHOD method_47789 sampleUsedMemory ()V diff --git a/mappings/net/minecraft/client/util/telemetry/SampleEvent.mapping b/mappings/net/minecraft/client/util/telemetry/SampleEvent.mapping index 262428c3bb..59d1c38341 100644 --- a/mappings/net/minecraft/client/util/telemetry/SampleEvent.mapping +++ b/mappings/net/minecraft/client/util/telemetry/SampleEvent.mapping @@ -5,10 +5,10 @@ CLASS net/minecraft/class_7976 net/minecraft/client/util/telemetry/SampleEvent FIELD field_41508 enabled Z FIELD field_41509 lastSampleTime Ljava/time/Instant; METHOD method_47777 start ()V - METHOD method_47778 tick ()V + METHOD method_47778 tick (Lnet/minecraft/class_7965;)V METHOD method_47779 shouldSample ()Z METHOD method_47780 shouldSend ()Z METHOD method_47781 disableSampling ()V METHOD method_47782 getSampleCount ()I METHOD method_47783 sample ()V - METHOD method_47784 send ()V + METHOD method_47784 send (Lnet/minecraft/class_7965;)V diff --git a/mappings/net/minecraft/client/util/telemetry/TelemetryEvent.mapping b/mappings/net/minecraft/client/util/telemetry/TelemetryEvent.mapping deleted file mode 100644 index 06166cbf4a..0000000000 --- a/mappings/net/minecraft/client/util/telemetry/TelemetryEvent.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7978 net/minecraft/client/util/telemetry/TelemetryEvent - METHOD method_47786 send (Lnet/minecraft/class_7965;)V - ARG 1 sender diff --git a/mappings/net/minecraft/client/util/telemetry/WorldLoadedEvent.mapping b/mappings/net/minecraft/client/util/telemetry/WorldLoadedEvent.mapping index f934ca64ec..7c3eb23045 100644 --- a/mappings/net/minecraft/client/util/telemetry/WorldLoadedEvent.mapping +++ b/mappings/net/minecraft/client/util/telemetry/WorldLoadedEvent.mapping @@ -1,11 +1,7 @@ CLASS net/minecraft/class_7979 net/minecraft/client/util/telemetry/WorldLoadedEvent - FIELD field_41515 callback Lnet/minecraft/class_7979$class_7980; FIELD field_41516 sent Z FIELD field_41517 gameMode Lnet/minecraft/class_7969$class_7971; FIELD field_41518 brand Ljava/lang/String; - METHOD (Lnet/minecraft/class_7979$class_7980;)V - ARG 1 callback - METHOD method_47790 getBrand ()Ljava/lang/String; METHOD method_47791 setGameMode (Lnet/minecraft/class_1934;Z)V ARG 1 gameMode ARG 2 hardcore @@ -16,4 +12,3 @@ CLASS net/minecraft/class_7979 net/minecraft/client/util/telemetry/WorldLoadedEv METHOD method_47794 getServerType ()Lnet/minecraft/class_7969$class_7972; METHOD method_47795 (Lnet/minecraft/class_7973$class_7974;)V ARG 1 builder - CLASS class_7980 Callback diff --git a/mappings/net/minecraft/client/util/telemetry/WorldUnloadedEvent.mapping b/mappings/net/minecraft/client/util/telemetry/WorldUnloadedEvent.mapping index 41d2df2eb1..faab9a040d 100644 --- a/mappings/net/minecraft/client/util/telemetry/WorldUnloadedEvent.mapping +++ b/mappings/net/minecraft/client/util/telemetry/WorldUnloadedEvent.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_7982 net/minecraft/client/util/telemetry/WorldUnloaded FIELD field_41521 startTime Ljava/util/Optional; FIELD field_41522 ticksSinceLoad J FIELD field_41523 lastTick J - METHOD method_47797 setStartTime ()V + METHOD method_47786 send (Lnet/minecraft/class_7965;)V METHOD method_47798 setTick (J)V ARG 1 tick METHOD method_47799 (Lnet/minecraft/class_7965;Ljava/time/Instant;)V diff --git a/mappings/net/minecraft/command/CommandSource.mapping b/mappings/net/minecraft/command/CommandSource.mapping index 3939c940c9..e526f4afa2 100644 --- a/mappings/net/minecraft/command/CommandSource.mapping +++ b/mappings/net/minecraft/command/CommandSource.mapping @@ -46,7 +46,7 @@ CLASS net/minecraft/class_2172 net/minecraft/command/CommandSource METHOD method_9253 suggestMatching ([Ljava/lang/String;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 0 candidates ARG 1 builder - METHOD method_9254 getSoundIds ()Ljava/util/Collection; + METHOD method_9254 getSoundIds ()Ljava/util/stream/Stream; METHOD method_9255 suggestFromIdentifier (Ljava/lang/Iterable;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Function;Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; ARG 0 candidates ARG 1 builder diff --git a/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping b/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping index 908da63abf..e9821d1da5 100644 --- a/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/NbtPathArgumentType.mapping @@ -62,16 +62,12 @@ CLASS net/minecraft/class_2203 net/minecraft/command/argument/NbtPathArgumentTyp ARG 2 nodes ARG 3 nodeEndIndices METHOD method_35722 put (Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;)I - ARG 1 element ARG 2 source METHOD method_9366 get (Lnet/minecraft/class_2520;)Ljava/util/List; ARG 1 element METHOD method_9367 getOrInit (Lnet/minecraft/class_2520;Ljava/util/function/Supplier;)Ljava/util/List; ARG 1 element ARG 2 source - METHOD method_9368 put (Lnet/minecraft/class_2520;Ljava/util/function/Supplier;)I - ARG 1 element - ARG 2 source METHOD method_9369 getTerminals (Lnet/minecraft/class_2520;)Ljava/util/List; ARG 1 start METHOD method_9370 (Ljava/lang/Integer;Ljava/lang/Integer;)Ljava/lang/Integer; @@ -82,8 +78,6 @@ CLASS net/minecraft/class_2203 net/minecraft/command/argument/NbtPathArgumentTyp ARG 1 operation METHOD method_9372 remove (Lnet/minecraft/class_2520;)I ARG 1 element - METHOD method_9373 (Lnet/minecraft/class_2203$class_2210;Ljava/util/function/Supplier;Lnet/minecraft/class_2520;)Ljava/lang/Integer; - ARG 2 nbt METHOD method_9374 count (Lnet/minecraft/class_2520;)I ARG 1 element METHOD method_9375 createNothingFoundException (Lnet/minecraft/class_2203$class_2210;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; diff --git a/mappings/net/minecraft/entity/data/DataTracker.mapping b/mappings/net/minecraft/entity/data/DataTracker.mapping index 74ca0b69ea..e4672ce765 100644 --- a/mappings/net/minecraft/entity/data/DataTracker.mapping +++ b/mappings/net/minecraft/entity/data/DataTracker.mapping @@ -32,7 +32,6 @@ CLASS net/minecraft/class_2945 net/minecraft/entity/data/DataTracker METHOD method_12791 registerData (Ljava/lang/Class;Lnet/minecraft/class_2941;)Lnet/minecraft/class_2940; ARG 0 entityClass ARG 1 dataHandler - METHOD method_12792 clearDirty ()V METHOD method_46357 getChangedEntries ()Ljava/util/List; CLASS class_2946 Entry FIELD field_13336 dirty Z diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 490afa24b0..12fece3f68 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -44,6 +44,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 2 pos ARG 3 yaw ARG 4 gameProfile + METHOD method_14247 closeScreenHandler ()V METHOD method_16354 openJigsawScreen (Lnet/minecraft/class_3751;)V ARG 1 jigsaw METHOD method_16475 spawnParticles (Lnet/minecraft/class_2394;)V diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index d6fee7669e..0869ffbe91 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -50,8 +50,6 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11102 onCloseScreen (Lnet/minecraft/class_2645;)V ARG 1 packet - METHOD method_11104 onPlaySoundId (Lnet/minecraft/class_2660;)V - ARG 1 packet METHOD method_11105 onPlayerListHeader (Lnet/minecraft/class_2772;)V ARG 1 packet METHOD method_11106 onSynchronizeRecipes (Lnet/minecraft/class_2788;)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket.mapping deleted file mode 100644 index 8c1d4067ce..0000000000 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket.mapping +++ /dev/null @@ -1,27 +0,0 @@ -CLASS net/minecraft/class_2660 net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket - FIELD field_12166 volume F - FIELD field_12167 fixedZ I - FIELD field_12168 fixedY I - FIELD field_12169 fixedX I - FIELD field_12170 id Lnet/minecraft/class_2960; - FIELD field_12171 category Lnet/minecraft/class_3419; - FIELD field_12172 pitch F - FIELD field_33327 COORDINATE_SCALE F - FIELD field_38818 seed J - METHOD (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;Lnet/minecraft/class_243;FFJ)V - ARG 1 sound - ARG 2 category - ARG 3 pos - ARG 4 volume - ARG 5 pitch - ARG 6 seed - METHOD method_11459 getCategory ()Lnet/minecraft/class_3419; - METHOD method_11460 getSoundId ()Lnet/minecraft/class_2960; - METHOD method_11461 getY ()D - METHOD method_11462 getX ()D - METHOD method_11463 getVolume ()F - METHOD method_11464 getPitch ()F - METHOD method_11465 getZ ()D - METHOD method_43234 getSeed ()J diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping index 80d66fd422..0636fa5c0f 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping @@ -4,14 +4,13 @@ CLASS net/minecraft/class_2767 net/minecraft/network/packet/s2c/play/PlaySoundS2 FIELD field_12658 fixedY I FIELD field_12659 fixedX I FIELD field_12660 category Lnet/minecraft/class_3419; - FIELD field_12661 sound Lnet/minecraft/class_3414; + FIELD field_12661 sound Lnet/minecraft/class_6880; FIELD field_12662 pitch F FIELD field_33353 COORDINATE_SCALE F FIELD field_38820 seed J METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;DDDFFJ)V - ARG 1 sound + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_3419;DDDFFJ)V ARG 2 category ARG 3 x ARG 5 y @@ -25,5 +24,5 @@ CLASS net/minecraft/class_2767 net/minecraft/network/packet/s2c/play/PlaySoundS2 METHOD method_11891 getVolume ()F METHOD method_11892 getPitch ()F METHOD method_11893 getZ ()D - METHOD method_11894 getSound ()Lnet/minecraft/class_3414; + METHOD method_11894 getSound ()Lnet/minecraft/class_6880; METHOD method_43236 getSeed ()J diff --git a/mappings/net/minecraft/server/command/DataCommand.mapping b/mappings/net/minecraft/server/command/DataCommand.mapping index 628875b7c0..99be80df67 100644 --- a/mappings/net/minecraft/server/command/DataCommand.mapping +++ b/mappings/net/minecraft/server/command/DataCommand.mapping @@ -4,11 +4,9 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand FIELD field_13792 SOURCE_OBJECT_TYPES Ljava/util/List; FIELD field_13793 GET_UNKNOWN_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_13794 GET_MULTIPLE_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD field_13795 MODIFY_EXPECTED_LIST_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_13796 MERGE_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_13797 MODIFY_EXPECTED_OBJECT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_13798 TARGET_OBJECT_TYPES Ljava/util/List; - FIELD field_17441 MODIFY_INVALID_INDEX_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD method_13885 executeRemove (Lnet/minecraft/class_2168;Lnet/minecraft/class_3162;Lnet/minecraft/class_2203$class_2209;)I ARG 0 source ARG 1 object @@ -35,21 +33,11 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand ARG 0 path METHOD method_13893 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 3 builder - METHOD method_13894 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I - ARG 0 context - ARG 1 sourceNbt - ARG 2 path - ARG 3 elements METHOD method_13895 (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_3164$class_3166;)V ARG 0 builder ARG 1 modifier METHOD method_13896 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 1 builder - METHOD method_13897 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I - ARG 0 context - ARG 1 sourceNbt - ARG 2 path - ARG 3 elements METHOD method_13898 addModifyArgument (Ljava/util/function/BiConsumer;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 subArgumentAdder METHOD method_13899 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;)Lcom/mojang/brigadier/builder/ArgumentBuilder; @@ -80,30 +68,18 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand ARG 1 object METHOD method_13909 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context - METHOD method_13910 executeInsert (ILnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I - ARG 0 integer - ARG 1 sourceNbt - ARG 2 path - ARG 3 elements METHOD method_13911 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 2 modifier METHOD method_13912 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context METHOD method_13913 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lcom/mojang/brigadier/context/CommandContext;)I ARG 3 context - METHOD method_13915 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 nbt METHOD method_13916 executeGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_3162;Lnet/minecraft/class_2203$class_2209;)I ARG 0 source ARG 1 object ARG 2 path METHOD method_13917 (Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Lcom/mojang/brigadier/context/CommandContext;)I ARG 3 context - METHOD method_13918 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I - ARG 0 context - ARG 1 sourceNbt - ARG 2 path - ARG 3 elements METHOD method_13919 (Ljava/util/function/Function;)Lnet/minecraft/class_3164$class_3167; ARG 0 factory METHOD method_13920 executeModify (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3164$class_3167;Lnet/minecraft/class_3164$class_3165;Ljava/util/List;)I @@ -118,8 +94,6 @@ CLASS net/minecraft/class_3164 net/minecraft/server/command/DataCommand ARG 2 builder METHOD method_13923 (Lnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 1 builder - METHOD method_17603 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 index CLASS class_3165 ModifyOperation METHOD modify (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_2487;Lnet/minecraft/class_2203$class_2209;Ljava/util/List;)I ARG 1 context diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 64dcdb23fb..efb3a10f2d 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -121,7 +121,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 1 world METHOD method_14246 sendUnloadChunkPacket (Lnet/minecraft/class_1923;)V ARG 1 chunkPos - METHOD method_14247 closeScreenHandler ()V + METHOD method_14247 ()V COMMENT Runs closing tasks for the current screen handler and COMMENT sets it to the {@code playerScreenHandler}. METHOD method_14248 getStatHandler ()Lnet/minecraft/class_3442; diff --git a/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping b/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping index 168b763b73..68d075ad67 100644 --- a/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping +++ b/mappings/net/minecraft/sound/BiomeAdditionsSound.mapping @@ -1,17 +1,16 @@ CLASS net/minecraft/class_4967 net/minecraft/sound/BiomeAdditionsSound COMMENT Represents an "additions sound" for a biome. - FIELD field_23144 sound Lnet/minecraft/class_3414; + FIELD field_23144 sound Lnet/minecraft/class_6880; FIELD field_23145 chance D FIELD field_24673 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_3414;D)V - ARG 1 sound + METHOD (Lnet/minecraft/class_6880;D)V ARG 2 chance - METHOD method_26098 getSound ()Lnet/minecraft/class_3414; + METHOD method_26098 getSound ()Lnet/minecraft/class_6880; METHOD method_26099 getChance ()D COMMENT Returns the chance of this addition sound to play at any tick. METHOD method_28390 (Lnet/minecraft/class_4967;)Ljava/lang/Double; ARG 0 sound METHOD method_28391 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_28392 (Lnet/minecraft/class_4967;)Lnet/minecraft/class_3414; + METHOD method_28392 (Lnet/minecraft/class_4967;)Lnet/minecraft/class_6880; ARG 0 sound diff --git a/mappings/net/minecraft/sound/BiomeMoodSound.mapping b/mappings/net/minecraft/sound/BiomeMoodSound.mapping index 33ae7719e2..3966f51ef3 100644 --- a/mappings/net/minecraft/sound/BiomeMoodSound.mapping +++ b/mappings/net/minecraft/sound/BiomeMoodSound.mapping @@ -1,16 +1,15 @@ CLASS net/minecraft/class_4968 net/minecraft/sound/BiomeMoodSound FIELD field_23146 CAVE Lnet/minecraft/class_4968; - FIELD field_23147 sound Lnet/minecraft/class_3414; + FIELD field_23147 sound Lnet/minecraft/class_6880; FIELD field_23148 cultivationTicks I FIELD field_23149 spawnRange I FIELD field_23150 extraDistance D FIELD field_24674 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_3414;IID)V - ARG 1 sound + METHOD (Lnet/minecraft/class_6880;IID)V ARG 2 cultivationTicks ARG 3 spawnRange ARG 4 extraDistance - METHOD method_26100 getSound ()Lnet/minecraft/class_3414; + METHOD method_26100 getSound ()Lnet/minecraft/class_6880; METHOD method_26101 getCultivationTicks ()I COMMENT Returns the ticks it takes for entering the mood environment (a totally COMMENT dark cave) to playing the mood sound, or the inverse of the per-tick. @@ -33,5 +32,5 @@ CLASS net/minecraft/class_4968 net/minecraft/sound/BiomeMoodSound ARG 0 sound METHOD method_28396 (Lnet/minecraft/class_4968;)Ljava/lang/Integer; ARG 0 sound - METHOD method_28397 (Lnet/minecraft/class_4968;)Lnet/minecraft/class_3414; + METHOD method_28397 (Lnet/minecraft/class_4968;)Lnet/minecraft/class_6880; ARG 0 sound diff --git a/mappings/net/minecraft/sound/MusicSound.mapping b/mappings/net/minecraft/sound/MusicSound.mapping index e91799bc9e..6e6c004759 100644 --- a/mappings/net/minecraft/sound/MusicSound.mapping +++ b/mappings/net/minecraft/sound/MusicSound.mapping @@ -1,15 +1,14 @@ CLASS net/minecraft/class_5195 net/minecraft/sound/MusicSound - FIELD field_24057 sound Lnet/minecraft/class_3414; + FIELD field_24057 sound Lnet/minecraft/class_6880; FIELD field_24058 minDelay I FIELD field_24059 maxDelay I FIELD field_24060 replaceCurrentMusic Z FIELD field_24627 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_3414;IIZ)V - ARG 1 sound + METHOD (Lnet/minecraft/class_6880;IIZ)V ARG 2 minDelay ARG 3 maxDelay ARG 4 replaceCurrentMusic - METHOD method_27279 getSound ()Lnet/minecraft/class_3414; + METHOD method_27279 getSound ()Lnet/minecraft/class_6880; METHOD method_27280 getMinDelay ()I METHOD method_27281 getMaxDelay ()I METHOD method_27282 shouldReplaceCurrentMusic ()Z @@ -21,5 +20,5 @@ CLASS net/minecraft/class_5195 net/minecraft/sound/MusicSound ARG 0 sound METHOD method_28130 (Lnet/minecraft/class_5195;)Ljava/lang/Integer; ARG 0 sound - METHOD method_28131 (Lnet/minecraft/class_5195;)Lnet/minecraft/class_3414; + METHOD method_28131 (Lnet/minecraft/class_5195;)Lnet/minecraft/class_6880; ARG 0 sound diff --git a/mappings/net/minecraft/sound/SoundEvent.mapping b/mappings/net/minecraft/sound/SoundEvent.mapping index 5d332cadd9..0ca8c103f4 100644 --- a/mappings/net/minecraft/sound/SoundEvent.mapping +++ b/mappings/net/minecraft/sound/SoundEvent.mapping @@ -15,5 +15,3 @@ CLASS net/minecraft/class_3414 net/minecraft/sound/SoundEvent METHOD method_47909 of (Lnet/minecraft/class_2960;F)Lnet/minecraft/class_3414; ARG 0 id ARG 1 distanceToTravel - METHOD method_47910 getDistanceToTravelForVolume (F)F - ARG 0 volume diff --git a/mappings/net/minecraft/sound/SoundEvents.mapping b/mappings/net/minecraft/sound/SoundEvents.mapping index 6f74cc8c22..3331e2d27c 100644 --- a/mappings/net/minecraft/sound/SoundEvents.mapping +++ b/mappings/net/minecraft/sound/SoundEvents.mapping @@ -3,9 +3,7 @@ CLASS net/minecraft/class_3417 net/minecraft/sound/SoundEvents FIELD field_39028 GOAT_HORN_SOUNDS Lcom/google/common/collect/ImmutableList; METHOD method_14838 register (Ljava/lang/String;)Lnet/minecraft/class_3414; ARG 0 id - METHOD method_43045 register (Ljava/lang/String;F)Lnet/minecraft/class_3414; - ARG 0 id - ARG 1 distanceToTravel + METHOD method_43045 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;F)Lnet/minecraft/class_6880; METHOD method_43516 registerGoatHornSounds ()Lcom/google/common/collect/ImmutableList; - METHOD method_43517 (I)Lnet/minecraft/class_3414; + METHOD method_43517 (I)Lnet/minecraft/class_6880$class_6883; ARG 0 variant diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 79a44768e0..3a6c5ff841 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -217,23 +217,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 5 limit METHOD method_47576 (Ljava/util/function/Predicate;Ljava/util/List;ILnet/minecraft/class_5575;Lnet/minecraft/class_1297;)Lnet/minecraft/class_7927$class_7928; ARG 4 entity - METHOD method_47907 playSound (Lnet/minecraft/class_1657;Lnet/minecraft/class_243;Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;FFDJ)V - ARG 1 except - ARG 2 pos - ARG 3 id - ARG 4 category - ARG 5 volume - ARG 6 pitch - ARG 7 distance - ARG 9 seed - METHOD method_47930 playSound (Lnet/minecraft/class_1657;Lnet/minecraft/class_243;Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;FFD)V - ARG 1 except - ARG 2 pos - ARG 3 id - ARG 4 category - ARG 5 volume - ARG 6 pitch - ARG 7 distance METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 1 pos ARG 2 oldState @@ -315,13 +298,12 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_8459 isEmittingRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 1 pos ARG 2 direction - METHOD method_8465 playSound (Lnet/minecraft/class_1657;DDDLnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFJ)V + METHOD method_8465 playSound (Lnet/minecraft/class_1657;DDDLnet/minecraft/class_6880;Lnet/minecraft/class_3419;FFJ)V ARG 1 except COMMENT the player that should not receive the sound, or {@code null} ARG 2 x ARG 4 y ARG 6 z - ARG 8 sound ARG 9 category ARG 10 volume ARG 11 pitch diff --git a/mappings/net/minecraft/world/biome/BiomeEffects.mapping b/mappings/net/minecraft/world/biome/BiomeEffects.mapping index b7620a3d98..c79800feae 100644 --- a/mappings/net/minecraft/world/biome/BiomeEffects.mapping +++ b/mappings/net/minecraft/world/biome/BiomeEffects.mapping @@ -101,8 +101,7 @@ CLASS net/minecraft/class_4763 net/minecraft/world/biome/BiomeEffects ARG 1 waterColor METHOD method_24397 waterFogColor (I)Lnet/minecraft/class_4763$class_4764; ARG 1 waterFogColor - METHOD method_24942 loopSound (Lnet/minecraft/class_3414;)Lnet/minecraft/class_4763$class_4764; - ARG 1 sound + METHOD method_24942 loopSound (Lnet/minecraft/class_6880;)Lnet/minecraft/class_4763$class_4764; METHOD method_24943 moodSound (Lnet/minecraft/class_4968;)Lnet/minecraft/class_4763$class_4764; ARG 1 moodSound METHOD method_24944 additionsSound (Lnet/minecraft/class_4967;)Lnet/minecraft/class_4763$class_4764;