diff --git a/mappings/net/minecraft/SharedConstants.mapping b/mappings/net/minecraft/SharedConstants.mapping index b68fbdf6b0..08e767f207 100644 --- a/mappings/net/minecraft/SharedConstants.mapping +++ b/mappings/net/minecraft/SharedConstants.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_155 net/minecraft/SharedConstants FIELD field_29739 DATA_PACK_VERSION I FIELD field_29740 DATA_VERSION_KEY Ljava/lang/String; FIELD field_34371 DEBUG_BIOME_SOURCE Z + FIELD field_34372 DEBUG_NOISE Z FIELD field_34373 CURRENT_SERIES Ljava/lang/String; METHOD method_16673 getGameVersion ()Lnet/minecraft/class_6489; METHOD method_31372 getProtocolVersion ()I diff --git a/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping index 5846fe5677..4e75f0fe50 100644 --- a/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping @@ -17,3 +17,4 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/AdventureTabAdvancement METHOD method_37316 createLightningStrike (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048;)Lnet/minecraft/class_6405$class_6406; ARG 0 range ARG 1 entity + METHOD method_39492 getOverworldBiomes ()Ljava/util/List; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index c1d1138758..e0d0eca3ed 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -57,6 +57,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT Collisions at a speed lower than this are considered "soft". COMMENT Used by players to determine whether to stop sprinting when hitting a wall. FIELD field_35101 chunkPos Lnet/minecraft/class_1923; + FIELD field_35588 blockStateAtPos Lnet/minecraft/class_2680; FIELD field_5951 ridingCooldown I FIELD field_5952 onGround Z FIELD field_5953 firstUpdate Z diff --git a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping index c7c738f9fe..97f1a36057 100644 --- a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping @@ -12,6 +12,9 @@ CLASS net/minecraft/class_1429 net/minecraft/entity/passive/AnimalEntity ARG 1 world ARG 2 other METHOD method_29270 getLoveTicks ()I + METHOD method_39448 isLightLevelValidForNaturalSpawn (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos METHOD method_6474 canBreedWith (Lnet/minecraft/class_1429;)Z ARG 1 other METHOD method_6475 eat (Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index 6b2f33467b..78ba814b1c 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -95,6 +95,12 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity ARG 1 entity METHOD method_26885 createFoxAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_35172 isJumping ()Z + METHOD method_39449 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z + ARG 0 type + ARG 1 world + ARG 2 spawnReason + ARG 3 pos + ARG 4 random CLASS class_4020 DefendFriendGoal FIELD field_17966 offender Lnet/minecraft/class_1309; FIELD field_17967 friend Lnet/minecraft/class_1309; diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index ed1cd236bb..3cc96d6f3a 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -17,6 +17,12 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity ARG 0 entity METHOD method_26897 createWolfAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_31167 resetShake ()V + METHOD method_39450 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z + ARG 0 type + ARG 1 world + ARG 2 spawnReason + ARG 3 pos + ARG 4 random METHOD method_6707 getFurWetBrightnessMultiplier (F)F COMMENT Returns this wolf's brightness multiplier based on the fur wetness. COMMENT
diff --git a/mappings/net/minecraft/network/NetworkState.mapping b/mappings/net/minecraft/network/NetworkState.mapping
index 82e4371880..04fc5380be 100644
--- a/mappings/net/minecraft/network/NetworkState.mapping
+++ b/mappings/net/minecraft/network/NetworkState.mapping
@@ -26,6 +26,11 @@ CLASS net/minecraft/class_2539 net/minecraft/network/NetworkState
ARG 1 side
ARG 2 handler
METHOD method_22308 createPacketHandlerInitializer ()Lnet/minecraft/class_2539$class_4533;
+ METHOD method_39497 (Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;Ljava/lang/Class;Ljava/lang/Integer;)V
+ ARG 0 clazz
+ ARG 1 packetId
+ METHOD method_39498 getPacketIdToPacketMap (Lnet/minecraft/class_2598;)Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
+ ARG 1 side
CLASS class_4532 PacketHandler
FIELD field_20596 packetIds Lit/unimi/dsi/fastutil/objects/Object2IntMap;
FIELD field_20597 packetFactories Ljava/util/List;
diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping
index c75ad75135..69949994e2 100644
--- a/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping
+++ b/mappings/net/minecraft/predicate/entity/EntityPredicates.mapping
@@ -1,4 +1,5 @@
CLASS net/minecraft/class_1301 net/minecraft/predicate/entity/EntityPredicates
+ FIELD field_35589 CAN_COLLIDE Ljava/util/function/Predicate;
FIELD field_6152 VALID_INVENTORIES Ljava/util/function/Predicate;
COMMENT Tests if an entity has a valid inventory.
COMMENT
diff --git a/mappings/net/minecraft/server/command/JfrCommand.mapping b/mappings/net/minecraft/server/command/JfrCommand.mapping
index 1582d07444..e7cf2a4b67 100644
--- a/mappings/net/minecraft/server/command/JfrCommand.mapping
+++ b/mappings/net/minecraft/server/command/JfrCommand.mapping
@@ -15,3 +15,5 @@ CLASS net/minecraft/class_6607 net/minecraft/server/command/JfrCommand
ARG 0 source
METHOD method_38618 (Lnet/minecraft/class_2168;)Z
ARG 0 source
+ METHOD method_39499 (Ljava/io/File;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
+ ARG 1 style
diff --git a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping
index b0e1afeda0..62cd977b68 100644
--- a/mappings/net/minecraft/util/math/ChunkSectionPos.mapping
+++ b/mappings/net/minecraft/util/math/ChunkSectionPos.mapping
@@ -136,6 +136,20 @@ CLASS net/minecraft/class_4076 net/minecraft/util/math/ChunkSectionPos
ARG 0 chunk
METHOD method_33706 toLong (Lnet/minecraft/class_2338;)J
ARG 0 pos
+ METHOD method_39489 forEachChunkSectionAround (IIILit/unimi/dsi/fastutil/longs/LongConsumer;)V
+ COMMENT Performs an action for each chunk section enclosing a block position
+ COMMENT adjacent to {@code (x, y, z)}.
+ ARG 0 x
+ ARG 1 y
+ ARG 2 z
+ ARG 3 consumer
+ COMMENT the consumer that takes the chunk section position as a long
+ METHOD method_39490 forEachChunkSectionAround (JLit/unimi/dsi/fastutil/longs/LongConsumer;)V
+ ARG 0 pos
+ ARG 2 consumer
+ METHOD method_39491 forEachChunkSectionAround (Lnet/minecraft/class_2338;Lit/unimi/dsi/fastutil/longs/LongConsumer;)V
+ ARG 0 pos
+ ARG 1 consumer
CLASS 1
FIELD field_19263 iterator Lnet/minecraft/class_3980;
METHOD tryAdvance (Ljava/util/function/Consumer;)Z
diff --git a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping
index 987dca4632..af7e2ffa05 100644
--- a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping
+++ b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping
@@ -11,9 +11,13 @@ CLASS net/minecraft/class_6611 net/minecraft/util/profiling/jfr/FlightProfiler
ARG 2 world
ARG 3 targetStatus
METHOD method_38656 onPacketReceived (IILjava/net/SocketAddress;I)V
+ ARG 1 protocolId
+ ARG 2 packetId
ARG 3 remoteAddress
ARG 4 bytes
METHOD method_38657 onPacketSent (IILjava/net/SocketAddress;I)V
+ ARG 1 protocolId
+ ARG 2 packetId
ARG 3 remoteAddress
ARG 4 bytes
METHOD method_38658 isAvailable ()Z
diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping
index 71d57ed49a..d7acb00c88 100644
--- a/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping
+++ b/mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping
@@ -51,3 +51,5 @@ CLASS net/minecraft/class_6519 net/minecraft/util/profiling/jfr/JfrJsonReport
ARG 1 profile
METHOD method_38030 collectCpuPercentSection (Ljava/util/List;)Lcom/google/gson/JsonElement;
ARG 1 samples
+ METHOD method_38664 (Lnet/minecraft/class_6532;)D
+ ARG 0 sample
diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping
index 74eaf8f581..ae4f893419 100644
--- a/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping
+++ b/mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping
@@ -3,8 +3,8 @@ CLASS net/minecraft/class_6516 net/minecraft/util/profiling/jfr/JfrProfileRecord
FIELD field_34423 endTime Ljava/time/Instant;
FIELD field_34424 chunkGenerationSamples Ljava/util/List;
FIELD field_34425 cpuLoadSamples Ljava/util/List;
- FIELD field_34426 packetReadSamples Ljava/util/Map;
- FIELD field_34427 packetSentSamples Ljava/util/Map;
+ FIELD field_34426 receivedPacketsToCounter Ljava/util/Map;
+ FIELD field_34427 sentPacketsToCounter Ljava/util/Map;
FIELD field_34428 fileWriteSamples Ljava/util/List;
FIELD field_34429 fileReadSamples Ljava/util/List;
FIELD field_34430 gcCount I
@@ -26,3 +26,20 @@ CLASS net/minecraft/class_6516 net/minecraft/util/profiling/jfr/JfrProfileRecord
ARG 1 event
ARG 2 samples
ARG 3 bytesKey
+ METHOD method_39432 (Lnet/minecraft/class_6767$class_6769;)Lnet/minecraft/class_6516$class_6766;
+ ARG 0 packet
+ METHOD method_39433 createNetworkIoStatistics (Ljava/time/Duration;Ljava/util/Map;)Lnet/minecraft/class_6767;
+ ARG 0 duration
+ ARG 1 packetsToCounter
+ METHOD method_39434 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair;
+ ARG 0 entry
+ METHOD method_39435 addPacket (Ljdk/jfr/consumer/RecordedEvent;ILjava/util/Map;)V
+ ARG 1 event
+ ARG 2 bytes
+ ARG 3 packetsToCounter
+ CLASS class_6766 PacketCounter
+ FIELD field_35581 totalCount J
+ FIELD field_35582 totalBytes J
+ METHOD method_39436 toStatistics ()Lnet/minecraft/class_6767$class_6768;
+ METHOD method_39437 add (I)V
+ ARG 1 bytes
diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping
index 0015b3a40b..e655754f4d 100644
--- a/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping
+++ b/mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping
@@ -8,12 +8,18 @@ CLASS net/minecraft/class_6505 net/minecraft/util/profiling/jfr/JfrProfiler
FIELD field_34409 CONFIG_PATH Ljava/lang/String;
FIELD field_34410 DATE_TIME_FORMAT Ljava/time/format/DateTimeFormatter;
FIELD field_34411 currentRecording Ljdk/jfr/Recording;
+ FIELD field_35576 INSTANCE Lnet/minecraft/class_6505;
+ FIELD field_35577 tickTime F
+ FIELD field_35578 summaryRecorderByAddress Ljava/util/Map;
METHOD method_37982 (Lnet/minecraft/class_6506;Ljava/lang/String;Ljdk/jfr/Recording;)V
ARG 2 recording
METHOD method_37983 start (Ljava/io/Reader;Lnet/minecraft/class_6506;)Z
ARG 1 reader
ARG 2 instanceType
METHOD method_38660 addListener ()V
+ METHOD method_39428 getInstance ()Lnet/minecraft/class_6505;
+ METHOD method_39429 getOrCreateSummaryRecorder (Ljava/net/SocketAddress;)Lnet/minecraft/util/profiling/jfr/event/NetworkSummaryEvent$class_6779;
+ ARG 1 address
CLASS 1
FIELD field_34921 innerListener Lnet/minecraft/class_6507;
METHOD recordingStateChanged (Ljdk/jfr/Recording;)V
diff --git a/mappings/net/minecraft/util/profiling/jfr/event/NetworkSummaryEvent.mapping b/mappings/net/minecraft/util/profiling/jfr/event/NetworkSummaryEvent.mapping
new file mode 100644
index 0000000000..3b9cb126a5
--- /dev/null
+++ b/mappings/net/minecraft/util/profiling/jfr/event/NetworkSummaryEvent.mapping
@@ -0,0 +1,22 @@
+CLASS net/minecraft/util/profiling/jfr/event/NetworkSummaryEvent
+ METHOD