mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

More 21w44a stuff (#2811) 

* More 21w44a stuff

* Apply suggestions from code review

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

* Update mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

* Update mappings/net/minecraft/util/math/ChunkSectionPos.mapping

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

* Rename some stuff

* Apply suggestions from code review

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>

Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
This commit is contained in:
apple502j 2021-11-09 08:34:33 +09:00 committed by GitHub
parent 28da2e9f1e
commit 119815df5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 147 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mappings/net/minecraft/SharedConstants.mapping
View File

@ -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

1
mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping
View File

@ -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;

1
mappings/net/minecraft/entity/Entity.mapping
View File

@ -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

3
mappings/net/minecraft/entity/passive/AnimalEntity.mapping
View File

@ -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

6
mappings/net/minecraft/entity/passive/FoxEntity.mapping
View File

@ -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;

6
mappings/net/minecraft/entity/passive/WolfEntity.mapping
View File

@ -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 <p>

5
mappings/net/minecraft/network/NetworkState.mapping
View File

@ -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;

1
mappings/net/minecraft/predicate/entity/EntityPredicates.mapping
View File

@ -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

2
mappings/net/minecraft/server/command/JfrCommand.mapping
View File

@ -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

14
mappings/net/minecraft/util/math/ChunkSectionPos.mapping
View File

@ -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

4
mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping
View File

@ -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

2
mappings/net/minecraft/util/profiling/jfr/JfrJsonReport.mapping
View File

@ -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

21
mappings/net/minecraft/util/profiling/jfr/JfrProfileRecorder.mapping
View File

@ -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

6
mappings/net/minecraft/util/profiling/jfr/JfrProfiler.mapping
View File

@ -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

22
mappings/net/minecraft/util/profiling/jfr/event/NetworkSummaryEvent.mapping Normal file
View File

@ -0,0 +1,22 @@
CLASS net/minecraft/util/profiling/jfr/event/NetworkSummaryEvent
METHOD <init> (Ljava/lang/String;)V
ARG 1 remoteAddress
CLASS class_6778 Names
FIELD field_35642 REMOTE_ADDRESS Ljava/lang/String;
FIELD field_35643 SENT_BYTES Ljava/lang/String;
FIELD field_35644 RECEIVED_BYTES Ljava/lang/String;
FIELD field_35645 SENT_PACKETS Ljava/lang/String;
FIELD field_35646 RECEIVED_PACKETS Ljava/lang/String;
CLASS class_6779 Recorder
FIELD field_35647 sentBytes Ljava/util/concurrent/atomic/AtomicLong;
FIELD field_35648 sentPackets Ljava/util/concurrent/atomic/AtomicInteger;
FIELD field_35649 receivedBytes Ljava/util/concurrent/atomic/AtomicLong;
FIELD field_35650 receivedPackets Ljava/util/concurrent/atomic/AtomicInteger;
FIELD field_35651 event Lnet/minecraft/util/profiling/jfr/event/NetworkSummaryEvent;
METHOD <init> (Ljava/lang/String;)V
ARG 1 remoteAddress
METHOD method_39494 commit ()V
METHOD method_39495 addSentPacket (I)V
ARG 1 bytes
METHOD method_39496 addReceivedPacket (I)V
ARG 1 bytes

4
mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping
View File

@ -1,7 +1,11 @@
CLASS net/minecraft/class_6509 net/minecraft/util/profiling/jfr/event/PacketEvent
METHOD <init> (IILjava/net/SocketAddress;I)V
ARG 1 protocolId
ARG 2 packetId
ARG 3 remoteAddress
ARG 4 bytes
CLASS class_6510 Names
FIELD field_34419 REMOTE_ADDRESS Ljava/lang/String;
FIELD field_34421 BYTES Ljava/lang/String;
FIELD field_35579 PROTOCOL_ID Ljava/lang/String;
FIELD field_35580 PACKET_ID Ljava/lang/String;

26
mappings/net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics.mapping Normal file
View File

@ -0,0 +1,26 @@
CLASS net/minecraft/class_6767 net/minecraft/util/profiling/jfr/sample/NetworkIoStatistics
FIELD field_35583 combinedStatistics Lnet/minecraft/class_6767$class_6768;
FIELD field_35584 topContributors Ljava/util/List;
FIELD field_35585 duration Ljava/time/Duration;
METHOD <init> (Ljava/time/Duration;Ljava/util/List;)V
ARG 1 duration
ARG 2 packetsToStatistics
METHOD method_39438 getCountPerSecond ()D
METHOD method_39439 getBytesPerSecond ()D
METHOD method_39440 getTotalCount ()J
METHOD method_39441 getTotalSize ()J
METHOD method_39442 getTopContributors ()Ljava/util/List;
CLASS class_6768 PacketStatistics
FIELD field_35586 COMPARATOR Ljava/util/Comparator;
METHOD method_39444 add (Lnet/minecraft/class_6767$class_6768;)Lnet/minecraft/class_6767$class_6768;
ARG 1 statistics
CLASS class_6769 Packet
FIELD comp_259 side Lnet/minecraft/class_2598;
FIELD field_35587 PACKET_TO_NAME Ljava/util/Map;
METHOD comp_259 side ()Lnet/minecraft/class_2598;
METHOD method_39445 getName ()Ljava/lang/String;
METHOD method_39446 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2598;Lnet/minecraft/class_2539;Ljava/lang/Integer;Ljava/lang/Class;)V
ARG 3 packetId
ARG 4 clazz
METHOD method_39447 fromEvent (Ljdk/jfr/consumer/RecordedEvent;)Lnet/minecraft/class_6767$class_6769;
ARG 0 event

