diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index 196525e14f..77b4334a36 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -1,4 +1,5 @@ CLASS bmf net/minecraft/block/Blocks + FIELD a AIR Lbme; METHOD a register (Ljava/lang/String;Lbme;)Lbme; ARG 0 id ARG 1 block diff --git a/mappings/net/minecraft/client/audio/AbstractSoundInstance.mapping b/mappings/net/minecraft/client/audio/AbstractSoundInstance.mapping index 25899b6043..e8aaa25263 100644 --- a/mappings/net/minecraft/client/audio/AbstractSoundInstance.mapping +++ b/mappings/net/minecraft/client/audio/AbstractSoundInstance.mapping @@ -10,6 +10,7 @@ CLASS dwa net/minecraft/client/audio/AbstractSoundInstance FIELD i repeat Z FIELD j repeatDelay I FIELD k attenuationType Ldwn$a; + FIELD m looping Z FIELD n soundSet Ldxo; METHOD (Lqs;Lyk;)V ARG 1 soundId diff --git a/mappings/net/minecraft/client/audio/AlUtil.mapping b/mappings/net/minecraft/client/audio/AlUtil.mapping index 8df23f53ce..46f18e4ece 100644 --- a/mappings/net/minecraft/client/audio/AlUtil.mapping +++ b/mappings/net/minecraft/client/audio/AlUtil.mapping @@ -2,7 +2,12 @@ CLASS csz net/minecraft/client/audio/AlUtil FIELD a LOGGER Lorg/apache/logging/log4j/Logger; METHOD a getErrorMessage (I)Ljava/lang/String; ARG 0 errorCode + METHOD a checkAlcErrors (JLjava/lang/String;)Z + ARG 0 deviceHandle + ARG 2 sectionName METHOD a checkErrors (Ljava/lang/String;)Z ARG 0 sectionName METHOD a getFormatId (Ljavax/sound/sampled/AudioFormat;)I ARG 0 format + METHOD b getAlcErrorMessage (I)Ljava/lang/String; + ARG 0 errorCode diff --git a/mappings/net/minecraft/client/audio/Channel.mapping b/mappings/net/minecraft/client/audio/Channel.mapping index 8052f56f9a..d98c7cc597 100644 --- a/mappings/net/minecraft/client/audio/Channel.mapping +++ b/mappings/net/minecraft/client/audio/Channel.mapping @@ -6,12 +6,14 @@ CLASS dxh net/minecraft/client/audio/Channel METHOD a run (Ljava/util/function/Consumer;)V ARG 1 action METHOD b close ()V - FIELD a sourceLists Ljava/util/Set; + FIELD a sources Ljava/util/Set; FIELD b soundEngine Lcsw; FIELD c executor Ljava/util/concurrent/Executor; METHOD (Lcsw;Ljava/util/concurrent/Executor;)V ARG 1 soundEngine ARG 2 executor METHOD a tick ()V + METHOD a createSource (Lcsw$c;)Ldxh$a; + ARG 1 mode METHOD a execute (Ljava/util/function/Consumer;)V METHOD b close ()V diff --git a/mappings/net/minecraft/client/audio/Listener.mapping b/mappings/net/minecraft/client/audio/Listener.mapping index 95beca5aad..dee440bcae 100644 --- a/mappings/net/minecraft/client/audio/Listener.mapping +++ b/mappings/net/minecraft/client/audio/Listener.mapping @@ -8,3 +8,4 @@ CLASS csx net/minecraft/client/audio/Listener METHOD a setOrientation (Lcro;Lcro;)V ARG 1 from ARG 2 to + METHOD b init ()V diff --git a/mappings/net/minecraft/client/audio/OggAudioStream.mapping b/mappings/net/minecraft/client/audio/OggAudioStream.mapping index c9353bbfe3..f0d6f06ff2 100644 --- a/mappings/net/minecraft/client/audio/OggAudioStream.mapping +++ b/mappings/net/minecraft/client/audio/OggAudioStream.mapping @@ -16,3 +16,4 @@ CLASS csy net/minecraft/client/audio/OggAudioStream METHOD a readChannels (Ljava/nio/FloatBuffer;Lcsy$a;)V METHOD a readChannels (Ljava/nio/FloatBuffer;Ljava/nio/FloatBuffer;Lcsy$a;)V METHOD c readHeader ()Z + METHOD d increaseBufferSize ()V diff --git a/mappings/net/minecraft/client/audio/Sound.mapping b/mappings/net/minecraft/client/audio/Sound.mapping index c39601df98..6c4d68a5e8 100644 --- a/mappings/net/minecraft/client/audio/Sound.mapping +++ b/mappings/net/minecraft/client/audio/Sound.mapping @@ -12,16 +12,22 @@ CLASS dwk net/minecraft/client/audio/Sound FIELD d weight I FIELD e registrationType Ldwk$a; FIELD f stream Z + FIELD g preload Z + FIELD h attenuation I METHOD (Ljava/lang/String;FFILdwk$a;ZZI)V ARG 1 id ARG 2 volume ARG 3 pitch ARG 4 weight - ARG 5 soundRegistrationType - ARG 7 stream + ARG 5 registrationType + ARG 6 stream + ARG 7 preload + ARG 8 attenuation METHOD a getIdentifier ()Lqs; METHOD b getLocation ()Lqs; METHOD c getVolume ()F METHOD d getPitch ()F METHOD g getRegistrationType ()Ldwk$a; METHOD h isStreamed ()Z + METHOD i isPreloaded ()Z + METHOD j getAttenuation ()I diff --git a/mappings/net/minecraft/client/audio/SoundContainer.mapping b/mappings/net/minecraft/client/audio/SoundContainer.mapping index 6e77e2648c..39b1146e9a 100644 --- a/mappings/net/minecraft/client/audio/SoundContainer.mapping +++ b/mappings/net/minecraft/client/audio/SoundContainer.mapping @@ -1,5 +1,5 @@ CLASS dxp net/minecraft/client/audio/SoundContainer - METHOD a addTo (Ldxk;)V + METHOD a preload (Ldxk;)V ARG 1 soundSystem METHOD e getWeight ()I METHOD k getSound ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/client/audio/SoundData.mapping b/mappings/net/minecraft/client/audio/SoundData.mapping deleted file mode 100644 index 8a9803d21a..0000000000 --- a/mappings/net/minecraft/client/audio/SoundData.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS cta net/minecraft/client/audio/SoundData - FIELD a buffer Ljava/nio/ByteBuffer; - FIELD b format Ljavax/sound/sampled/AudioFormat; - FIELD d bufferPointer I - METHOD (Ljava/nio/ByteBuffer;Ljavax/sound/sampled/AudioFormat;)V - ARG 1 buffer - ARG 2 format - METHOD a getBufferPointer ()Ljava/util/OptionalInt; - METHOD b close ()V diff --git a/mappings/net/minecraft/client/audio/SoundEngine.mapping b/mappings/net/minecraft/client/audio/SoundEngine.mapping index 99d21d4d33..f1d44b3180 100644 --- a/mappings/net/minecraft/client/audio/SoundEngine.mapping +++ b/mappings/net/minecraft/client/audio/SoundEngine.mapping @@ -1,10 +1,29 @@ CLASS csw net/minecraft/client/audio/SoundEngine - CLASS csw$b + CLASS csw$b SourceSetImpl + FIELD a maxSourceCount I FIELD b sources Ljava/util/Set; + METHOD (I)V + ARG 1 maxSourceCount CLASS csw$c RunMode + CLASS net/minecraft/client/audio/SoundEngine$a SourceSet + METHOD a createSource ()Lcsv; + METHOD a release (Lcsv;)Z + METHOD b close ()V + METHOD c getMaxSourceCount ()I + METHOD d getSourceCount ()I FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b devicePointer J + FIELD c contextPointer J + FIELD d EMPTY_SOURCE_SET Lcsw$a; + FIELD e streamingSources Lcsw$a; + FIELD f staticSources Lcsw$a; FIELD g listener Lcsx; METHOD a init ()V METHOD a release (Lcsv;)V + ARG 1 source + METHOD a createSource (Lcsw$c;)Lcsv; + ARG 1 mode METHOD b close ()V METHOD c getListener ()Lcsx; + METHOD d getDebugString ()Ljava/lang/String; + METHOD f openDevice ()J diff --git a/mappings/net/minecraft/client/audio/SoundEntry.mapping b/mappings/net/minecraft/client/audio/SoundEntry.mapping index cb4125d138..c4204773d4 100644 --- a/mappings/net/minecraft/client/audio/SoundEntry.mapping +++ b/mappings/net/minecraft/client/audio/SoundEntry.mapping @@ -1,10 +1,11 @@ CLASS dwl net/minecraft/client/audio/SoundEntry FIELD a sounds Ljava/util/List; - FIELD b replaceable Z + FIELD b replace Z FIELD c subtitle Ljava/lang/String; METHOD (Ljava/util/List;ZLjava/lang/String;)V ARG 1 sounds - ARG 2 replaceable + ARG 2 replace + ARG 3 subtitle METHOD a getSounds ()Ljava/util/List; - METHOD b isReplaceable ()Z + METHOD b canReplace ()Z METHOD c getSubtitle ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/audio/SoundEntryDeserializer.mapping b/mappings/net/minecraft/client/audio/SoundEntryDeserializer.mapping index 94cd9fc451..be32b4c146 100644 --- a/mappings/net/minecraft/client/audio/SoundEntryDeserializer.mapping +++ b/mappings/net/minecraft/client/audio/SoundEntryDeserializer.mapping @@ -1 +1,8 @@ CLASS dwm net/minecraft/client/audio/SoundEntryDeserializer + METHOD a deserializeSounds (Lcom/google/gson/JsonObject;)Ljava/util/List; + ARG 1 json + METHOD a deserializeType (Lcom/google/gson/JsonObject;Ldwk$a;)Ldwk$a; + ARG 1 json + ARG 2 fallback + METHOD b deserializeSound (Lcom/google/gson/JsonObject;)Ldwk; + ARG 1 json diff --git a/mappings/net/minecraft/client/audio/SoundInstance.mapping b/mappings/net/minecraft/client/audio/SoundInstance.mapping index 31132861a3..2c04690064 100644 --- a/mappings/net/minecraft/client/audio/SoundInstance.mapping +++ b/mappings/net/minecraft/client/audio/SoundInstance.mapping @@ -4,6 +4,7 @@ CLASS dwn net/minecraft/client/audio/SoundInstance FIELD b LINEAR Ldwn$a; METHOD a getId ()Lqs; METHOD a getSoundSet (Ldxn;)Ldxo; + ARG 1 soundManager METHOD b getSound ()Ldwk; METHOD c getCategory ()Lyk; METHOD d isRepeatable ()Z @@ -14,3 +15,5 @@ CLASS dwn net/minecraft/client/audio/SoundInstance METHOD i getY ()F METHOD j getZ ()F METHOD k getAttenuationType ()Ldwn$a; + METHOD m isLooping ()Z + METHOD p shouldAlwaysPlay ()Z diff --git a/mappings/net/minecraft/client/audio/SoundLoader.mapping b/mappings/net/minecraft/client/audio/SoundLoader.mapping index afe955a9a0..30a835184d 100644 --- a/mappings/net/minecraft/client/audio/SoundLoader.mapping +++ b/mappings/net/minecraft/client/audio/SoundLoader.mapping @@ -1,2 +1,12 @@ CLASS dxj net/minecraft/client/audio/SoundLoader + FIELD a resourceManager Lxd; FIELD b loadedSounds Ljava/util/Map; + METHOD (Lxd;)V + ARG 1 resourceManager + METHOD a close ()V + METHOD a loadStatic (Ljava/util/Collection;)Ljava/util/concurrent/CompletableFuture; + ARG 1 sounds + METHOD a loadStatic (Lqs;)Ljava/util/concurrent/CompletableFuture; + ARG 1 id + METHOD b loadStreamed (Lqs;)Ljava/util/concurrent/CompletableFuture; + ARG 1 id diff --git a/mappings/net/minecraft/client/audio/SoundManager.mapping b/mappings/net/minecraft/client/audio/SoundManager.mapping index 2c60547983..226c6805e7 100644 --- a/mappings/net/minecraft/client/audio/SoundManager.mapping +++ b/mappings/net/minecraft/client/audio/SoundManager.mapping @@ -1,7 +1,11 @@ CLASS dxn net/minecraft/client/audio/SoundManager - CLASS dxn$a Result + CLASS dxn$a SoundList FIELD a loadedSounds Ljava/util/Map; METHOD a addTo (Ljava/util/Map;Ldxk;)V + METHOD a register (Lqs;Ldwl;Lxd;)V + ARG 1 id + ARG 2 entry + ARG 3 resourceManager FIELD a SOUND_MISSING Ldwk; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c GSON Lcom/google/gson/Gson; @@ -13,13 +17,14 @@ CLASS dxn net/minecraft/client/audio/SoundManager METHOD a play (Ldwn;)V METHOD a play (Ldwn;I)V ARG 1 sound - ARG 2 volume + ARG 2 delay METHOD a registerListener (Ldxm;)V METHOD a readSounds (Ljava/io/InputStream;)Ljava/util/Map; METHOD a get (Lqs;)Ldxo; METHOD a stopSounds (Lqs;Lyk;)V METHOD a updateSoundVolume (Lyk;F)V ARG 1 category + ARG 2 volume METHOD a tick (Z)V METHOD b pauseAll ()V METHOD b isSoundResourcePresent (Ldwk;Lqs;Lxd;)Z @@ -28,4 +33,5 @@ CLASS dxn net/minecraft/client/audio/SoundManager METHOD c stopAll ()V METHOD c isPlaying (Ldwn;)Z METHOD d close ()V - METHOD e playAll ()V + METHOD e resumeAll ()V + METHOD f getDebugString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/audio/SoundSystem.mapping b/mappings/net/minecraft/client/audio/SoundSystem.mapping index 48d25ce70a..115f8cb1aa 100644 --- a/mappings/net/minecraft/client/audio/SoundSystem.mapping +++ b/mappings/net/minecraft/client/audio/SoundSystem.mapping @@ -4,38 +4,45 @@ CLASS dxk net/minecraft/client/audio/SoundSystem FIELD c unknownSounds Ljava/util/Set; FIELD d loader Ldxn; FIELD e settings Lcvf; - FIELD f initialized Z + FIELD f started Z FIELD g soundEngine Lcsw; FIELD h listener Lcsx; FIELD i soundLoader Ldxj; FIELD j taskQueue Ldxl; FIELD k channel Ldxh; FIELD l ticks I - FIELD n lastPlayedSounds Lcom/google/common/collect/Multimap; + FIELD m sources Ljava/util/Map; + FIELD n sounds Lcom/google/common/collect/Multimap; FIELD o tickingSounds Ljava/util/List; + FIELD p startTicks Ljava/util/Map; + FIELD q soundEndTicks Ljava/util/Map; FIELD r listeners Ljava/util/List; - FIELD s streamedSounds Ljava/util/List; + FIELD s preloadedSounds Ljava/util/List; METHOD (Ldxn;Lcvf;Lxd;)V ARG 1 loader METHOD a reloadSounds ()V METHOD a updateListenerPosition (Lcuq;)V - METHOD a addStreamedSound (Ldwk;)V + METHOD a addPreloadedSound (Ldwk;)V + ARG 1 sound METHOD a stop (Ldwn;)V METHOD a play (Ldwn;I)V ARG 1 sound - ARG 2 volume + ARG 2 delay METHOD a registerListener (Ldxm;)V METHOD a stopSounds (Lqs;Lyk;)V METHOD a getSoundVolume (Lyk;)F METHOD a updateSoundVolume (Lyk;F)V - METHOD b close ()V + ARG 2 volume + METHOD a tick (Z)V + METHOD b stop ()V METHOD b isPlaying (Ldwn;)Z METHOD b unregisterListener (Ldxm;)V METHOD c stopAll ()V METHOD c play (Ldwn;)V METHOD d pauseAll ()V METHOD d getAdjustedPitch (Ldwn;)F - METHOD e playAll ()V + METHOD e resumeAll ()V METHOD e getAdjustedVolume (Ldwn;)F - METHOD g initializeSystem ()V + METHOD f getDebugString ()Ljava/lang/String; + METHOD g start ()V METHOD h tick ()V diff --git a/mappings/net/minecraft/client/audio/Source.mapping b/mappings/net/minecraft/client/audio/Source.mapping index 869a15398e..df2f75dbcc 100644 --- a/mappings/net/minecraft/client/audio/Source.mapping +++ b/mappings/net/minecraft/client/audio/Source.mapping @@ -2,16 +2,30 @@ CLASS csv net/minecraft/client/audio/Source FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b pointer I FIELD c playing Ljava/util/concurrent/atomic/AtomicBoolean; + FIELD d bufferSize I + FIELD e stream Ldxg; METHOD (I)V ARG 1 pointer + METHOD a create ()Lcsv; METHOD a setPitch (F)V METHOD a setPosition (Lcro;)V + METHOD a setBuffer (Lcta;)V + METHOD a setStream (Ldxg;)V + ARG 1 stream + METHOD a getBufferSize (Ljavax/sound/sampled/AudioFormat;I)I + ARG 0 format + ARG 1 time METHOD a setLooping (Z)V METHOD b close ()V METHOD b setVolume (F)V METHOD b setRelative (Z)V + METHOD c play ()V + METHOD c setAttenuation (F)V METHOD d pause ()V - METHOD e play ()V + METHOD e resume ()V METHOD f stop ()V METHOD g isStopped ()Z + METHOD h disableAttenuation ()V + METHOD i tick ()V METHOD j getSourceState ()I + METHOD k removeProcessedBuffers ()I diff --git a/mappings/net/minecraft/client/audio/StaticSound.mapping b/mappings/net/minecraft/client/audio/StaticSound.mapping new file mode 100644 index 0000000000..8d8663a09a --- /dev/null +++ b/mappings/net/minecraft/client/audio/StaticSound.mapping @@ -0,0 +1,11 @@ +CLASS cta net/minecraft/client/audio/StaticSound + FIELD a sample Ljava/nio/ByteBuffer; + FIELD b format Ljavax/sound/sampled/AudioFormat; + FIELD c hasBuffer Z + FIELD d streamBufferPointer I + METHOD (Ljava/nio/ByteBuffer;Ljavax/sound/sampled/AudioFormat;)V + ARG 1 sample + ARG 2 format + METHOD a getStreamBufferPointer ()Ljava/util/OptionalInt; + METHOD b close ()V + METHOD c takeStreamBufferPointer ()Ljava/util/OptionalInt; diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 7e8ad79757..cdcfb947f9 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -18,7 +18,7 @@ CLASS cvu net/minecraft/client/gui/hud/InGameHud FIELD o debugHud Lcwm; FIELD p subtitlesHud Lcwy; FIELD q spectatorHud Lcxg; - FIELD r scoreboardHud Lcwu; + FIELD r playerListHud Lcwu; FIELD s bossBarHud Lcwg; FIELD t titleTotalTicks I FIELD u title Ljava/lang/String; @@ -51,7 +51,7 @@ CLASS cvu net/minecraft/client/gui/hud/InGameHud METHOD g getTicks ()I METHOD h getFontRenderer ()Lcvt; METHOD i getSpectatorWidget ()Lcxg; - METHOD j getScoreboardWidget ()Lcwu; + METHOD j getPlayerListWidget ()Lcwu; METHOD k clear ()V METHOD l getBossBarHud ()Lcwg; METHOD m resetDebugHudChunk ()V diff --git a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping new file mode 100644 index 0000000000..a850064de7 --- /dev/null +++ b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping @@ -0,0 +1,21 @@ +CLASS cwu net/minecraft/client/gui/hud/PlayerListHud + CLASS cwu$a EntryOrderComparator + FIELD a ENTRY_ORDERING Lcom/google/common/collect/Ordering; + FIELD b client Lcvb; + FIELD c inGameHud Lcvu; + FIELD d footer Ljm; + FIELD e header Ljm; + FIELD f showTime J + FIELD g visible Z + METHOD (Lcvb;Lcvu;)V + ARG 1 client + METHOD a clear ()V + METHOD a draw (ILcso;Lcsl;)V + ARG 2 scoreboard + ARG 3 playerListScoreboardObjective + METHOD a setFooter (Ljm;)V + ARG 1 footer + METHOD a tick (Z)V + ARG 1 visible + METHOD b setHeader (Ljm;)V + ARG 1 header diff --git a/mappings/net/minecraft/client/gui/hud/ScoreboardHud.mapping b/mappings/net/minecraft/client/gui/hud/ScoreboardHud.mapping deleted file mode 100644 index 98cf23eb2e..0000000000 --- a/mappings/net/minecraft/client/gui/hud/ScoreboardHud.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS cwu net/minecraft/client/gui/hud/ScoreboardHud - CLASS cwu$a EntryOrderComparator - FIELD a ENTRY_ORDERING Lcom/google/common/collect/Ordering; - FIELD b client Lcvb; - FIELD c inGameHud Lcvu; - METHOD (Lcvb;Lcvu;)V - ARG 1 client - METHOD a clear ()V diff --git a/mappings/net/minecraft/client/gui/menu/AdvancementsScreen.mapping b/mappings/net/minecraft/client/gui/menu/AdvancementsScreen.mapping index 18bdd3c089..02b71d468d 100644 --- a/mappings/net/minecraft/client/gui/menu/AdvancementsScreen.mapping +++ b/mappings/net/minecraft/client/gui/menu/AdvancementsScreen.mapping @@ -14,3 +14,6 @@ CLASS czy net/minecraft/client/gui/menu/AdvancementsScreen ARG 1 mouseX ARG 2 mouseY ARG 3 x + METHOD f getAdvancementWidget (Lq;)Lczw; + ARG 1 advancement + METHOD g getAdvancementTreeWidget (Lq;)Lczu; diff --git a/mappings/net/minecraft/client/gui/widget/AdvancementWidget.mapping b/mappings/net/minecraft/client/gui/widget/AdvancementWidget.mapping index 41982d958a..113d9c04e5 100644 --- a/mappings/net/minecraft/client/gui/widget/AdvancementWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/AdvancementWidget.mapping @@ -12,3 +12,4 @@ CLASS czw net/minecraft/client/gui/widget/AdvancementWidget ARG 2 client ARG 3 advancement METHOD a getRootWidget (Lq;)Lczw; + METHOD a setProgress (Ls;)V diff --git a/mappings/net/minecraft/client/network/AbstractClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/AbstractClientPlayerEntity.mapping index 2986b9d84b..cbc21555b1 100644 --- a/mappings/net/minecraft/client/network/AbstractClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/AbstractClientPlayerEntity.mapping @@ -1,11 +1,23 @@ CLASS djl net/minecraft/client/network/AbstractClientPlayerEntity + FIELD a elytraPitch F + FIELD b elytraYaw F + FIELD c elytraRoll F + FIELD d clientWorld Ldhe; FIELD e cachedScoreboardEntry Ldhf; + METHOD (Ldhe;Lcom/mojang/authlib/GameProfile;)V + ARG 1 world + ARG 2 profile METHOD a loadSkin (Lqs;Ljava/lang/String;)Ldtq; ARG 0 id ARG 1 playerName - METHOD c hasScoreboardEntry ()Z + METHOD c canRenderCapeTexture ()Z METHOD d getSkinId (Ljava/lang/String;)Lqs; ARG 0 playerName - METHOD i getScoreboardEntry ()Ldhf; + METHOD i getPlayerListEntry ()Ldhf; METHOD l hasSkinTexture ()Z METHOD m getSkinTexture ()Lqs; + METHOD n getCapeTexture ()Lqs; + METHOD o canRenderElytraTexture ()Z + METHOD p getElytraTexture ()Lqs; + METHOD s getModel ()Ljava/lang/String; + METHOD v getSpeed ()F diff --git a/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping b/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping index 8c6f48566e..5a0fd309a7 100644 --- a/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping +++ b/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping @@ -1,8 +1,15 @@ CLASS dgy net/minecraft/client/network/ClientAdvancementManager + CLASS net/minecraft/client/network/ClientAdvancementManager$a Listener + METHOD a setProgress (Lq;Ls;)V + METHOD e selectTab (Lq;)V FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b client Lcvb; FIELD c manager Lr; + FIELD d advancementProgresses Ljava/util/Map; + FIELD e listener Ldgy$a; + FIELD f selectedTab Lq; METHOD a getManager ()Lr; - METHOD a setGui (Ldgy$a;)V + METHOD a setListener (Ldgy$a;)V + ARG 1 listener METHOD a onAdvancements (Lnk;)V METHOD a selectTab (Lq;Z)V diff --git a/mappings/net/minecraft/client/network/ClientCommandSource.mapping b/mappings/net/minecraft/client/network/ClientCommandSource.mapping index b6ed72b36f..84d41c5bb4 100644 --- a/mappings/net/minecraft/client/network/ClientCommandSource.mapping +++ b/mappings/net/minecraft/client/network/ClientCommandSource.mapping @@ -7,3 +7,5 @@ CLASS dhc net/minecraft/client/network/ClientCommandSource ARG 1 client METHOD a formatDouble (D)Ljava/lang/String; METHOD a formatInt (I)Ljava/lang/String; + METHOD a onCommandSuggestions (ILcom/mojang/brigadier/suggestion/Suggestions;)V + ARG 1 completionId diff --git a/mappings/net/minecraft/client/network/ClientDummyContainerProvider.mapping b/mappings/net/minecraft/client/network/ClientDummyContainerProvider.mapping index f5164a52ab..7d4bc1e7da 100644 --- a/mappings/net/minecraft/client/network/ClientDummyContainerProvider.mapping +++ b/mappings/net/minecraft/client/network/ClientDummyContainerProvider.mapping @@ -1,4 +1,5 @@ CLASS ahe net/minecraft/client/network/ClientDummyContainerProvider FIELD a name Ljm; + FIELD b containerProvider Layv; METHOD createMenu (ILavq;Lavr;)Laxv; ARG 1 syncId diff --git a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping index 773fe5245f..4d6f2cd6e8 100644 --- a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping @@ -4,7 +4,7 @@ CLASS dha net/minecraft/client/network/ClientLoginNetworkHandler FIELD c parentGui Lczk; FIELD d statusConsumer Ljava/util/function/Consumer; FIELD e connection Lja; - FIELD f playerProfile Lcom/mojang/authlib/GameProfile; + FIELD f profile Lcom/mojang/authlib/GameProfile; METHOD (Lja;Lcvb;Lczk;Ljava/util/function/Consumer;)V ARG 1 connection ARG 2 client diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 7760adb87c..391ebdd3dd 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -5,7 +5,7 @@ CLASS dhb net/minecraft/client/network/ClientPlayNetworkHandler FIELD d loginScreen Lczk; FIELD e client Lcvb; FIELD f world Ldhe; - FIELD h scoreboardEntries Ljava/util/Map; + FIELD h playerListEntries Ljava/util/Map; FIELD i advancementHandler Ldgy; FIELD j commandSource Ldhc; FIELD k tagManager Lzc; @@ -18,9 +18,9 @@ CLASS dhb net/minecraft/client/network/ClientPlayNetworkHandler METHOD (Lcvb;Lczk;Lja;Lcom/mojang/authlib/GameProfile;)V ARG 1 client METHOD a getClientConnection ()Lja; - METHOD a getScoreboardEntry (Ljava/lang/String;)Ldhf; + METHOD a getPlayerListEntry (Ljava/lang/String;)Ldhf; ARG 1 profileName - METHOD a getScoreboardEntry (Ljava/util/UUID;)Ldhf; + METHOD a getPlayerListEntry (Ljava/util/UUID;)Ldhf; ARG 1 uuid METHOD a sendPacket (Lka;)V METHOD a sendResourcePackStatus (Lou$a;)V @@ -28,7 +28,7 @@ CLASS dhb net/minecraft/client/network/ClientPlayNetworkHandler METHOD b validateResourcePackUrl (Ljava/lang/String;)Z METHOD c clearWorld ()V METHOD d getRecipeManager ()Lbed; - METHOD e getScoreboardEntries ()Ljava/util/Collection; + METHOD e getPlayerList ()Ljava/util/Collection; METHOD f getProfile ()Lcom/mojang/authlib/GameProfile; METHOD g getAdvancementHandler ()Ldgy; METHOD h getCommandDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index 23b52083c3..c04a006ace 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -33,6 +33,7 @@ CLASS djo net/minecraft/client/network/ClientPlayerEntity METHOD H isHoldingSneakKey ()Z METHOD I isCamera ()Z METHOD J isRiding ()Z + METHOD K getLastAutoJump ()Z METHOD M sendMovementPackets ()V METHOD a setClientPermissionLevel (I)V METHOD a onRecipeDisplayed (Lbec;)V @@ -43,5 +44,6 @@ CLASS djo net/minecraft/client/network/ClientPlayerEntity METHOD g setServerBrand (Ljava/lang/String;)V ARG 1 serverBrand METHOD t updateHealth (F)V + METHOD w closeScreen ()V METHOD x startRidingJump ()V METHOD z openRidingInventory ()V diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index 8b5b3ba513..e7248fc084 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -27,7 +27,8 @@ CLASS dhd net/minecraft/client/network/ClientPlayerInteractionManager METHOD a interactItem (Lavr;Lbha;Lagx;)Lagy; ARG 1 player ARG 2 world - METHOD a (Lbbu;I)V + METHOD a dropCreativeStack (Lbbu;)V + METHOD a clickCreativeStack (Lbbu;I)V ARG 1 stack METHOD a setGameMode (Lbgx;)V METHOD a createPlayer (Ldhe;Lyt;Lcur;)Ldjo; diff --git a/mappings/net/minecraft/client/network/packet/ChunkDataS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/ChunkDataS2CPacket.mapping index e3d555d9b7..275a957857 100644 --- a/mappings/net/minecraft/client/network/packet/ChunkDataS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/ChunkDataS2CPacket.mapping @@ -2,14 +2,22 @@ CLASS ll net/minecraft/client/network/packet/ChunkDataS2CPacket FIELD a chunkX I FIELD b chunkZ I FIELD c verticalStripBitmask I + FIELD d heightmaps Lib; FIELD e data [B - FIELD f blockEntityList Ljava/util/List; + FIELD f blockEntities Ljava/util/List; FIELD g isFullChunk Z METHOD (Lbxc;I)V + ARG 1 chunk ARG 2 includedSectionsMask + METHOD a getDataSize (Lbxc;I)I + METHOD a writeData (Ljc;Lbxc;I)I + ARG 2 chunk + ARG 3 includedSectionsMask METHOD b getReadBuffer ()Ljc; METHOD c getX ()I METHOD d getZ ()I METHOD e getVerticalStripBitmask ()I METHOD f isFullChunk ()Z + METHOD g getHeightmaps ()Lib; METHOD h getBlockEntityTagList ()Ljava/util/List; + METHOD i getWriteBuffer ()Lio/netty/buffer/ByteBuf; diff --git a/mappings/net/minecraft/client/network/packet/CommandSuggestionsS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/CommandSuggestionsS2CPacket.mapping index 8b79b2796b..91aef06158 100644 --- a/mappings/net/minecraft/client/network/packet/CommandSuggestionsS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/CommandSuggestionsS2CPacket.mapping @@ -1,3 +1,8 @@ CLASS ku net/minecraft/client/network/packet/CommandSuggestionsS2CPacket + FIELD a completionId I FIELD b suggestions Lcom/mojang/brigadier/suggestion/Suggestions; + METHOD (ILcom/mojang/brigadier/suggestion/Suggestions;)V + ARG 1 completionId + ARG 2 suggestions + METHOD b getCompletionId ()I METHOD c getSuggestions ()Lcom/mojang/brigadier/suggestion/Suggestions; diff --git a/mappings/net/minecraft/client/network/packet/CommandTreeS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/CommandTreeS2CPacket.mapping index a5a97a8cad..710af2b3b6 100644 --- a/mappings/net/minecraft/client/network/packet/CommandTreeS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/CommandTreeS2CPacket.mapping @@ -1 +1,25 @@ CLASS kv net/minecraft/client/network/packet/CommandTreeS2CPacket + CLASS kv$a CommandNodeData + FIELD a argumentBuilder Lcom/mojang/brigadier/builder/ArgumentBuilder; + FIELD b flags B + FIELD c redirectNodeIndex I + FIELD d childNodeIndices [I + FIELD e node Lcom/mojang/brigadier/tree/CommandNode; + METHOD (Lcom/mojang/brigadier/builder/ArgumentBuilder;BI[I)V + ARG 1 argumentBuilder + ARG 2 flags + ARG 3 redirectNodeIndex + ARG 4 childNodeIndices + METHOD a build ([Lkv$a;)Z + ARG 1 previousNodes + FIELD a commandTree Lcom/mojang/brigadier/tree/RootCommandNode; + METHOD (Lcom/mojang/brigadier/tree/RootCommandNode;)V + ARG 1 commandTree + METHOD a readArgumentBuilder (Ljc;B)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 1 buf + METHOD a writeNode (Ljc;Lcom/mojang/brigadier/tree/CommandNode;Ljava/util/Map;)V + ARG 1 buf + ARG 2 node + METHOD b getCommandTree ()Lcom/mojang/brigadier/tree/RootCommandNode; + METHOD c readCommandNode (Ljc;)Lkv$a; + ARG 1 buf diff --git a/mappings/net/minecraft/client/network/packet/CustomPayloadS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/CustomPayloadS2CPacket.mapping index 4b39223ace..2a31610903 100644 --- a/mappings/net/minecraft/client/network/packet/CustomPayloadS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/CustomPayloadS2CPacket.mapping @@ -5,6 +5,10 @@ CLASS lc net/minecraft/client/network/packet/CustomPayloadS2CPacket FIELD d DEBUG_CAVES Lqs; FIELD e DEBUG_STRUCTURES Lqs; FIELD f DEBUG_WORLDGEN_ATTEMPT Lqs; + FIELD g DEBUG_POI_TICKET_COUNT Lqs; + FIELD h DEBUG_POI_ADDED Lqs; + FIELD i DEBUG_POI_REMOVED Lqs; + FIELD j DEBUG_VILLAGE_SECTIONS Lqs; FIELD k DEBUG_GOAL_SELECTOR Lqs; FIELD l DEBUG_BRAIN Lqs; FIELD m channel Lqs; diff --git a/mappings/net/minecraft/client/network/packet/DifficultyS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/DifficultyS2CPacket.mapping index 062fd5a100..8bce59c794 100644 --- a/mappings/net/minecraft/client/network/packet/DifficultyS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/DifficultyS2CPacket.mapping @@ -1,5 +1,8 @@ CLASS kr net/minecraft/client/network/packet/DifficultyS2CPacket FIELD a difficulty Lagv; + FIELD b difficultyLocked Z METHOD (Lagv;Z)V ARG 1 difficulty + ARG 2 difficultyLocked + METHOD b isDifficultyLocked ()Z METHOD c getDifficulty ()Lagv; diff --git a/mappings/net/minecraft/client/network/packet/EntityAttributesS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/EntityAttributesS2CPacket.mapping index 7aa4d348a0..88b04bd6e1 100644 --- a/mappings/net/minecraft/client/network/packet/EntityAttributesS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/EntityAttributesS2CPacket.mapping @@ -1,4 +1,19 @@ CLASS nl net/minecraft/client/network/packet/EntityAttributesS2CPacket CLASS nl$a Entry + FIELD b id Ljava/lang/String; + FIELD c baseValue D + FIELD d modifiers Ljava/util/Collection; + METHOD (Lnl;Ljava/lang/String;DLjava/util/Collection;)V + ARG 1 id + ARG 2 baseValue + ARG 4 modifiers + METHOD a getId ()Ljava/lang/String; + METHOD b getBaseValue ()D + METHOD c getModifiers ()Ljava/util/Collection; + FIELD a entityId I FIELD b entries Ljava/util/List; + METHOD (ILjava/util/Collection;)V + ARG 1 entityId + ARG 2 attributes + METHOD b getEntityId ()I METHOD c getEntries ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/network/packet/EntityPotionEffectS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/EntityPotionEffectS2CPacket.mapping index e88808aa7a..ba571ce549 100644 --- a/mappings/net/minecraft/client/network/packet/EntityPotionEffectS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/EntityPotionEffectS2CPacket.mapping @@ -1 +1,17 @@ CLASS nm net/minecraft/client/network/packet/EntityPotionEffectS2CPacket + FIELD a entityId I + FIELD b effectId B + FIELD c amplifier B + FIELD d duration I + FIELD e flags B + METHOD (ILahx;)V + ARG 1 entityId + ARG 2 effect + METHOD b isPermanent ()Z + METHOD c getEntityId ()I + METHOD d getEffectId ()B + METHOD e getAmplifier ()B + METHOD f getDuration ()I + METHOD g shouldShowParticles ()Z + METHOD h isAmbient ()Z + METHOD i shouldShowIcon ()Z diff --git a/mappings/net/minecraft/client/network/packet/KeepAliveS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/KeepAliveS2CPacket.mapping index 77e7211c0e..6d47f9509d 100644 --- a/mappings/net/minecraft/client/network/packet/KeepAliveS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/KeepAliveS2CPacket.mapping @@ -1 +1,5 @@ CLASS lk net/minecraft/client/network/packet/KeepAliveS2CPacket + FIELD a id J + METHOD (J)V + ARG 1 id + METHOD b getId ()J diff --git a/mappings/net/minecraft/client/network/packet/LoginCompressionS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/LoginCompressionS2CPacket.mapping index b3af23b2f4..0faf5688ed 100644 --- a/mappings/net/minecraft/client/network/packet/LoginCompressionS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/LoginCompressionS2CPacket.mapping @@ -1,2 +1,5 @@ CLASS pr net/minecraft/client/network/packet/LoginCompressionS2CPacket - METHOD b getMinCompressedSize ()I + FIELD a compressionThreshold I + METHOD (I)V + ARG 1 compressionThreshold + METHOD b getCompressionThreshold ()I diff --git a/mappings/net/minecraft/client/network/packet/LoginHelloS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/LoginHelloS2CPacket.mapping index 53b607da39..f4895498d2 100644 --- a/mappings/net/minecraft/client/network/packet/LoginHelloS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/LoginHelloS2CPacket.mapping @@ -1,5 +1,11 @@ CLASS pq net/minecraft/client/network/packet/LoginHelloS2CPacket FIELD a serverId Ljava/lang/String; FIELD b publicKey Ljava/security/PublicKey; + FIELD c nonce [B + METHOD (Ljava/lang/String;Ljava/security/PublicKey;[B)V + ARG 1 serverId + ARG 2 publicKey + ARG 3 nonce METHOD b getServerId ()Ljava/lang/String; METHOD c getPublicKey ()Ljava/security/PublicKey; + METHOD d getNonce ()[B diff --git a/mappings/net/minecraft/client/network/packet/LoginSuccessS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/LoginSuccessS2CPacket.mapping index 71c711157f..7a5e3c9383 100644 --- a/mappings/net/minecraft/client/network/packet/LoginSuccessS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/LoginSuccessS2CPacket.mapping @@ -1,2 +1,5 @@ CLASS pp net/minecraft/client/network/packet/LoginSuccessS2CPacket - METHOD b getPlayerProfile ()Lcom/mojang/authlib/GameProfile; + FIELD a profile Lcom/mojang/authlib/GameProfile; + METHOD (Lcom/mojang/authlib/GameProfile;)V + ARG 1 profile + METHOD b getProfile ()Lcom/mojang/authlib/GameProfile; diff --git a/mappings/net/minecraft/client/network/packet/MapUpdateS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/MapUpdateS2CPacket.mapping index a94ff8cd1d..1c3de784f4 100644 --- a/mappings/net/minecraft/client/network/packet/MapUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/MapUpdateS2CPacket.mapping @@ -2,6 +2,7 @@ CLASS lq net/minecraft/client/network/packet/MapUpdateS2CPacket FIELD a id I FIELD b scale B FIELD c showIcons Z + FIELD d locked Z FIELD e icons [Lcnl; FIELD f updateLeft I FIELD g updateTop I @@ -12,6 +13,7 @@ CLASS lq net/minecraft/client/network/packet/MapUpdateS2CPacket ARG 1 id ARG 2 scale ARG 3 showIcons + ARG 4 locked ARG 7 updateTop ARG 8 updateHeight METHOD a apply (Lcno;)V diff --git a/mappings/net/minecraft/client/network/packet/ParticleS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/ParticleS2CPacket.mapping index f60d33429d..bc455e3363 100644 --- a/mappings/net/minecraft/client/network/packet/ParticleS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/ParticleS2CPacket.mapping @@ -5,8 +5,24 @@ CLASS ln net/minecraft/client/network/packet/ParticleS2CPacket FIELD d offsetX F FIELD e offsetY F FIELD f offsetZ F - FIELD h particleCount I + FIELD g speed F + FIELD h count I FIELD i longDistance Z + FIELD j parameters Lgd; + METHOD (Lgd;ZFFFFFFFI)V + ARG 1 parameters + ARG 2 longDistance + ARG 3 x + ARG 4 y + ARG 5 z + ARG 6 offsetX + ARG 7 offsetY + ARG 8 offsetZ + ARG 9 speed + ARG 10 count + METHOD a readParticleParameters (Ljc;Lge;)Lgd; + ARG 1 buf + ARG 2 type METHOD b isLongDistance ()Z METHOD c getX ()D METHOD d getY ()D @@ -14,4 +30,6 @@ CLASS ln net/minecraft/client/network/packet/ParticleS2CPacket METHOD f getOffsetX ()F METHOD g getOffsetY ()F METHOD h getOffsetZ ()F - METHOD j getParticleCount ()I + METHOD i getSpeed ()F + METHOD j getCount ()I + METHOD k getParameters ()Lgd; diff --git a/mappings/net/minecraft/client/network/packet/ScoreboardDisplayS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/ScoreboardDisplayS2CPacket.mapping index 91f259645e..b503545f6f 100644 --- a/mappings/net/minecraft/client/network/packet/ScoreboardDisplayS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/ScoreboardDisplayS2CPacket.mapping @@ -4,3 +4,4 @@ CLASS mp net/minecraft/client/network/packet/ScoreboardDisplayS2CPacket METHOD (ILcsl;)V ARG 1 location METHOD b getLocation ()I + METHOD c getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/network/packet/StatisticsS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/StatisticsS2CPacket.mapping index f45583ffac..9c0fd31776 100644 --- a/mappings/net/minecraft/client/network/packet/StatisticsS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/StatisticsS2CPacket.mapping @@ -1,5 +1,7 @@ CLASS kl net/minecraft/client/network/packet/StatisticsS2CPacket FIELD a stats Lit/unimi/dsi/fastutil/objects/Object2IntMap; + METHOD a getStatId (Lyp;)I + ARG 1 stat METHOD a readStat (Lyr;Ljc;)V ARG 1 type METHOD b getStatMap ()Ljava/util/Map; diff --git a/mappings/net/minecraft/client/network/packet/SynchronizeRecipesS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/SynchronizeRecipesS2CPacket.mapping index 232705dc17..b013385169 100644 --- a/mappings/net/minecraft/client/network/packet/SynchronizeRecipesS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/SynchronizeRecipesS2CPacket.mapping @@ -1,3 +1,8 @@ CLASS nn net/minecraft/client/network/packet/SynchronizeRecipesS2CPacket FIELD a recipes Ljava/util/List; + METHOD a writeRecipe (Lbec;Ljc;)V + ARG 0 recipe + ARG 1 buf METHOD b getRecipes ()Ljava/util/List; + METHOD c readRecipe (Ljc;)Lbec; + ARG 0 buf diff --git a/mappings/net/minecraft/client/network/packet/TeamS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/TeamS2CPacket.mapping index 407b8bacff..1e4502663b 100644 --- a/mappings/net/minecraft/client/network/packet/TeamS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/TeamS2CPacket.mapping @@ -1,12 +1,17 @@ CLASS my net/minecraft/client/network/packet/TeamS2CPacket FIELD a teamName Ljava/lang/String; + FIELD b displayName Ljm; + FIELD c prefix Ljm; + FIELD d suffix Ljm; FIELD e nameTagVisibilityRule Ljava/lang/String; FIELD f collisionRule Ljava/lang/String; + FIELD g color Lc; FIELD h playerList Ljava/util/Collection; FIELD i mode I FIELD j flags I METHOD (Lcsm;I)V ARG 1 team + ARG 2 mode METHOD (Lcsm;Ljava/util/Collection;I)V ARG 1 team ARG 2 playerList @@ -18,3 +23,5 @@ CLASS my net/minecraft/client/network/packet/TeamS2CPacket METHOD g getPlayerPrefix ()Lc; METHOD h getNameTagVisibilityRule ()Ljava/lang/String; METHOD i getCollisionRule ()Ljava/lang/String; + METHOD j getPrefix ()Ljm; + METHOD k getSuffix ()Ljm; diff --git a/mappings/net/minecraft/client/particle/BillboardParticle.mapping b/mappings/net/minecraft/client/particle/BillboardParticle.mapping index 4be4c79969..45d48ff95b 100644 --- a/mappings/net/minecraft/client/particle/BillboardParticle.mapping +++ b/mappings/net/minecraft/client/particle/BillboardParticle.mapping @@ -1,5 +1,7 @@ CLASS diu net/minecraft/client/particle/BillboardParticle FIELD D scale F + METHOD b getSize (F)F + ARG 1 tickDelta METHOD c getMinU ()F METHOD d getMaxU ()F METHOD e getMinV ()F diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index 474daa533b..c89e9561a2 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -58,7 +58,9 @@ CLASS dim net/minecraft/client/particle/Particle ARG 1 maxAge METHOD a setBoundingBox (Lcrj;)V METHOD a buildGeometry (Lcuc;Lcuq;FFFFFF)V - ARG 1 vertexBuffer + ARG 1 bufferBuilder + ARG 2 camera + ARG 3 tickDelta METHOD b getTextureSheet ()Ldiq; METHOD b setPos (DDD)V ARG 1 x diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping index 35d45810cd..6d38b99adf 100644 --- a/mappings/net/minecraft/client/particle/ParticleManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping @@ -1,4 +1,8 @@ CLASS dio net/minecraft/client/particle/ParticleManager + CLASS dio$a SimpleSpriteProvider + FIELD b sprites Ljava/util/List; + METHOD a setSprites (Ljava/util/List;)V + ARG 1 sprites FIELD a world Lbha; FIELD c particleQueues Ljava/util/Map; FIELD d newEmitterParticles Ljava/util/Queue; @@ -19,7 +23,9 @@ CLASS dio net/minecraft/client/particle/ParticleManager ARG 2 parameters ARG 3 maxAge METHOD a setWorld (Lbha;)V - METHOD a renderUnlitParticles (Lcuq;F)V + METHOD a renderParticles (Lcuq;F)V + ARG 1 camera + ARG 2 tickDelta METHOD a addParticle (Ldim;)V METHOD a addBlockBreakParticles (Lev;Lbvc;)V ARG 1 pos @@ -49,3 +55,4 @@ CLASS dio net/minecraft/client/particle/ParticleManager ARG 12 velocityZ METHOD c getDebugString ()Ljava/lang/String; METHOD d registerDefaultFactories ()V + METHOD registerPartic registerParticle (Lge;Ldio$b;)V diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping index 753f84e912..187fcc2b53 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping @@ -7,7 +7,7 @@ CLASS doy net/minecraft/client/render/entity/EntityRenderDispatcher FIELD f cameraPitch F FIELD g gameOptions Lcvf; FIELD h renderers Ljava/util/Map; - FIELD i skinMap Ljava/util/Map; + FIELD i modelRenderers Ljava/util/Map; FIELD j playerRenderer Ldtl; FIELD k textRenderer Lcvt; FIELD l renderPosX D diff --git a/mappings/net/minecraft/client/render/entity/feature/ElytraFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ElytraFeatureRenderer.mapping index 0dfd295cac..9e67b2c17b 100644 --- a/mappings/net/minecraft/client/render/entity/feature/ElytraFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/ElytraFeatureRenderer.mapping @@ -1,4 +1,5 @@ CLASS dsh net/minecraft/client/render/entity/feature/ElytraFeatureRenderer FIELD a SKIN Lqs; + FIELD b elytra Lded; METHOD (Ldqp;)V ARG 1 context diff --git a/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping b/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping index 576b20a981..b5a47f6f05 100644 --- a/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping +++ b/mappings/net/minecraft/client/render/model/BakedQuadFactory.mapping @@ -5,6 +5,7 @@ CLASS dlg net/minecraft/client/render/model/BakedQuadFactory ARG 3 face ARG 4 texture ARG 5 side - ARG 6 rotationContainer + ARG 6 settings ARG 7 rotation ARG 8 shade + METHOD a uvLock (Ldlc;Lfa;Ldvo;)Ldlc; diff --git a/mappings/net/minecraft/client/render/model/ModelBakeSettings.mapping b/mappings/net/minecraft/client/render/model/ModelBakeSettings.mapping new file mode 100644 index 0000000000..5f02f9cc00 --- /dev/null +++ b/mappings/net/minecraft/client/render/model/ModelBakeSettings.mapping @@ -0,0 +1,3 @@ +CLASS dvt net/minecraft/client/render/model/ModelBakeSettings + METHOD b getRotation ()Ldvo; + METHOD c isUvLocked ()Z diff --git a/mappings/net/minecraft/client/render/model/ModelLoader.mapping b/mappings/net/minecraft/client/render/model/ModelLoader.mapping index beeab0c7c0..9cd68bf7e3 100644 --- a/mappings/net/minecraft/client/render/model/ModelLoader.mapping +++ b/mappings/net/minecraft/client/render/model/ModelLoader.mapping @@ -1,14 +1,20 @@ CLASS dvq net/minecraft/client/render/model/ModelLoader CLASS dvq$a ModelLoaderException - FIELD A BLOCK_STATE_FACTORY_OVERRIDES Ljava/util/Map; + FIELD A STATIC_DEFINITIONS Ljava/util/Map; FIELD B resourceManager Lxd; FIELD C spriteAtlas Ldty; FIELD D modelsToLoad Ljava/util/Set; FIELD E variantMapDeserializationContext Ldle$a; FIELD F unbakedModels Ljava/util/Map; - FIELD G modelRotationCache Ljava/util/Map; + FIELD G bakedModelCache Ljava/util/Map; FIELD H modelsToBake Ljava/util/Map; FIELD I bakedModels Ljava/util/Map; + FIELD J spriteAtlasData Ldty$a; + FIELD a FIRE_0 Lqs; + FIELD b FIRE_1 Lqs; + FIELD c LAVA_FLOW Lqs; + FIELD d WATER_FLOW Lqs; + FIELD e WATER_OVERLAY Lqs; FIELD f DESTROY_STAGE_0 Lqs; FIELD g DESTROY_STAGE_1 Lqs; FIELD h DESTROY_STAGE_2 Lqs; @@ -32,7 +38,11 @@ CLASS dvq net/minecraft/client/render/model/ModelLoader FIELD z ITEM_MODEL_GENERATOR Ldlh; METHOD (Lxd;Ldty;Lagc;)V ARG 1 resourceManager + ARG 2 spriteAtlas + ARG 3 profiler METHOD a getBakedModelMap ()Ljava/util/Map; + METHOD a upload (Lagc;)V + ARG 1 profiler METHOD a stateKeyToPredicate (Lbvd;Ljava/lang/String;)Ljava/util/function/Predicate; ARG 0 stateFactory ARG 1 key @@ -45,7 +55,7 @@ CLASS dvq net/minecraft/client/render/model/ModelLoader ARG 1 id METHOD a bake (Lqs;Ldvt;)Ldvn; ARG 1 id - ARG 2 rotationContainer + ARG 2 settings METHOD a putModel (Lqs;Ldvw;)V ARG 1 id ARG 2 unbakedModel diff --git a/mappings/net/minecraft/client/render/model/ModelRotationContainer.mapping b/mappings/net/minecraft/client/render/model/ModelRotationContainer.mapping deleted file mode 100644 index 19b7d150c3..0000000000 --- a/mappings/net/minecraft/client/render/model/ModelRotationContainer.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS dvt net/minecraft/client/render/model/ModelRotationContainer - METHOD b getRotation ()Ldvo; - METHOD c isUvLocked ()Z diff --git a/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping b/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping index 45d62debd0..b56a9810b6 100644 --- a/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping +++ b/mappings/net/minecraft/client/render/model/json/ItemModelGenerator.mapping @@ -2,3 +2,4 @@ CLASS dlh net/minecraft/client/render/model/json/ItemModelGenerator FIELD a LAYERS Ljava/util/List; METHOD a create (Ljava/util/function/Function;Ldld;)Ldld; ARG 1 textureGetter + ARG 2 blockModel diff --git a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping index 55bc0402fa..4ef79b73ad 100644 --- a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping @@ -47,7 +47,7 @@ CLASS dld net/minecraft/client/render/model/json/JsonUnbakedModel ARG 1 elementFace ARG 2 sprite ARG 3 side - ARG 4 rotationContainer + ARG 4 settings METHOD a getTransformation (Ldll$b;)Ldlk; METHOD a compileOverrides (Ldvq;Ldld;)Ldlj; ARG 1 modelLoader @@ -56,7 +56,7 @@ CLASS dld net/minecraft/client/render/model/json/JsonUnbakedModel ARG 1 loader ARG 2 parent ARG 3 textureGetter - ARG 4 rotationContainer + ARG 4 settings METHOD a deserialize (Ljava/io/Reader;)Ldld; ARG 0 reader METHOD a deserialize (Ljava/lang/String;)Ldld; diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 464f94cac1..a62d25e268 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -107,7 +107,7 @@ CLASS aim net/minecraft/entity/LivingEntity METHOD b getActiveEyeHeight (Laiw;Laie;)F METHOD b onEquipStack (Lbbu;)V ARG 1 stack - METHOD b spawnEatingParticlesAndPlayEatingSoundOrPlayDrinkingSound (Lbbu;I)V + METHOD b spawnConsumptionEffects (Lbbu;I)V ARG 1 item ARG 2 particleCount METHOD b applyFrostWalker (Lev;)V @@ -194,6 +194,7 @@ CLASS aim net/minecraft/entity/LivingEntity METHOD dg isUsingItem ()Z METHOD dh getActiveHand ()Lagx; METHOD dj getActiveItem ()Lbbu; + METHOD dm stopUsingItem ()V METHOD dp isFallFlying ()Z METHOD dt getSleepingPosition ()Ljava/util/Optional; METHOD du clearSleepingPosition ()V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 2356b28b98..ecad7c7f54 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -146,5 +146,5 @@ CLASS avr net/minecraft/entity/player/PlayerEntity METHOD r sendAbilitiesUpdate ()V METHOD r addExhaustion (F)V METHOD r addScore (I)V - METHOD t_ closeGui ()V + METHOD t_ closeContainer ()V METHOD u isCreative ()Z diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index 8efa0c4239..441acafbcd 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -20,7 +20,8 @@ CLASS ja net/minecraft/network/ClientConnection FIELD t avgPacketsSent F FIELD u ticks I METHOD a tick ()V - METHOD a setMinCompressedSize (I)V + METHOD a setCompressionThreshold (I)V + ARG 1 compressionThreshold METHOD a connect (Ljava/net/InetAddress;IZ)Lja; ARG 0 address ARG 1 port diff --git a/mappings/net/minecraft/network/PacketDeflater.mapping b/mappings/net/minecraft/network/PacketDeflater.mapping index 9c0cfcb185..cf4a07b15f 100644 --- a/mappings/net/minecraft/network/PacketDeflater.mapping +++ b/mappings/net/minecraft/network/PacketDeflater.mapping @@ -1,5 +1,6 @@ CLASS iz net/minecraft/network/PacketDeflater FIELD a deflateBuffer [B FIELD b deflater Ljava/util/zip/Deflater; - FIELD c minCompressedSize I - METHOD a setMinCompressedSize (I)V + FIELD c compressionThreshold I + METHOD a setCompressionThreshold (I)V + ARG 1 compressionThreshold diff --git a/mappings/net/minecraft/network/PacketInflater.mapping b/mappings/net/minecraft/network/PacketInflater.mapping index 42630ac96b..e712a0ff8d 100644 --- a/mappings/net/minecraft/network/PacketInflater.mapping +++ b/mappings/net/minecraft/network/PacketInflater.mapping @@ -1,4 +1,4 @@ CLASS iy net/minecraft/network/PacketInflater FIELD a inflater Ljava/util/zip/Inflater; FIELD b minCompressedSize I - METHOD a setMinCompressedSize (I)V + METHOD a setCompressionThreshold (I)V diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index a7e42e2b43..58829bf5a1 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -4,6 +4,7 @@ CLASS vz net/minecraft/server/network/ServerLoginNetworkHandler FIELD b authenticatorThreadId Ljava/util/concurrent/atomic/AtomicInteger; FIELD c LOGGER Lorg/apache/logging/log4j/Logger; FIELD d RANDOM Ljava/util/Random; + FIELD e nonce [B FIELD f server Lnet/minecraft/server/MinecraftServer; FIELD g state Lvz$a; FIELD h loginTicks I diff --git a/mappings/net/minecraft/server/network/packet/LoginKeyC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/LoginKeyC2SPacket.mapping index c6c0b38f2e..935a094fa6 100644 --- a/mappings/net/minecraft/server/network/packet/LoginKeyC2SPacket.mapping +++ b/mappings/net/minecraft/server/network/packet/LoginKeyC2SPacket.mapping @@ -1 +1,2 @@ CLASS pw net/minecraft/server/network/packet/LoginKeyC2SPacket + METHOD b calculateNonce (Ljava/security/PrivateKey;)[B diff --git a/mappings/net/minecraft/world/gen/Heightmap.mapping b/mappings/net/minecraft/world/Heightmap.mapping similarity index 89% rename from mappings/net/minecraft/world/gen/Heightmap.mapping rename to mappings/net/minecraft/world/Heightmap.mapping index 4265edfeb7..5884daadcf 100644 --- a/mappings/net/minecraft/world/gen/Heightmap.mapping +++ b/mappings/net/minecraft/world/Heightmap.mapping @@ -1,4 +1,4 @@ -CLASS byj net/minecraft/world/gen/Heightmap +CLASS byj net/minecraft/world/Heightmap CLASS byj$a Type FIELD a WORLD_SURFACE_WG Lbyj$a; FIELD b WORLD_SURFACE Lbyj$a; @@ -7,6 +7,7 @@ CLASS byj net/minecraft/world/gen/Heightmap FIELD e MOTION_BLOCKING Lbyj$a; FIELD f MOTION_BLOCKING_NO_LEAVES Lbyj$a; FIELD g name Ljava/lang/String; + FIELD h purpose Lbyj$b; FIELD i blockPredicate Ljava/util/function/Predicate; FIELD j BY_NAME Ljava/util/Map; METHOD (Ljava/lang/String;ILjava/lang/String;Lbyj$b;Ljava/util/function/Predicate;)V @@ -14,7 +15,9 @@ CLASS byj net/minecraft/world/gen/Heightmap METHOD a getName ()Ljava/lang/String; METHOD a byName (Ljava/lang/String;)Lbyj$a; ARG 0 name + METHOD b shouldSendToClient ()Z METHOD c getBlockPredicate ()Ljava/util/function/Predicate; + CLASS net/minecraft/world/gen/Heightmap$b Purpose FIELD a ALWAYS_TRUE Ljava/util/function/Predicate; FIELD b SUFFOCATES Ljava/util/function/Predicate; FIELD c storage Lze;