mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-08-14 23:57:35 +00:00
Small tweaks: record formatting/javadocs
This commit is contained in:
parent
68516a8b0b
commit
02d6473dc5
2 changed files with 24 additions and 6 deletions
|
@ -27,9 +27,14 @@ package org.geysermc.geyser.api.pack;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
public record ResourcePackCDNEntry(
|
/**
|
||||||
String url,
|
* Represents a CDN entry for a resource pack.
|
||||||
UUID uuid
|
* The URL must be a direct download link to a Bedrock edition resource pack.
|
||||||
) {
|
* The UUID must be the UUID of the resource pack.
|
||||||
|
*
|
||||||
|
* @param url URL from which the pack should be downloaded
|
||||||
|
* @param uuid UUID of the pack
|
||||||
|
*/
|
||||||
|
public record ResourcePackCDNEntry(String url, UUID uuid) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,20 @@ import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
|
||||||
import org.cloudburstmc.protocol.bedrock.data.ExperimentData;
|
import org.cloudburstmc.protocol.bedrock.data.ExperimentData;
|
||||||
import org.cloudburstmc.protocol.bedrock.data.PacketCompressionAlgorithm;
|
import org.cloudburstmc.protocol.bedrock.data.PacketCompressionAlgorithm;
|
||||||
import org.cloudburstmc.protocol.bedrock.data.ResourcePackType;
|
import org.cloudburstmc.protocol.bedrock.data.ResourcePackType;
|
||||||
import org.cloudburstmc.protocol.bedrock.packet.*;
|
import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
|
||||||
|
import org.cloudburstmc.protocol.bedrock.packet.LoginPacket;
|
||||||
|
import org.cloudburstmc.protocol.bedrock.packet.ModalFormResponsePacket;
|
||||||
|
import org.cloudburstmc.protocol.bedrock.packet.MovePlayerPacket;
|
||||||
|
import org.cloudburstmc.protocol.bedrock.packet.NetworkSettingsPacket;
|
||||||
|
import org.cloudburstmc.protocol.bedrock.packet.PlayStatusPacket;
|
||||||
|
import org.cloudburstmc.protocol.bedrock.packet.RequestNetworkSettingsPacket;
|
||||||
|
import org.cloudburstmc.protocol.bedrock.packet.ResourcePackChunkDataPacket;
|
||||||
|
import org.cloudburstmc.protocol.bedrock.packet.ResourcePackChunkRequestPacket;
|
||||||
|
import org.cloudburstmc.protocol.bedrock.packet.ResourcePackClientResponsePacket;
|
||||||
|
import org.cloudburstmc.protocol.bedrock.packet.ResourcePackDataInfoPacket;
|
||||||
|
import org.cloudburstmc.protocol.bedrock.packet.ResourcePackStackPacket;
|
||||||
|
import org.cloudburstmc.protocol.bedrock.packet.ResourcePacksInfoPacket;
|
||||||
|
import org.cloudburstmc.protocol.bedrock.packet.SetTitlePacket;
|
||||||
import org.cloudburstmc.protocol.common.PacketSignal;
|
import org.cloudburstmc.protocol.common.PacketSignal;
|
||||||
import org.geysermc.geyser.Constants;
|
import org.geysermc.geyser.Constants;
|
||||||
import org.geysermc.geyser.GeyserImpl;
|
import org.geysermc.geyser.GeyserImpl;
|
||||||
|
@ -182,10 +195,10 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
|
||||||
// Add CDN entries if the client supports it
|
// Add CDN entries if the client supports it
|
||||||
if (!GameProtocol.isPre1_20_30(session)) {
|
if (!GameProtocol.isPre1_20_30(session)) {
|
||||||
for (ResourcePackCDNEntry entry : this.resourcePackLoadEvent.cdnEntries()) {
|
for (ResourcePackCDNEntry entry : this.resourcePackLoadEvent.cdnEntries()) {
|
||||||
GeyserImpl.getInstance().getLogger().error("Adding CDN entry: " + entry.url() + " for " + entry.uuid());
|
|
||||||
resourcePacksInfo.getCDNEntries().add(new ResourcePacksInfoPacket.CDNEntry(entry.uuid().toString(), entry.url()));
|
resourcePacksInfo.getCDNEntries().add(new ResourcePacksInfoPacket.CDNEntry(entry.uuid().toString(), entry.url()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
resourcePacksInfo.setForcedToAccept(GeyserImpl.getInstance().getConfig().isForceResourcePacks());
|
resourcePacksInfo.setForcedToAccept(GeyserImpl.getInstance().getConfig().isForceResourcePacks());
|
||||||
session.sendUpstreamPacket(resourcePacksInfo);
|
session.sendUpstreamPacket(resourcePacksInfo);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue