Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix some incorrect mappings #296

Draft
wants to merge 5 commits into
base: versions/1.21.x
Choose a base branch
from
Draft

fix some incorrect mappings #296

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e55125
fix docs of ServerPlayer's closeContainer and co
BasiqueEvangelist Aug 5, 2024
324bc00
rename bypassHiddenChat to overlay
BasiqueEvangelist Aug 5, 2024
fe47f15
fix bad Container mappings
BasiqueEvangelist Aug 5, 2024
0253d0a
Apply suggestions from code review
BasiqueEvangelist Aug 8, 2024
fbc5077
Merge branch 'versions/1.21.x' into remove-bad-mappings
sciwhiz12 Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions data/net/minecraft/server/level/ServerPlayer.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CLASS net/minecraft/server/level/ServerPlayer
ARG 3 gameProfile
ARG 4 clientInformation
METHOD acceptsSystemMessages (Z)Z
ARG 1 bypassHiddenChat
ARG 1 overlay
METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V
ARG 1 compound
METHOD attack (Lnet/minecraft/world/entity/Entity;)V
Expand Down Expand Up @@ -51,7 +51,7 @@ CLASS net/minecraft/server/level/ServerPlayer
ARG 3 dy
ARG 5 dz
METHOD closeContainer ()V
COMMENT Sets the current crafting inventory back to the 2x2 square.
COMMENT Closes the container the player currently has open.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as below

METHOD completeUsingItem ()V
COMMENT Used for when item use count runs out, ie: eating completed
METHOD copyRespawnPosition (Lnet/minecraft/server/level/ServerPlayer;)V
Expand All @@ -74,7 +74,7 @@ CLASS net/minecraft/server/level/ServerPlayer
ARG 5 movementZ
ARG 7 onGround
METHOD doCloseContainer ()V
COMMENT Closes the container the player currently has open.
COMMENT Invoked when the container the player has opened is to be closed, either by a call to {@link #closeContainer} or a packet.
BasiqueEvangelist marked this conversation as resolved.
Show resolved Hide resolved
METHOD drop (Lnet/minecraft/world/item/ItemStack;ZZ)Lnet/minecraft/world/entity/item/ItemEntity;
ARG 1 droppedItem
ARG 2 dropAround
Expand Down Expand Up @@ -195,7 +195,7 @@ CLASS net/minecraft/server/level/ServerPlayer
ARG 1 serverStatus
METHOD sendSystemMessage (Lnet/minecraft/network/chat/Component;Z)V
ARG 1 component
ARG 2 bypassHiddenChat
ARG 2 overlay
METHOD setCamera (Lnet/minecraft/world/entity/Entity;)V
ARG 1 entityToSpectate
METHOD setChatSession (Lnet/minecraft/network/chat/RemoteChatSession;)V
Expand Down
4 changes: 2 additions & 2 deletions data/net/minecraft/server/players/PlayerList.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ CLASS net/minecraft/server/players/PlayerList
METHOD broadcastSystemMessage (Lnet/minecraft/network/chat/Component;Ljava/util/function/Function;Z)V
ARG 1 serverMessage
ARG 2 playerMessageFactory
ARG 3 bypassHiddenChat
ARG 3 overlay
METHOD broadcastSystemMessage (Lnet/minecraft/network/chat/Component;Z)V
ARG 1 message
ARG 2 bypassHiddenChat
ARG 2 overlay
METHOD broadcastSystemToAllExceptTeam (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/network/chat/Component;)V
ARG 1 player
ARG 2 message
Expand Down
5 changes: 2 additions & 3 deletions data/net/minecraft/world/Container.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ CLASS net/minecraft/world/Container
COMMENT Returns the stack in the given slot.
ARG 1 slot
METHOD getMaxStackSize ()I
COMMENT Returns the maximum stack size for an inventory slot. Seems to always be 64, possibly will be extended.
COMMENT Returns the maximum stack size for an inventory slot.
METHOD getMaxStackSize (Lnet/minecraft/world/item/ItemStack;)I
ARG 1 stack
METHOD hasAnyMatching (Ljava/util/function/Predicate;)Z
Expand All @@ -38,15 +38,14 @@ CLASS net/minecraft/world/Container
COMMENT Removes a stack from the given slot and returns it.
ARG 1 slot
METHOD setChanged ()V
COMMENT For block entities, ensures the chunk containing the block entity is saved to disk later - the game won't think it hasn't changed and skip it.
COMMENT Called whenever this container is changed.
BasiqueEvangelist marked this conversation as resolved.
Show resolved Hide resolved
METHOD setItem (ILnet/minecraft/world/item/ItemStack;)V
COMMENT Sets the given item stack to the specified slot in the inventory (can be crafting or armor sections).
ARG 1 slot
ARG 2 stack
METHOD startOpen (Lnet/minecraft/world/entity/player/Player;)V
ARG 1 player
METHOD stillValid (Lnet/minecraft/world/entity/player/Player;)Z
COMMENT Don't rename this method to canInteractWith due to conflicts with Container
ARG 1 player
METHOD stillValidBlockEntity (Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/world/entity/player/Player;)Z
ARG 0 blockEntity
Expand Down