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.

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

Update to 1.21.30 #5041

Merged
merged 10 commits into from
Sep 17, 2024
Merged

Update to 1.21.30 #5041

merged 10 commits into from
Sep 17, 2024

Conversation

romanalexander
Copy link
Contributor

@romanalexander romanalexander commented Sep 15, 2024

This is preliminary work to get 1.21.30 working.

Outstanding TODOs

@romanalexander
Copy link
Contributor Author

👍 Updated. I'll take some time to edit InventoryContentPacket & InventorySlotPacket with the correct fields. Also the PR is open for any collaborators to make edits

@romanalexander
Copy link
Contributor Author

romanalexander commented Sep 16, 2024

I did some sniffing. It looks like the vanilla client/BDS always sends ANVIL_INPUT back for containerNameData at the moment

[13:04:09:960] [SERVER BOUND] - ItemStackRequestPacket(requests=[ItemStackRequest(requestId=-27, actions=[PlaceAction(count=64, source=ItemStackRequestSlotData(container=HOTBAR, slot=5, stackNetworkId=6, containerName=FullContainerName(container=HOTBAR, dynamicId=null)), destination=ItemStackRequestSlotData(container=FURNACE_INGREDIENT, slot=0, stackNetworkId=0, containerName=FullContainerName(container=FURNACE_INGREDIENT, dynamicId=null)))], filterStrings=[], textProcessingEventOrigin=null)])
[13:04:10:006] [CLIENT BOUND] - InventorySlotPacket(containerId=4, slot=0, item=BaseItemData(definition=SimpleItemDefinition(identifier=minecraft:gold_ore, runtimeId=14, componentBased=false), damage=0, count=64, tag=null, canPlace=[], canBreak=[], blockingTicks=0, blockDefinition=UnknownDefinition[runtimeId=2144082742], usingNetId=true, netId=6), containerNameData=FullContainerName(container=ANVIL_INPUT, dynamicId=null), dynamicContainerSize=0)
[13:04:10:006] [CLIENT BOUND] - ItemStackResponsePacket(entries=[ItemStackResponse(result=OK, requestId=-27, containers=[ItemStackResponseContainer(container=HOTBAR, items=[ItemStackResponseSlot(slot=5, hotbarSlot=5, count=0, stackNetworkId=0, customName=, durabilityCorrection=0)], containerName=FullContainerName(container=HOTBAR, dynamicId=null)), ItemStackResponseContainer(container=FURNACE_INGREDIENT, items=[ItemStackResponseSlot(slot=0, hotbarSlot=0, count=64, stackNetworkId=6, customName=, durabilityCorrection=0)], containerName=FullContainerName(container=FURNACE_INGREDIENT, dynamicId=null))])])
[13:04:10:273] [SERVER BOUND] - ItemStackRequestPacket(requests=[ItemStackRequest(requestId=-29, actions=[PlaceAction(count=64, source=ItemStackRequestSlotData(container=HOTBAR, slot=4, stackNetworkId=5, containerName=FullContainerName(container=HOTBAR, dynamicId=null)), destination=ItemStackRequestSlotData(container=FURNACE_FUEL, slot=1, stackNetworkId=0, containerName=FullContainerName(container=FURNACE_FUEL, dynamicId=null)))], filterStrings=[], textProcessingEventOrigin=null)])
[13:04:10:318] [CLIENT BOUND] - InventorySlotPacket(containerId=4, slot=1, item=BaseItemData(definition=SimpleItemDefinition(identifier=minecraft:coal_block, runtimeId=173, componentBased=false), damage=0, count=64, tag=null, canPlace=[], canBreak=[], blockingTicks=0, blockDefinition=UnknownDefinition[runtimeId=2126838376], usingNetId=true, netId=5), containerNameData=FullContainerName(container=ANVIL_INPUT, dynamicId=null), dynamicContainerSize=0)
[13:04:10:318] [CLIENT BOUND] - ItemStackResponsePacket(entries=[ItemStackResponse(result=OK, requestId=-29, containers=[ItemStackResponseContainer(container=HOTBAR, items=[ItemStackResponseSlot(slot=4, hotbarSlot=4, count=0, stackNetworkId=0, customName=, durabilityCorrection=0)], containerName=FullContainerName(container=HOTBAR, dynamicId=null)), ItemStackResponseContainer(container=FURNACE_FUEL, items=[ItemStackResponseSlot(slot=1, hotbarSlot=1, count=64, stackNetworkId=5, customName=, durabilityCorrection=0)], containerName=FullContainerName(container=FURNACE_FUEL, dynamicId=null))])])
[13:04:10:363] [CLIENT BOUND] - InventorySlotPacket(containerId=4, slot=1, item=BaseItemData(definition=SimpleItemDefinition(identifier=minecraft:coal_block, runtimeId=173, componentBased=false), damage=0, count=63, tag=null, canPlace=[], canBreak=[], blockingTicks=0, blockDefinition=UnknownDefinition[runtimeId=2126838376], usingNetId=true, netId=5), containerNameData=FullContainerName(container=ANVIL_INPUT, dynamicId=null), dynamicContainerSize=0)
[13:04:08:508] [CLIENT BOUND] - ContainerOpenPacket(id=4, type=FURNACE, blockPosition=(-4, -60, 2), uniqueEntityId=-1)
[13:04:08:508] [CLIENT BOUND] - InventoryContentPacket(contents=[BaseItemData(definition=SimpleItemDefinition(identifier=minecraft:air, runtimeId=0, componentBased=false), damage=0, count=0, tag=null, canPlace=[], canBreak=[], blockingTicks=0, blockDefinition=null, usingNetId=false, netId=0), BaseItemData(definition=SimpleItemDefinition(identifier=minecraft:air, runtimeId=0, componentBased=false), damage=0, count=0, tag=null, canPlace=[], canBreak=[], blockingTicks=0, blockDefinition=null, usingNetId=false, netId=0), BaseItemData(definition=SimpleItemDefinition(identifier=minecraft:air, runtimeId=0, componentBased=false), damage=0, count=0, tag=null, canPlace=[], canBreak=[], blockingTicks=0, blockDefinition=null, usingNetId=false, netId=0)], containerId=4, containerNameData=FullContainerName(container=ANVIL_INPUT, dynamicId=null), dynamicContainerSize=0)

