More 1.17-pre1 stuff (#2501)

* More 1.17-pre1 stuff

* Rename to entireStack

* Use revision instead of nonce

* Document read/writeOptional

* Update mappings/net/minecraft/screen/ScreenHandler.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Update mappings/net/minecraft/client/realms/gui/screen/RealmsSubscriptionInfoScreen.mapping

Co-authored-by: liach <7806504+liach@users.noreply.github.com>

* Rename getMaxY to getHeight

Co-authored-by: liach <7806504+liach@users.noreply.github.com>
This commit is contained in:
apple502j 2021-06-26 20:53:03 +09:00 committed by GitHub
parent 6473b3525a
commit 117c139ec9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 106 additions and 2 deletions

View File

@ -2,3 +2,5 @@ CLASS net/minecraft/class_5546 net/minecraft/block/CauldronBlock
FIELD field_34027 FILL_WITH_RAIN_CHANCE F
FIELD field_34028 FILL_WITH_SNOW_CHANCE F
METHOD method_31636 canFillWithPrecipitation (Lnet/minecraft/class_1937;Lnet/minecraft/class_1959$class_1963;)Z
ARG 0 world
ARG 1 precipitation

View File

@ -5,6 +5,7 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity
FIELD field_12088 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService;
FIELD field_12089 userCache Lnet/minecraft/class_3312;
FIELD field_31363 SKULL_OWNER_KEY Ljava/lang/String;
FIELD field_34029 executor Ljava/util/concurrent/Executor;
METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
ARG 1 pos
ARG 2 state
@ -26,5 +27,9 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity
ARG 1 pos
ARG 2 state
ARG 3 blockEntity
METHOD method_37248 (Ljava/util/function/Consumer;Lcom/mojang/authlib/GameProfile;)V
ARG 1 profile
METHOD method_37249 (Lcom/mojang/authlib/GameProfile;)V
ARG 1 owner
METHOD method_37428 setExecutor (Ljava/util/concurrent/Executor;)V
ARG 0 executor

View File

@ -14,7 +14,11 @@ CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/CreditsScreen
FIELD field_32273 CENTERED_LINE_PREFIX Ljava/lang/String;
FIELD field_33954 baseSpeed F
FIELD field_33955 SEPARATOR_LINE Lnet/minecraft/class_2561;
FIELD field_33956 MAX_WIDTH I
FIELD field_33957 SPACE_BAR_SPEED_MULTIPLIER F
FIELD field_34010 spaceKeyPressed Z
FIELD field_34011 pressedCtrlKeys Lit/unimi/dsi/fastutil/ints/IntSet;
FIELD field_34012 CTRL_KEY_SPEED_MULTIPLIER F
METHOD <init> (ZLjava/lang/Runnable;)V
ARG 1 endCredits
ARG 2 finishAction
@ -25,3 +29,4 @@ CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/CreditsScreen
METHOD method_37305 addText (Ljava/lang/String;)V
ARG 1 text
METHOD method_37306 addEmptyLine ()V
METHOD method_37369 getSpeed ()F

View File

@ -98,3 +98,4 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity
METHOD method_3151 getMountJumpStrength ()F
METHOD method_33689 init ()V
METHOD method_7290 dropSelectedItem (Z)Z
ARG 1 entireStack

View File

@ -62,6 +62,7 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti
ARG 2 slotId
ARG 3 button
ARG 4 actionType
ARG 5 player
METHOD method_2907 setGameMode (Lnet/minecraft/class_1934;)V
ARG 1 gameMode
METHOD method_2908 hasStatusBars ()Z

View File

@ -16,7 +16,8 @@ CLASS net/minecraft/class_4425 net/minecraft/client/realms/gui/screen/RealmsSubs
FIELD field_26520 MONTHS_TEXT Lnet/minecraft/class_2561;
FIELD field_26521 DAY_TEXT Lnet/minecraft/class_2561;
FIELD field_26522 DAYS_TEXT Lnet/minecraft/class_2561;
FIELD field_34033 UNKOWN_TEXT Lnet/minecraft/class_2561;
FIELD field_32127 EXTEND_JAVA_REALMS_URL Ljava/lang/String;
FIELD field_34033 UNKNOWN_TEXT Lnet/minecraft/class_2561;
METHOD <init> (Lnet/minecraft/class_437;Lnet/minecraft/class_4877;Lnet/minecraft/class_437;)V
ARG 1 parent
ARG 2 serverData
@ -26,9 +27,12 @@ CLASS net/minecraft/class_4425 net/minecraft/client/realms/gui/screen/RealmsSubs
METHOD method_21500 getSubscription (J)V
ARG 1 worldId
METHOD method_21502 localPresentation (J)Lnet/minecraft/class_2561;
ARG 0 time
METHOD method_25266 (Lnet/minecraft/class_4185;)V
ARG 1 button
METHOD method_25268 (Lnet/minecraft/class_4185;)V
ARG 1 button
METHOD method_25270 (Lnet/minecraft/class_4185;)V
ARG 1 button
METHOD method_25271 onDeletionConfirmed (Z)V
ARG 1 delete

View File

@ -10,6 +10,9 @@ CLASS net/minecraft/class_6338 net/minecraft/entity/ai/brain/task/RamImpactTask
METHOD <init> (Ljava/util/function/Function;Lnet/minecraft/class_4051;FLjava/util/function/ToDoubleFunction;Ljava/util/function/Function;)V
ARG 1 cooldownRangeFactory
ARG 2 targetPredicate
ARG 3 speed
ARG 4 strengthMultiplierFactory
ARG 5 soundFactory
METHOD method_36279 finishRam (Lnet/minecraft/class_3218;Lnet/minecraft/class_1314;)V
ARG 1 world
ARG 2 entity

View File

@ -66,6 +66,7 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity
METHOD <init> ([Lnet/minecraft/class_5762$class_5767;)V
ARG 1 variants
METHOD method_33232 getRandomVariant (Ljava/util/Random;)Lnet/minecraft/class_5762$class_5767;
ARG 1 random
CLASS class_5764 AxolotlLookControl
METHOD <init> (Lnet/minecraft/class_5762;Lnet/minecraft/class_5762;I)V
ARG 2 axolotl
@ -93,6 +94,8 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity
METHOD method_33236 getRandom (Ljava/util/Random;Z)Lnet/minecraft/class_5762$class_5767;
ARG 0 random
ARG 1 includeUnnatural
METHOD method_33237 (ZLnet/minecraft/class_5762$class_5767;)Z
ARG 1 variant
METHOD method_33238 getName ()Ljava/lang/String;
METHOD method_33240 getRandomNatural (Ljava/util/Random;)Lnet/minecraft/class_5762$class_5767;
ARG 0 random

View File

@ -74,6 +74,9 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
COMMENT <tr>
COMMENT <td>{@link BitSet}</td><td>{@link #readBitSet()}</td><td>{@link #writeBitSet(BitSet)}</td>
COMMENT </tr>
COMMENT <tr>
COMMENT <td>{@link Optional}</td><td>{@link #readOptional(Function)}</td><td>{@link #writeOptional(Optional, BiConsumer)}</td>
COMMENT </tr>
COMMENT </table></div>
COMMENT
COMMENT <p>All {@code read} and {@code write} methods throw {@link
@ -683,3 +686,19 @@ CLASS net/minecraft/class_2540 net/minecraft/network/PacketByteBuf
COMMENT
COMMENT @return the read chunk position
COMMENT @see #writeChunkPos(ChunkPos)
METHOD method_37435 writeOptional (Ljava/util/Optional;Ljava/util/function/BiConsumer;)V
COMMENT Writes an optional value to this buf. An optional value is represented by
COMMENT a boolean indicating if the value is present, followed by the value only if
COMMENT the value is present.
COMMENT
COMMENT @see #readOptional(Function)
ARG 1 value
ARG 2 serializer
METHOD method_37436 readOptional (Ljava/util/function/Function;)Ljava/util/Optional;
COMMENT Reads an optional value from this buf. An optional value is represented by
COMMENT a boolean indicating if the value is present, followed by the value only if
COMMENT the value is present.
COMMENT
COMMENT @return the read optional value
COMMENT @see #writeOptional(Optional, BiConsumer)
ARG 1 parser

View File

@ -1,5 +1,7 @@
CLASS net/minecraft/class_2820 net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket
FIELD field_26897 slot I
FIELD field_34039 MAX_TITLE_LENGTH I
FIELD field_34040 MAX_PAGE_LENGTH I
FIELD field_34041 pages Ljava/util/List;
FIELD field_34042 title Ljava/util/Optional;
METHOD <init> (ILjava/util/List;Ljava/util/Optional;)V
@ -9,5 +11,15 @@ CLASS net/minecraft/class_2820 net/minecraft/network/packet/c2s/play/BookUpdateC
METHOD <init> (Lnet/minecraft/class_2540;)V
ARG 1 buf
METHOD method_12235 getSlot ()I
METHOD method_37441 (Lnet/minecraft/class_2540;Ljava/lang/String;)V
ARG 0 buf
ARG 1 title
METHOD method_37442 getPages ()Ljava/util/List;
METHOD method_37443 (Lnet/minecraft/class_2540;)Ljava/lang/String;
ARG 0 buf
METHOD method_37444 (Lnet/minecraft/class_2540;Ljava/lang/String;)V
ARG 0 buf
ARG 1 page
METHOD method_37445 getTitle ()Ljava/util/Optional;
METHOD method_37446 (Lnet/minecraft/class_2540;)Ljava/lang/String;
ARG 0 buf

View File

@ -5,8 +5,10 @@ CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2
FIELD field_12818 slot I
FIELD field_12819 syncId I
FIELD field_29540 modifiedStacks Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
FIELD field_34037 revision I
METHOD <init> (IIIILnet/minecraft/class_1713;Lnet/minecraft/class_1799;Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;)V
ARG 1 syncId
ARG 2 revision
ARG 3 slot
ARG 4 button
ARG 5 actionType
@ -20,3 +22,4 @@ CLASS net/minecraft/class_2813 net/minecraft/network/packet/c2s/play/ClickSlotC2
METHOD method_12194 getSyncId ()I
METHOD method_12195 getActionType ()Lnet/minecraft/class_1713;
METHOD method_34678 getModifiedStacks ()Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
METHOD method_37440 getRevision ()I

View File

@ -4,8 +4,16 @@ CLASS net/minecraft/class_2649 net/minecraft/network/packet/s2c/play/InventoryS2
FIELD field_12146 syncId I
COMMENT The {@link net.minecraft.screen.ScreenHandler#syncId} of a screen handler.
FIELD field_12147 contents Ljava/util/List;
FIELD field_34034 revision I
FIELD field_34035 cursorStack Lnet/minecraft/class_1799;
METHOD <init> (IILnet/minecraft/class_2371;Lnet/minecraft/class_1799;)V
ARG 1 syncId
ARG 2 revision
ARG 3 contents
ARG 4 cursorStack
METHOD <init> (Lnet/minecraft/class_2540;)V
ARG 1 buf
METHOD method_11440 getSyncId ()I
METHOD method_11441 getContents ()Ljava/util/List;
METHOD method_37437 getCursorStack ()Lnet/minecraft/class_1799;
METHOD method_37438 getRevision ()I

View File

@ -4,8 +4,10 @@ CLASS net/minecraft/class_2653 net/minecraft/network/packet/s2c/play/ScreenHandl
FIELD field_12153 stack Lnet/minecraft/class_1799;
FIELD field_33324 UPDATE_CURSOR_SYNC_ID I
FIELD field_33325 UPDATE_PLAYER_INVENTORY_SYNC_ID I
FIELD field_34036 revision I
METHOD <init> (IIILnet/minecraft/class_1799;)V
ARG 1 syncId
ARG 2 revision
ARG 3 slot
ARG 4 stack
METHOD <init> (Lnet/minecraft/class_2540;)V
@ -13,3 +15,4 @@ CLASS net/minecraft/class_2653 net/minecraft/network/packet/s2c/play/ScreenHandl
METHOD method_11449 getItemStack ()Lnet/minecraft/class_1799;
METHOD method_11450 getSlot ()I
METHOD method_11452 getSyncId ()I
METHOD method_37439 getRevision ()I

View File

@ -10,6 +10,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
FIELD field_30730 EMPTY_SPACE_SLOT_INDEX I
COMMENT A special slot index value ({@value}) indicating that the player has clicked outside the main panel
COMMENT of a screen. Used for dropping the cursor stack.
FIELD field_34024 revision I
FIELD field_7757 quickCraftSlots Ljava/util/Set;
FIELD field_7759 quickCraftStage I
FIELD field_7761 slots Lnet/minecraft/class_2371;
@ -81,10 +82,15 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
METHOD method_34715 checkPropertyUpdates (II)V
ARG 1 id
ARG 2 value
METHOD method_37418 getSlotIndex (Lnet/minecraft/class_1263;I)Ljava/util/OptionalInt;
ARG 1 inventory
ARG 2 index
METHOD method_37419 notifyPropertyUpdate (II)V
ARG 1 index
ARG 2 value
METHOD method_37420 updateToClient ()V
METHOD method_37421 getRevision ()I
METHOD method_37422 nextRevision ()I
METHOD method_7591 packQuickCraftData (II)I
ARG 0 quickCraftStage
ARG 1 buttonId
@ -102,6 +108,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
METHOD method_7594 unpackQuickCraftStage (I)I
ARG 0 quickCraftData
METHOD method_7595 close (Lnet/minecraft/class_1657;)V
ARG 1 player
METHOD method_7596 addListener (Lnet/minecraft/class_1712;)V
ARG 1 listener
METHOD method_7597 canUse (Lnet/minecraft/class_1657;)Z
@ -130,6 +137,9 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
METHOD method_7609 onContentChanged (Lnet/minecraft/class_1263;)V
ARG 1 inventory
METHOD method_7610 updateSlotStacks (ILjava/util/List;Lnet/minecraft/class_1799;)V
ARG 1 revision
ARG 2 stacks
ARG 3 cursorStack
METHOD method_7611 getSlot (I)Lnet/minecraft/class_1735;
ARG 1 index
METHOD method_7613 canInsertIntoSlot (Lnet/minecraft/class_1799;Lnet/minecraft/class_1735;)Z
@ -151,6 +161,8 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler
ARG 0 inventory
METHOD method_7619 setStackInSlot (IILnet/minecraft/class_1799;)V
ARG 1 slot
ARG 2 revision
ARG 3 stack
METHOD method_7620 unpackQuickCraftButton (I)I
ARG 0 quickCraftData
METHOD method_7621 addSlot (Lnet/minecraft/class_1735;)Lnet/minecraft/class_1735;

View File

@ -197,6 +197,8 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity
ARG 1 player
METHOD method_34225 onSpawn ()V
METHOD method_34879 areClientChatColorsEnabled ()Z
METHOD method_37413 dropSelectedItem (Z)Z
ARG 1 entireStack
METHOD method_7336 changeGameMode (Lnet/minecraft/class_1934;)Z
ARG 1 gameMode
CLASS 1

View File

@ -8,6 +8,8 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache
FIELD field_25724 accessCount Ljava/util/concurrent/atomic/AtomicLong;
FIELD field_25805 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_29788 MAX_SAVED_ENTRIES I
FIELD field_33860 pendingRequests Ljava/util/Map;
FIELD field_33861 executor Ljava/util/concurrent/Executor;
METHOD <init> (Lcom/mojang/authlib/GameProfileRepository;Ljava/io/File;)V
ARG 1 profileRepository
ARG 2 cacheFile
@ -41,6 +43,20 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache
ARG 2 json
METHOD method_30169 incrementAndGetAccessCount ()J
METHOD method_30170 getDateFormat ()Ljava/text/DateFormat;
METHOD method_37155 (Ljava/lang/String;Lcom/mojang/authlib/GameProfile;Ljava/lang/Throwable;)V
ARG 2 profile
ARG 3 throwable
METHOD method_37156 findByNameAsync (Ljava/lang/String;Ljava/util/function/Consumer;)V
ARG 1 username
ARG 2 consumer
METHOD method_37157 setExecutor (Ljava/util/concurrent/Executor;)V
ARG 1 executor
METHOD method_37158 (Ljava/util/function/Consumer;Lcom/mojang/authlib/GameProfile;Ljava/lang/Throwable;)V
ARG 1 profile
ARG 2 throwable
METHOD method_37160 (Ljava/util/function/Consumer;Lcom/mojang/authlib/GameProfile;Ljava/lang/Throwable;)V
ARG 1 profile
ARG 2 throwable
CLASS 1
METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V
ARG 1 profile

View File

@ -1,3 +1,8 @@
CLASS net/minecraft/class_5868 net/minecraft/world/gen/HeightContext
METHOD method_30458 getMaxY ()I
FIELD field_34030 minY I
FIELD field_34031 height I
METHOD <init> (Lnet/minecraft/class_2794;Lnet/minecraft/class_5539;)V
ARG 1 generator
ARG 2 world
METHOD method_30458 getHeight ()I
METHOD method_30462 getMinY ()I