3
mappings/net/minecraft/world/CollisionView.mapping
View File

@ -19,6 +19,9 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView
ARG 4 x
ARG 6 y
ARG 8 z
METHOD method_39455 getWorldBorderCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Lnet/minecraft/class_265;
ARG 1 entity
ARG 2 box
METHOD method_8587 isSpaceEmpty (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z
ARG 1 entity
ARG 2 box

3
mappings/net/minecraft/world/border/WorldBorder.mapping
View File

@ -100,6 +100,9 @@ CLASS net/minecraft/class_2784 net/minecraft/world/border/WorldBorder
ARG 3 z
METHOD method_35318 removeListener (Lnet/minecraft/class_2780;)V
ARG 1 listener
METHOD method_39459 canCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z
ARG 1 entity
ARG 2 box
CLASS class_2785 Area
METHOD method_11984 getSize ()D
METHOD method_11985 getBoundSouth ()D

16
mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping
View File

@ -6,12 +6,26 @@ CLASS net/minecraft/class_5727 net/minecraft/world/gen/feature/LargeDripstoneFea
ARG 3 scale
ARG 4 bluntness
ARG 5 heightScale
ARG 6 maxY
METHOD method_35360 testGeneration (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_5721$class_5723;Lnet/minecraft/class_5727$class_5729;)V
ARG 1 world
ARG 2 pos
ARG 3 surface
ARG 4 wind
CLASS class_5728 DripstoneGenerator
FIELD field_28206 pos Lnet/minecraft/class_2338;
FIELD field_28207 isStalagmite Z
FIELD field_28208 scale I
FIELD field_28209 bluntness D
FIELD field_28210 heightScale D
FIELD field_35634 maxY I
METHOD <init> (Lnet/minecraft/class_2338;ZIDDI)V
ARG 1 pos
ARG 2 isStalagmite
ARG 3 scale
ARG 4 bluntness
ARG 6 heightScale
ARG 8 maxY
METHOD method_33017 getBaseScale ()I
METHOD method_33018 scale (F)I
ARG 1 height
@ -24,6 +38,8 @@ CLASS net/minecraft/class_5727 net/minecraft/world/gen/feature/LargeDripstoneFea
ARG 3 wind
METHOD method_33025 generateWind (Lnet/minecraft/class_5732;)Z
ARG 1 config
METHOD method_35361 getBottomY ()I
METHOD method_35362 getTopY ()I
CLASS class_5729 WindModifier
FIELD field_28211 y I
FIELD field_28212 wind Lnet/minecraft/class_243;

2
mappings/net/minecraft/world/gen/feature/util/DripstoneHelper.mapping
View File

@ -10,12 +10,14 @@ CLASS net/minecraft/class_5726 net/minecraft/world/gen/feature/util/DripstoneHel
METHOD method_33007 (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;)V
ARG 3 state
METHOD method_33008 generateDripstoneBlock (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z
ARG 0 world
ARG 1 pos
METHOD method_33009 canGenerateBase (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;I)Z
ARG 0 world
ARG 1 pos
ARG 2 height
METHOD method_33010 generatePointedDripstone (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;IZ)V
ARG 0 world
ARG 1 pos
ARG 2 direction
ARG 3 height