@WesleyVanNeck
Copy link
Contributor

WesleyVanNeck commented Sep 16, 2024

Is this for the beta or release

@Camotoy
Copy link
Member

Camotoy commented Sep 16, 2024

Release (but it can be tested with beta 1.21.30.25).

@Camotoy Camotoy marked this pull request as ready for review September 17, 2024 04:34
Comment on lines 77 to 81
.build()));
SUPPORTED_BEDROCK_CODECS.add(CodecProcessor.processCodec(Bedrock_v712.CODEC.toBuilder()
.minecraftVersion("1.21.20 - 1.20.23")
.build()));
SUPPORTED_BEDROCK_CODECS.add(DEFAULT_BEDROCK_CODEC);
Copy link
Member

Choose a reason for hiding this comment

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

typo on the higher bound.

also i'm not sure if we should start using range strings—the Version command would produce weird output if a range string was used for the oldest or newest codec we use.

there is also this to take into consideration: #4979. i'll try to retest it today and make sure its ready for merge.

Copy link
Member

@Konicai Konicai left a comment

Choose a reason for hiding this comment

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

Is this PR currently suppose to be targeting a specific mappings version?

I ask this because there is conversion code being applied to both v712 and v729 blocks.

And there is conversion being applied to v712 items, with v729 having no conversion, but I haven't seen any work on v729 mappings?

@Camotoy Camotoy dismissed Konicai’s stale review September 17, 2024 15:48

Getting this out for merge

@Camotoy Camotoy merged commit 11f76b6 into GeyserMC:master Sep 17, 2024
2 checks passed
@romanalexander romanalexander deleted the features/1.21.30 branch September 17, 2024 15:52
XingLingQAQ pushed a commit to XingLingQAQ/Geyser that referenced this pull request Sep 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants