From 0f2bef6b8432d3d351f9ab9808877c4497146a56 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 8 Apr 2022 16:56:33 +0900 Subject: [PATCH] 22w14a stuff (#3081) * 22w14a stuff * Some random params I mapped during Enigma testing * Rename stuff based on liach's suggestion --- mappings/net/minecraft/class_7373.mapping | 3 --- .../client/gui/screen/CreditsScreen.mapping | 4 +++ .../network/ClientPlayNetworkHandler.mapping | 2 ++ .../client/realms/FileDownload.mapping | 2 ++ ...lmsDefaultUncaughtExceptionHandler.mapping | 2 ++ .../sound/AbstractSoundInstance.mapping | 1 + .../sound/EntityTrackingSoundInstance.mapping | 1 + .../sound/PositionedSoundInstance.mapping | 25 +++++++++++++++++++ .../net/minecraft/client/sound/Sound.mapping | 2 ++ .../client/sound/SoundContainer.mapping | 1 + .../client/sound/SoundInstance.mapping | 1 + .../client/sound/SoundSystem.mapping | 4 +++ .../client/texture/ResourceTexture.mapping | 1 + .../client/world/ClientWorld.mapping | 10 ++++++++ .../fix/AdvancementCriteriaRenameFix.mapping | 23 +++++++++++++++++ mappings/net/minecraft/entity/Entity.mapping | 3 +++ .../entity/data/TrackedDataHandler.mapping | 19 ++++++++++++++ .../entity/passive/AllayBrain.mapping | 17 +++++++++++++ .../s2c/play/EntitySpawnS2CPacket.mapping | 11 ++++++++ .../play/PlaySoundFromEntityS2CPacket.mapping | 3 +++ .../s2c/play/PlaySoundIdS2CPacket.mapping | 3 +++ .../s2c/play/PlaySoundS2CPacket.mapping | 3 +++ .../resource/DefaultResourcePack.mapping | 3 +++ .../resource/NamespaceResourceManager.mapping | 7 +++++- .../net/minecraft/resource/Resource.mapping | 19 ++++++++++++-- .../metadata/ResourceMetadata.mapping | 6 +++++ .../net/minecraft/sound/SoundEvents.mapping | 3 +++ .../util/dynamic/EntryLoader.mapping | 3 +++ .../net/minecraft/util/math/Vec3d.mapping | 3 +++ .../math/floatprovider/FloatSupplier.mapping | 3 +++ .../MultipliedFloatSupplier.mapping | 4 +++ mappings/net/minecraft/world/World.mapping | 2 ++ .../world/entity/EntityHandler.mapping | 2 ++ .../listener/SculkSensorListener.mapping | 1 + 34 files changed, 191 insertions(+), 6 deletions(-) delete mode 100644 mappings/net/minecraft/class_7373.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/AdvancementCriteriaRenameFix.mapping create mode 100644 mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping create mode 100644 mappings/net/minecraft/util/math/floatprovider/FloatSupplier.mapping create mode 100644 mappings/net/minecraft/util/math/floatprovider/MultipliedFloatSupplier.mapping diff --git a/mappings/net/minecraft/class_7373.mapping b/mappings/net/minecraft/class_7373.mapping deleted file mode 100644 index b41b3dbd5e..0000000000 --- a/mappings/net/minecraft/class_7373.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7373 - METHOD method_33920 get (Lnet/minecraft/class_5819;)F - ARG 1 random diff --git a/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping index 942654512a..d2fe462368 100644 --- a/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping @@ -35,8 +35,12 @@ CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/CreditsScreen METHOD method_37306 addEmptyLine ()V METHOD method_37369 getSpeed ()F METHOD method_39774 readPoem (Ljava/io/Reader;)V + ARG 1 reader METHOD method_39775 load (Ljava/lang/String;Lnet/minecraft/class_445$class_6824;)V ARG 1 id ARG 2 reader METHOD method_39776 readCredits (Ljava/io/Reader;)V + ARG 1 reader CLASS class_6824 CreditsReader + METHOD read (Ljava/io/Reader;)V + ARG 1 reader diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index b9968276d0..544e263cac 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -109,3 +109,5 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand METHOD method_40217 loadTags (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V ARG 1 registryKey ARG 2 serialized + METHOD method_43209 playSpawnSound (Lnet/minecraft/class_1297;)V + ARG 1 entity diff --git a/mappings/net/minecraft/client/realms/FileDownload.mapping b/mappings/net/minecraft/client/realms/FileDownload.mapping index 4489da0716..c148125c5a 100644 --- a/mappings/net/minecraft/client/realms/FileDownload.mapping +++ b/mappings/net/minecraft/client/realms/FileDownload.mapping @@ -31,6 +31,8 @@ CLASS net/minecraft/class_4333 net/minecraft/client/realms/FileDownload ARG 0 file CLASS class_4334 DownloadCountingOutputStream FIELD field_19539 listener Ljava/awt/event/ActionListener; + METHOD (Ljava/io/OutputStream;)V + ARG 1 stream METHOD afterWrite (I)V ARG 1 n METHOD method_20969 setListener (Ljava/awt/event/ActionListener;)V diff --git a/mappings/net/minecraft/client/realms/exception/RealmsDefaultUncaughtExceptionHandler.mapping b/mappings/net/minecraft/client/realms/exception/RealmsDefaultUncaughtExceptionHandler.mapping index a9aa4a26ae..4c0f1244db 100644 --- a/mappings/net/minecraft/client/realms/exception/RealmsDefaultUncaughtExceptionHandler.mapping +++ b/mappings/net/minecraft/client/realms/exception/RealmsDefaultUncaughtExceptionHandler.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_4353 net/minecraft/client/realms/exception/RealmsDefaultUncaughtExceptionHandler FIELD field_19603 logger Lorg/slf4j/Logger; + METHOD (Lorg/slf4j/Logger;)V + ARG 1 logger METHOD uncaughtException (Ljava/lang/Thread;Ljava/lang/Throwable;)V ARG 1 t ARG 2 e diff --git a/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping b/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping index d5a206b23c..d7ba8992ff 100644 --- a/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping @@ -17,3 +17,4 @@ CLASS net/minecraft/class_1102 net/minecraft/client/sound/AbstractSoundInstance METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;Lnet/minecraft/class_5819;)V ARG 1 sound ARG 2 category + ARG 3 random diff --git a/mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping b/mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping index 37d54a0a42..8a249ce3c1 100644 --- a/mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping @@ -6,3 +6,4 @@ CLASS net/minecraft/class_1106 net/minecraft/client/sound/EntityTrackingSoundIns ARG 3 volume ARG 4 pitch ARG 5 entity + ARG 6 seed diff --git a/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping index e0ef909dc1..70f7119e6e 100644 --- a/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping @@ -4,21 +4,42 @@ CLASS net/minecraft/class_1109 net/minecraft/client/sound/PositionedSoundInstanc ARG 2 category ARG 3 volume ARG 4 pitch + ARG 5 random + ARG 6 repeat + ARG 7 repeatDelay + ARG 8 attenuationType + ARG 9 x + ARG 11 y + ARG 13 z + ARG 15 relative METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFLnet/minecraft/class_5819;DDD)V ARG 1 sound ARG 2 category ARG 3 volume ARG 4 pitch + ARG 5 random + ARG 6 x + ARG 8 y + ARG 10 z METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFLnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V ARG 1 sound ARG 2 category ARG 3 volume ARG 4 pitch + ARG 5 random + ARG 6 pos METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFLnet/minecraft/class_5819;ZILnet/minecraft/class_1113$class_1114;DDD)V ARG 1 sound ARG 2 category ARG 3 volume ARG 4 pitch + ARG 5 random + ARG 6 repeat + ARG 7 repeatDelay + ARG 8 attenuationType + ARG 9 x + ARG 11 y + ARG 13 z METHOD method_24877 ambient (Lnet/minecraft/class_3414;FF)Lnet/minecraft/class_1109; ARG 0 sound ARG 1 pitch @@ -27,6 +48,10 @@ CLASS net/minecraft/class_1109 net/minecraft/client/sound/PositionedSoundInstanc ARG 0 sound METHOD method_25467 ambient (Lnet/minecraft/class_3414;Lnet/minecraft/class_5819;DDD)Lnet/minecraft/class_1109; ARG 0 sound + ARG 1 random + ARG 2 x + ARG 4 y + ARG 6 z METHOD method_4757 master (Lnet/minecraft/class_3414;FF)Lnet/minecraft/class_1109; ARG 0 sound ARG 1 pitch diff --git a/mappings/net/minecraft/client/sound/Sound.mapping b/mappings/net/minecraft/client/sound/Sound.mapping index 5968f66392..4592fd2ddd 100644 --- a/mappings/net/minecraft/client/sound/Sound.mapping +++ b/mappings/net/minecraft/client/sound/Sound.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/class_1111 net/minecraft/client/sound/Sound FIELD field_5470 registrationType Lnet/minecraft/class_1111$class_1112; METHOD (Ljava/lang/String;Lnet/minecraft/class_7373;Lnet/minecraft/class_7373;ILnet/minecraft/class_1111$class_1112;ZZI)V ARG 1 id + ARG 2 volume + ARG 3 pitch ARG 4 weight ARG 5 registrationType ARG 6 stream diff --git a/mappings/net/minecraft/client/sound/SoundContainer.mapping b/mappings/net/minecraft/client/sound/SoundContainer.mapping index 1982f5a9be..1b38ed13fa 100644 --- a/mappings/net/minecraft/client/sound/SoundContainer.mapping +++ b/mappings/net/minecraft/client/sound/SoundContainer.mapping @@ -2,4 +2,5 @@ CLASS net/minecraft/class_1148 net/minecraft/client/sound/SoundContainer METHOD method_18188 preload (Lnet/minecraft/class_1140;)V ARG 1 soundSystem METHOD method_4893 getSound (Lnet/minecraft/class_5819;)Ljava/lang/Object; + ARG 1 random METHOD method_4894 getWeight ()I diff --git a/mappings/net/minecraft/client/sound/SoundInstance.mapping b/mappings/net/minecraft/client/sound/SoundInstance.mapping index 661a36675f..ac67a222b9 100644 --- a/mappings/net/minecraft/client/sound/SoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/SoundInstance.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1113 net/minecraft/client/sound/SoundInstance METHOD method_26273 canPlay ()Z + METHOD method_43221 createRandom ()Lnet/minecraft/class_5819; METHOD method_4774 getCategory ()Lnet/minecraft/class_3419; METHOD method_4775 getId ()Lnet/minecraft/class_2960; METHOD method_4776 getSound ()Lnet/minecraft/class_1111; diff --git a/mappings/net/minecraft/client/sound/SoundSystem.mapping b/mappings/net/minecraft/client/sound/SoundSystem.mapping index 608cb19ec8..1aa41cfaaf 100644 --- a/mappings/net/minecraft/client/sound/SoundSystem.mapping +++ b/mappings/net/minecraft/client/sound/SoundSystem.mapping @@ -68,6 +68,9 @@ CLASS net/minecraft/class_1140 net/minecraft/client/sound/SoundSystem ARG 0 sound METHOD method_38564 getSoundDevices ()Ljava/util/List; METHOD method_38744 shouldReloadSounds ()Z + METHOD method_43222 getAdjustedVolume (FLnet/minecraft/class_3419;)F + ARG 1 volume + ARG 2 category METHOD method_4835 isPlaying (Lnet/minecraft/class_1113;)Z ARG 1 sound METHOD method_4837 reloadSounds ()V @@ -93,6 +96,7 @@ CLASS net/minecraft/class_1140 net/minecraft/client/sound/SoundSystem ARG 1 sound ARG 2 delay METHOD method_4853 getAdjustedVolume (Lnet/minecraft/class_1113;)F + ARG 1 sound METHOD method_4854 play (Lnet/minecraft/class_1113;)V ARG 1 sound METHOD method_4855 registerListener (Lnet/minecraft/class_1145;)V diff --git a/mappings/net/minecraft/client/texture/ResourceTexture.mapping b/mappings/net/minecraft/client/texture/ResourceTexture.mapping index 130b2e2a4c..a5472e37de 100644 --- a/mappings/net/minecraft/client/texture/ResourceTexture.mapping +++ b/mappings/net/minecraft/client/texture/ResourceTexture.mapping @@ -21,5 +21,6 @@ CLASS net/minecraft/class_1049 net/minecraft/client/texture/ResourceTexture METHOD method_18155 getMetadata ()Lnet/minecraft/class_1084; METHOD method_18156 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1049$class_4006; ARG 0 resourceManager + ARG 1 id METHOD method_18157 getImage ()Lnet/minecraft/class_1011; METHOD method_18158 checkException ()V diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 213a45dbdb..c335ad188c 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -161,6 +161,16 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 1 pos ARG 2 state ARG 3 flags + METHOD method_43207 playSound (DDDLnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFZJ)V + ARG 1 x + ARG 3 y + ARG 5 z + ARG 7 event + ARG 8 category + ARG 9 volume + ARG 10 pitch + ARG 11 useDistance + ARG 12 seed METHOD method_8435 setTimeOfDay (J)V ARG 1 timeOfDay METHOD method_8441 tick (Ljava/util/function/BooleanSupplier;)V diff --git a/mappings/net/minecraft/datafixer/fix/AdvancementCriteriaRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/AdvancementCriteriaRenameFix.mapping new file mode 100644 index 0000000000..18b9c67bca --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/AdvancementCriteriaRenameFix.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_7370 net/minecraft/datafixer/fix/AdvancementCriteriaRenameFix + FIELD field_38702 description Ljava/lang/String; + FIELD field_38703 advancementId Ljava/lang/String; + FIELD field_38704 renamer Ljava/util/function/UnaryOperator; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/UnaryOperator;)V + ARG 1 schema + ARG 2 description + ARG 3 advancementId + ARG 4 renamer + METHOD method_43063 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 1 typed + METHOD method_43064 (Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; + ARG 1 pair + METHOD method_43065 update (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 advncements + METHOD method_43066 (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 2 keyString + METHOD method_43067 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 advancement + METHOD method_43068 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 criteria + METHOD method_43069 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 key diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 41306f9aae..0724a348b1 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -443,6 +443,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 pose METHOD method_42147 updateEventHandler (Ljava/util/function/BiConsumer;)V METHOD method_42148 hasPrimaryPassenger ()Z + METHOD method_43077 playSoundIfNotSilent (Lnet/minecraft/class_3414;)V + ARG 1 event + METHOD method_43078 getBodyYaw ()F METHOD method_5621 getMountedHeightOffset ()D METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V ARG 1 state diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping index 57125e85b0..94745df294 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandler.mapping @@ -7,3 +7,22 @@ CLASS net/minecraft/class_2941 net/minecraft/entity/data/TrackedDataHandler METHOD method_12716 read (Lnet/minecraft/class_2540;)Ljava/lang/Object; ARG 1 buf METHOD method_12717 create (I)Lnet/minecraft/class_2940; + ARG 1 id + METHOD method_43237 of (Lnet/minecraft/class_2359;)Lnet/minecraft/class_2941; + ARG 0 registry + METHOD method_43238 (Lnet/minecraft/class_2359;Lnet/minecraft/class_2540;)Ljava/lang/Object; + ARG 1 buf + METHOD method_43239 (Lnet/minecraft/class_2359;Lnet/minecraft/class_2540;Ljava/lang/Object;)V + ARG 1 buf + ARG 2 value + METHOD method_43240 ofEnum (Ljava/lang/Class;)Lnet/minecraft/class_2941; + ARG 0 enum_ + METHOD method_43241 (Ljava/lang/Class;Lnet/minecraft/class_2540;)Ljava/lang/Enum; + ARG 1 buf + METHOD method_43242 of (Ljava/util/function/BiConsumer;Ljava/util/function/Function;)Lnet/minecraft/class_2941; + ARG 0 writer + ARG 1 reader + METHOD method_43243 ofOptional (Ljava/util/function/BiConsumer;Ljava/util/function/Function;)Lnet/minecraft/class_2941; + ARG 0 writer + ARG 1 reader + CLASS class_7394 ImmutableHandler diff --git a/mappings/net/minecraft/entity/passive/AllayBrain.mapping b/mappings/net/minecraft/entity/passive/AllayBrain.mapping index 9a1ecbd413..b27185f7b4 100644 --- a/mappings/net/minecraft/entity/passive/AllayBrain.mapping +++ b/mappings/net/minecraft/entity/passive/AllayBrain.mapping @@ -1,7 +1,24 @@ CLASS net/minecraft/class_7299 net/minecraft/entity/passive/AllayBrain + METHOD method_42657 getLookTarget (Lnet/minecraft/class_1309;)Ljava/util/Optional; + ARG 0 allay + METHOD method_42658 shouldGoTowardsNoteBlock (Lnet/minecraft/class_1309;Lnet/minecraft/class_4095;Lnet/minecraft/class_2338;)Z + ARG 0 allay + ARG 1 brain + ARG 2 pos + METHOD method_42659 rememberNoteBlock (Lnet/minecraft/class_1309;Lnet/minecraft/class_2338;)V + ARG 0 allay + ARG 1 pos METHOD method_42660 create (Lnet/minecraft/class_4095;)Lnet/minecraft/class_4095; ARG 0 brain + METHOD method_42661 resetIdleActivities (Lnet/minecraft/class_7298;)V + ARG 0 allay + METHOD method_42662 getLikedLookTarget (Lnet/minecraft/class_1309;)Ljava/util/Optional; + ARG 0 allay METHOD method_42663 addCoreActivities (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_42666 addIdleActivities (Lnet/minecraft/class_4095;)V ARG 0 brain + METHOD method_43092 (Lnet/minecraft/class_3222;)Lnet/minecraft/class_4115; + ARG 0 player + METHOD method_43093 getLikedPlayer (Lnet/minecraft/class_1309;)Ljava/util/Optional; + ARG 0 allay diff --git a/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping index 0315695010..0703d4d255 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn FIELD field_33294 MAX_ABSOLUTE_VELOCITY D COMMENT The maximum absolute value allowed for each scalar value (velocity x, y, z) COMMENT in the velocity vector sent by this packet. + FIELD field_38817 headYaw B METHOD (ILjava/util/UUID;DDDFFLnet/minecraft/class_1299;ILnet/minecraft/class_243;D)V ARG 1 id ARG 2 uuid @@ -23,8 +24,10 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn ARG 7 z ARG 9 pitch ARG 10 yaw + ARG 11 entityTypeId ARG 12 entityData ARG 13 velocity + ARG 14 headYaw METHOD (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD (Lnet/minecraft/class_1297;I)V @@ -32,6 +35,13 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn ARG 2 entityData METHOD (Lnet/minecraft/class_1297;ILnet/minecraft/class_2338;)V ARG 1 entity + ARG 2 entityTypeId + ARG 3 pos + METHOD (Lnet/minecraft/class_1309;)V + ARG 1 entity + METHOD (Lnet/minecraft/class_1309;I)V + ARG 1 entity + ARG 2 entityTypeId METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_11164 getUuid ()Ljava/util/UUID; @@ -46,3 +56,4 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn METHOD method_11174 getY ()D METHOD method_11175 getX ()D METHOD method_11176 getZ ()D + METHOD method_43233 getHeadYaw ()F diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping index 94f146e9e5..b04e156b1e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2765 net/minecraft/network/packet/s2c/play/PlaySoundFr FIELD field_12640 entityId I FIELD field_12641 category Lnet/minecraft/class_3419; FIELD field_12642 sound Lnet/minecraft/class_3414; + FIELD field_38819 seed J METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;Lnet/minecraft/class_1297;FFJ)V @@ -12,8 +13,10 @@ CLASS net/minecraft/class_2765 net/minecraft/network/packet/s2c/play/PlaySoundFr ARG 3 entity ARG 4 volume ARG 5 pitch + ARG 6 seed METHOD method_11880 getPitch ()F METHOD method_11881 getCategory ()Lnet/minecraft/class_3419; METHOD method_11882 getSound ()Lnet/minecraft/class_3414; METHOD method_11883 getEntityId ()I METHOD method_11885 getVolume ()F + METHOD method_43235 getSeed ()J diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket.mapping index b90a871fd6..8c1d4067ce 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_2660 net/minecraft/network/packet/s2c/play/PlaySoundId 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 @@ -15,6 +16,7 @@ CLASS net/minecraft/class_2660 net/minecraft/network/packet/s2c/play/PlaySoundId 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 @@ -22,3 +24,4 @@ CLASS net/minecraft/class_2660 net/minecraft/network/packet/s2c/play/PlaySoundId 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 2a40f31165..80d66fd422 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_2767 net/minecraft/network/packet/s2c/play/PlaySoundS2 FIELD field_12661 sound Lnet/minecraft/class_3414; 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 @@ -17,6 +18,7 @@ CLASS net/minecraft/class_2767 net/minecraft/network/packet/s2c/play/PlaySoundS2 ARG 7 z ARG 9 volume ARG 10 pitch + ARG 11 seed METHOD method_11888 getCategory ()Lnet/minecraft/class_3419; METHOD method_11889 getY ()D METHOD method_11890 getX ()D @@ -24,3 +26,4 @@ CLASS net/minecraft/class_2767 net/minecraft/network/packet/s2c/play/PlaySoundS2 METHOD method_11892 getPitch ()F METHOD method_11893 getZ ()D METHOD method_11894 getSound ()Lnet/minecraft/class_3414; + METHOD method_43236 getSeed ()J diff --git a/mappings/net/minecraft/resource/DefaultResourcePack.mapping b/mappings/net/minecraft/resource/DefaultResourcePack.mapping index d5085d3b6e..42fa05edfa 100644 --- a/mappings/net/minecraft/resource/DefaultResourcePack.mapping +++ b/mappings/net/minecraft/resource/DefaultResourcePack.mapping @@ -31,3 +31,6 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack ARG 0 path METHOD method_37454 getPath (Ljava/net/URI;)Ljava/nio/file/Path; ARG 0 uri + METHOD method_43031 (Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 1 id + METHOD method_43032 getFactory ()Lnet/minecraft/class_5912; diff --git a/mappings/net/minecraft/resource/NamespaceResourceManager.mapping b/mappings/net/minecraft/resource/NamespaceResourceManager.mapping index 0605e82d67..035732076e 100644 --- a/mappings/net/minecraft/resource/NamespaceResourceManager.mapping +++ b/mappings/net/minecraft/resource/NamespaceResourceManager.mapping @@ -14,7 +14,9 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager ARG 2 namespace METHOD method_14473 getMetadataPath (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; ARG 0 id - METHOD method_14476 open (Lnet/minecraft/class_2960;Lnet/minecraft/class_3262;)Lnet/minecraft/class_3298$class_7367; + METHOD method_14476 createOpener (Lnet/minecraft/class_2960;Lnet/minecraft/class_3262;)Lnet/minecraft/class_3298$class_7367; + ARG 1 id + ARG 2 pack METHOD method_18221 isPathAbsolute (Lnet/minecraft/class_2960;)Z ARG 1 id METHOD method_24233 addPack (Lnet/minecraft/class_3262;)V @@ -44,6 +46,9 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager ARG 2 entryList METHOD method_41264 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3294$class_7081; ARG 1 id + METHOD method_43035 createMetadataSupplier (Lnet/minecraft/class_2960;I)Lnet/minecraft/class_3298$class_7367; + ARG 1 id + ARG 2 index CLASS class_3295 DebugInputStream FIELD field_14287 closed Z FIELD field_14288 leakMessage Ljava/lang/String; diff --git a/mappings/net/minecraft/resource/Resource.mapping b/mappings/net/minecraft/resource/Resource.mapping index aa469b7c8c..81236af442 100644 --- a/mappings/net/minecraft/resource/Resource.mapping +++ b/mappings/net/minecraft/resource/Resource.mapping @@ -5,12 +5,27 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/Resource COMMENT COMMENT @see ResourceFactory#getResource(Identifier) COMMENT @see ResourceManager#getAllResources(Identifier) + FIELD field_38684 resourcePackName Ljava/lang/String; + FIELD field_38685 inputSupplier Lnet/minecraft/class_3298$class_7367; + FIELD field_38686 metadataSupplier Lnet/minecraft/class_3298$class_7367; + FIELD field_38687 metadata Lnet/minecraft/class_7368; + METHOD (Ljava/lang/String;Lnet/minecraft/class_3298$class_7367;)V + ARG 1 resourcePackName + ARG 2 inputSupplier + METHOD (Ljava/lang/String;Lnet/minecraft/class_3298$class_7367;Lnet/minecraft/class_3298$class_7367;)V + ARG 1 resourcePackName + ARG 2 inputSupplier + ARG 3 metadataSupplier METHOD method_14480 getResourcePackName ()Ljava/lang/String; COMMENT Returns the user-friendly name of the pack this resource is from. METHOD method_14481 getMetadata ()Lnet/minecraft/class_7368; - COMMENT Returns a metadata of this resource by the {@code metaReader}, or {@code null} - COMMENT if no such metadata exists. + COMMENT {@return the metadata for the resource} + COMMENT + COMMENT

The metadata must then be decoded using + COMMENT {@link ResourceMetadata#decode(ResourceMetadataReader)} before using. METHOD method_14482 getInputStream ()Ljava/io/InputStream; COMMENT Returns the input stream of this resource. COMMENT COMMENT

This input stream is closed when this resource is closed. + METHOD method_43039 getReader ()Ljava/io/BufferedReader; + CLASS class_7367 InputSupplier diff --git a/mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping b/mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping new file mode 100644 index 0000000000..ed06ce96e0 --- /dev/null +++ b/mappings/net/minecraft/resource/metadata/ResourceMetadata.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_7368 net/minecraft/resource/metadata/ResourceMetadata + FIELD field_38688 NONE Lnet/minecraft/class_7368; + METHOD method_43041 decode (Lnet/minecraft/class_3270;)Ljava/util/Optional; + ARG 1 reader + METHOD method_43042 create (Ljava/io/InputStream;)Lnet/minecraft/class_7368; + ARG 0 stream diff --git a/mappings/net/minecraft/sound/SoundEvents.mapping b/mappings/net/minecraft/sound/SoundEvents.mapping index 1f3e25b7af..d9d288dc13 100644 --- a/mappings/net/minecraft/sound/SoundEvents.mapping +++ b/mappings/net/minecraft/sound/SoundEvents.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/class_3417 net/minecraft/sound/SoundEvents 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 registryId + ARG 1 eventId diff --git a/mappings/net/minecraft/util/dynamic/EntryLoader.mapping b/mappings/net/minecraft/util/dynamic/EntryLoader.mapping index 4c4bae9569..f562fd55f6 100644 --- a/mappings/net/minecraft/util/dynamic/EntryLoader.mapping +++ b/mappings/net/minecraft/util/dynamic/EntryLoader.mapping @@ -27,6 +27,9 @@ CLASS net/minecraft/class_5506 net/minecraft/util/dynamic/EntryLoader METHOD method_42086 parse (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;Ljava/io/Reader;)Lcom/mojang/serialization/DataResult; ARG 1 jsonOps ARG 2 decoder + ARG 3 reader + METHOD method_43249 (Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)Lnet/minecraft/class_5506$class_7236; + ARG 2 resource CLASS class_5507 Impl FIELD field_26741 values Ljava/util/Map; FIELD field_36187 LOGGER Lorg/slf4j/Logger; diff --git a/mappings/net/minecraft/util/math/Vec3d.mapping b/mappings/net/minecraft/util/math/Vec3d.mapping index 10788c3160..9879565f46 100644 --- a/mappings/net/minecraft/util/math/Vec3d.mapping +++ b/mappings/net/minecraft/util/math/Vec3d.mapping @@ -224,3 +224,6 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d METHOD method_38499 withAxis (Lnet/minecraft/class_2350$class_2351;D)Lnet/minecraft/class_243; ARG 1 axis ARG 2 value + METHOD method_43206 withBias (Lnet/minecraft/class_2350;D)Lnet/minecraft/class_243; + ARG 1 direction + ARG 2 value diff --git a/mappings/net/minecraft/util/math/floatprovider/FloatSupplier.mapping b/mappings/net/minecraft/util/math/floatprovider/FloatSupplier.mapping new file mode 100644 index 0000000000..a5736c924e --- /dev/null +++ b/mappings/net/minecraft/util/math/floatprovider/FloatSupplier.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7373 net/minecraft/util/math/floatprovider/FloatSupplier + METHOD method_33920 get (Lnet/minecraft/class_5819;)F + ARG 1 random diff --git a/mappings/net/minecraft/util/math/floatprovider/MultipliedFloatSupplier.mapping b/mappings/net/minecraft/util/math/floatprovider/MultipliedFloatSupplier.mapping new file mode 100644 index 0000000000..94554f9255 --- /dev/null +++ b/mappings/net/minecraft/util/math/floatprovider/MultipliedFloatSupplier.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7372 net/minecraft/util/math/floatprovider/MultipliedFloatSupplier + FIELD field_38707 multipliers [Lnet/minecraft/class_7373; + METHOD ([Lnet/minecraft/class_7373;)V + ARG 1 multipliers diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 30294ac923..66b1427503 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -212,6 +212,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 4 category ARG 5 volume ARG 6 pitch + ARG 7 seed METHOD method_8450 getGameRules ()Lnet/minecraft/class_1928; METHOD method_8452 updateNeighborsAlways (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V COMMENT Emits a neighbor update to all 6 neighboring blocks of {@code pos}. @@ -253,6 +254,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 9 category ARG 10 volume ARG 11 pitch + ARG 12 seed METHOD method_8466 addParticle (Lnet/minecraft/class_2394;ZDDDDDD)V ARG 1 parameters ARG 2 alwaysSpawn diff --git a/mappings/net/minecraft/world/entity/EntityHandler.mapping b/mappings/net/minecraft/world/entity/EntityHandler.mapping index a9e01a9c89..3012b8ed98 100644 --- a/mappings/net/minecraft/world/entity/EntityHandler.mapping +++ b/mappings/net/minecraft/world/entity/EntityHandler.mapping @@ -28,3 +28,5 @@ CLASS net/minecraft/class_5576 net/minecraft/world/entity/EntityHandler COMMENT Called when an entity is newly created. ARG 1 entity COMMENT the created entity + METHOD method_43029 updateLoadStatus (Ljava/lang/Object;)V + ARG 1 entity diff --git a/mappings/net/minecraft/world/event/listener/SculkSensorListener.mapping b/mappings/net/minecraft/world/event/listener/SculkSensorListener.mapping index ee3ef85532..e05352e0ff 100644 --- a/mappings/net/minecraft/world/event/listener/SculkSensorListener.mapping +++ b/mappings/net/minecraft/world/event/listener/SculkSensorListener.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_5718 net/minecraft/world/event/listener/SculkSensorLis METHOD method_32964 tick (Lnet/minecraft/class_1937;)V ARG 1 world METHOD method_32966 isOccluded (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z + ARG 0 world ARG 1 start ARG 2 end METHOD method_32967 (Lnet/minecraft/class_2680;)Z