From 8bbd52191fc1ed31ef3c9c898f4e8ceb4f95f19d Mon Sep 17 00:00:00 2001 From: Kei-Luna Date: Mon, 27 May 2024 14:31:57 +0900 Subject: [PATCH] Fix WearFlycloak --- .../net/proto/AvatarDataNotifyOuterClass.java | 52 -- .../net/proto/AvatarFlycloakChangeNotify.java | 618 ++++++++++++++++++ .../AvatarFlycloakChangeNotifyOuterClass.java | 46 +- .../AvatarGainFlycloakNotifyOuterClass.java | 28 +- .../AvatarWearFlycloakReqOuterClass.java | 130 ++-- .../AvatarWearFlycloakRspOuterClass.java | 178 ++--- .../grasscutter/net/packet/PacketOpcodes.java | 8 +- 7 files changed, 813 insertions(+), 247 deletions(-) create mode 100644 src/generated/main/java/emu/grasscutter/net/proto/AvatarFlycloakChangeNotify.java diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarDataNotifyOuterClass.java index 163c114a..676ad27b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarDataNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarDataNotifyOuterClass.java @@ -19,28 +19,16 @@ public interface AvatarDataNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * 
-     *sus
-     *
- * * repeated uint32 owned_flycloak_list = 13; * @return A list containing the ownedFlycloakList. */ java.util.List getOwnedFlycloakListList(); /** - * 
-     *sus
-     *
- * * repeated uint32 owned_flycloak_list = 13; * @return The count of ownedFlycloakList. */ int getOwnedFlycloakListCount(); /** - * 
-     *sus
-     *
- * * repeated uint32 owned_flycloak_list = 13; * @param index The index of the element to return. * @return The ownedFlycloakList at the given index. @@ -371,10 +359,6 @@ protected com.google.protobuf.MapField internalGetMapField( public static final int OWNED_FLYCLOAK_LIST_FIELD_NUMBER = 13; private com.google.protobuf.Internal.IntList ownedFlycloakList_; /** - * 
-     *sus
-     *
- * * repeated uint32 owned_flycloak_list = 13; * @return A list containing the ownedFlycloakList. */ @@ -384,10 +368,6 @@ protected com.google.protobuf.MapField internalGetMapField( return ownedFlycloakList_; } /** - * 
-     *sus
-     *
- * * repeated uint32 owned_flycloak_list = 13; * @return The count of ownedFlycloakList. */ @@ -395,10 +375,6 @@ public int getOwnedFlycloakListCount() { return ownedFlycloakList_.size(); } /** - * 
-     *sus
-     *
- * * repeated uint32 owned_flycloak_list = 13; * @param index The index of the element to return. * @return The ownedFlycloakList at the given index. @@ -1218,10 +1194,6 @@ private void ensureOwnedFlycloakListIsMutable() { } } /** - * 
-       *sus
-       *
- * * repeated uint32 owned_flycloak_list = 13; * @return A list containing the ownedFlycloakList. */ @@ -1231,10 +1203,6 @@ private void ensureOwnedFlycloakListIsMutable() { java.util.Collections.unmodifiableList(ownedFlycloakList_) : ownedFlycloakList_; } /** - * 
-       *sus
-       *
- * * repeated uint32 owned_flycloak_list = 13; * @return The count of ownedFlycloakList. */ @@ -1242,10 +1210,6 @@ public int getOwnedFlycloakListCount() { return ownedFlycloakList_.size(); } /** - * 
-       *sus
-       *
- * * repeated uint32 owned_flycloak_list = 13; * @param index The index of the element to return. * @return The ownedFlycloakList at the given index. @@ -1254,10 +1218,6 @@ public int getOwnedFlycloakList(int index) { return ownedFlycloakList_.getInt(index); } /** - * 
-       *sus
-       *
- * * repeated uint32 owned_flycloak_list = 13; * @param index The index to set the value at. * @param value The ownedFlycloakList to set. @@ -1271,10 +1231,6 @@ public Builder setOwnedFlycloakList( return this; } /** - * 
-       *sus
-       *
- * * repeated uint32 owned_flycloak_list = 13; * @param value The ownedFlycloakList to add. * @return This builder for chaining. @@ -1286,10 +1242,6 @@ public Builder addOwnedFlycloakList(int value) { return this; } /** - * 
-       *sus
-       *
- * * repeated uint32 owned_flycloak_list = 13; * @param values The ownedFlycloakList to add. * @return This builder for chaining. @@ -1303,10 +1255,6 @@ public Builder addAllOwnedFlycloakList( return this; } /** - * 
-       *sus
-       *
- * * repeated uint32 owned_flycloak_list = 13; * @return This builder for chaining. */ diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFlycloakChangeNotify.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFlycloakChangeNotify.java new file mode 100644 index 00000000..16028024 --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFlycloakChangeNotify.java @@ -0,0 +1,618 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: AvatarFlycloakChangeNotify.proto + +package emu.grasscutter.net.proto; + +public final class AvatarFlycloakChangeNotify { + private AvatarFlycloakChangeNotify() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface NIPBDNMIFPHOrBuilder extends + // @@protoc_insertion_point(interface_extends:NIPBDNMIFPH) + com.google.protobuf.MessageOrBuilder { + + /** + * uint64 avatar_guid = 7; + * @return The avatarGuid. + */ + long getAvatarGuid(); + + /** + * uint32 flycloak_id = 8; + * @return The flycloakId. + */ + int getFlycloakId(); + } + /** + * 
+   * 4.6.0
+   * CmdId: 21936
+   *
+ * + * Protobuf type {@code NIPBDNMIFPH} + */ + public static final class NIPBDNMIFPH extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:NIPBDNMIFPH) + NIPBDNMIFPHOrBuilder { + private static final long serialVersionUID = 0L; + // Use NIPBDNMIFPH.newBuilder() to construct. + private NIPBDNMIFPH(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private NIPBDNMIFPH() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new NIPBDNMIFPH(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private NIPBDNMIFPH( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 56: { + + avatarGuid_ = input.readUInt64(); + break; + } + case 64: { + + flycloakId_ = input.readUInt32(); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.internal_static_NIPBDNMIFPH_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.internal_static_NIPBDNMIFPH_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH.class, emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH.Builder.class); + } + + public static final int AVATAR_GUID_FIELD_NUMBER = 7; + private long avatarGuid_; + /** + * uint64 avatar_guid = 7; + * @return The avatarGuid. + */ + @java.lang.Override + public long getAvatarGuid() { + return avatarGuid_; + } + + public static final int FLYCLOAK_ID_FIELD_NUMBER = 8; + private int flycloakId_; + /** + * uint32 flycloak_id = 8; + * @return The flycloakId. + */ + @java.lang.Override + public int getFlycloakId() { + return flycloakId_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (avatarGuid_ != 0L) { + output.writeUInt64(7, avatarGuid_); + } + if (flycloakId_ != 0) { + output.writeUInt32(8, flycloakId_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (avatarGuid_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeUInt64Size(7, avatarGuid_); + } + if (flycloakId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(8, flycloakId_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH other = (emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH) obj; + + if (getAvatarGuid() + != other.getAvatarGuid()) return false; + if (getFlycloakId() + != other.getFlycloakId()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getAvatarGuid()); + hash = (37 * hash) + FLYCLOAK_ID_FIELD_NUMBER; + hash = (53 * hash) + getFlycloakId(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+     * 4.6.0
+     * CmdId: 21936
+     *
+ * + * Protobuf type {@code NIPBDNMIFPH} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:NIPBDNMIFPH) + emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPHOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.internal_static_NIPBDNMIFPH_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.internal_static_NIPBDNMIFPH_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH.class, emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + avatarGuid_ = 0L; + + flycloakId_ = 0; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.internal_static_NIPBDNMIFPH_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH getDefaultInstanceForType() { + return emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH build() { + emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH buildPartial() { + emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH result = new emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH(this); + result.avatarGuid_ = avatarGuid_; + result.flycloakId_ = flycloakId_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH) { + return mergeFrom((emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH other) { + if (other == emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH.getDefaultInstance()) return this; + if (other.getAvatarGuid() != 0L) { + setAvatarGuid(other.getAvatarGuid()); + } + if (other.getFlycloakId() != 0) { + setFlycloakId(other.getFlycloakId()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private long avatarGuid_ ; + /** + * uint64 avatar_guid = 7; + * @return The avatarGuid. + */ + @java.lang.Override + public long getAvatarGuid() { + return avatarGuid_; + } + /** + * uint64 avatar_guid = 7; + * @param value The avatarGuid to set. + * @return This builder for chaining. + */ + public Builder setAvatarGuid(long value) { + + avatarGuid_ = value; + onChanged(); + return this; + } + /** + * uint64 avatar_guid = 7; + * @return This builder for chaining. + */ + public Builder clearAvatarGuid() { + + avatarGuid_ = 0L; + onChanged(); + return this; + } + + private int flycloakId_ ; + /** + * uint32 flycloak_id = 8; + * @return The flycloakId. + */ + @java.lang.Override + public int getFlycloakId() { + return flycloakId_; + } + /** + * uint32 flycloak_id = 8; + * @param value The flycloakId to set. + * @return This builder for chaining. + */ + public Builder setFlycloakId(int value) { + + flycloakId_ = value; + onChanged(); + return this; + } + /** + * uint32 flycloak_id = 8; + * @return This builder for chaining. + */ + public Builder clearFlycloakId() { + + flycloakId_ = 0; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:NIPBDNMIFPH) + } + + // @@protoc_insertion_point(class_scope:NIPBDNMIFPH) + private static final emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH(); + } + + public static emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public NIPBDNMIFPH parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new NIPBDNMIFPH(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public emu.grasscutter.net.proto.AvatarFlycloakChangeNotify.NIPBDNMIFPH getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_NIPBDNMIFPH_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_NIPBDNMIFPH_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n AvatarFlycloakChangeNotify.proto\"7\n\013NI" + + "PBDNMIFPH\022\023\n\013avatar_guid\030\007 \001(\004\022\023\n\013flyclo" + + "ak_id\030\010 \001(\rB\033\n\031emu.grasscutter.net.proto" + + "b\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_NIPBDNMIFPH_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_NIPBDNMIFPH_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_NIPBDNMIFPH_descriptor, + new java.lang.String[] { "AvatarGuid", "FlycloakId", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFlycloakChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFlycloakChangeNotifyOuterClass.java index 30a8da43..de134184 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFlycloakChangeNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFlycloakChangeNotifyOuterClass.java @@ -19,21 +19,21 @@ public interface AvatarFlycloakChangeNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 flycloak_id = 2; + * uint32 flycloak_id = 3; * @return The flycloakId. */ int getFlycloakId(); /** - * uint64 avatar_guid = 3; + * uint64 avatar_guid = 10; * @return The avatarGuid. */ long getAvatarGuid(); } /** * 
-   * CmdId: 23578
-   * Obf: GHNNAHDIIKE
+   * 4.6.0
+   * CmdId: 2952
    *
* * Protobuf type {@code AvatarFlycloakChangeNotify} @@ -80,12 +80,12 @@ private AvatarFlycloakChangeNotify( case 0: done = true; break; - case 16: { + case 24: { flycloakId_ = input.readUInt32(); break; } - case 24: { + case 80: { avatarGuid_ = input.readUInt64(); break; @@ -122,10 +122,10 @@ private AvatarFlycloakChangeNotify( emu.grasscutter.net.proto.AvatarFlycloakChangeNotifyOuterClass.AvatarFlycloakChangeNotify.class, emu.grasscutter.net.proto.AvatarFlycloakChangeNotifyOuterClass.AvatarFlycloakChangeNotify.Builder.class); } - public static final int FLYCLOAK_ID_FIELD_NUMBER = 2; + public static final int FLYCLOAK_ID_FIELD_NUMBER = 3; private int flycloakId_; /** - * uint32 flycloak_id = 2; + * uint32 flycloak_id = 3; * @return The flycloakId. */ @java.lang.Override @@ -133,10 +133,10 @@ public int getFlycloakId() { return flycloakId_; } - public static final int AVATAR_GUID_FIELD_NUMBER = 3; + public static final int AVATAR_GUID_FIELD_NUMBER = 10; private long avatarGuid_; /** - * uint64 avatar_guid = 3; + * uint64 avatar_guid = 10; * @return The avatarGuid. */ @java.lang.Override @@ -159,10 +159,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (flycloakId_ != 0) { - output.writeUInt32(2, flycloakId_); + output.writeUInt32(3, flycloakId_); } if (avatarGuid_ != 0L) { - output.writeUInt64(3, avatarGuid_); + output.writeUInt64(10, avatarGuid_); } unknownFields.writeTo(output); } @@ -175,11 +175,11 @@ public int getSerializedSize() { size = 0; if (flycloakId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, flycloakId_); + .computeUInt32Size(3, flycloakId_); } if (avatarGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(3, avatarGuid_); + .computeUInt64Size(10, avatarGuid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -313,8 +313,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 23578
-     * Obf: GHNNAHDIIKE
+     * 4.6.0
+     * CmdId: 2952
      *
* * Protobuf type {@code AvatarFlycloakChangeNotify} @@ -471,7 +471,7 @@ public Builder mergeFrom( private int flycloakId_ ; /** - * uint32 flycloak_id = 2; + * uint32 flycloak_id = 3; * @return The flycloakId. */ @java.lang.Override @@ -479,7 +479,7 @@ public int getFlycloakId() { return flycloakId_; } /** - * uint32 flycloak_id = 2; + * uint32 flycloak_id = 3; * @param value The flycloakId to set. * @return This builder for chaining. */ @@ -490,7 +490,7 @@ public Builder setFlycloakId(int value) { return this; } /** - * uint32 flycloak_id = 2; + * uint32 flycloak_id = 3; * @return This builder for chaining. */ public Builder clearFlycloakId() { @@ -502,7 +502,7 @@ public Builder clearFlycloakId() { private long avatarGuid_ ; /** - * uint64 avatar_guid = 3; + * uint64 avatar_guid = 10; * @return The avatarGuid. */ @java.lang.Override @@ -510,7 +510,7 @@ public long getAvatarGuid() { return avatarGuid_; } /** - * uint64 avatar_guid = 3; + * uint64 avatar_guid = 10; * @param value The avatarGuid to set. * @return This builder for chaining. */ @@ -521,7 +521,7 @@ public Builder setAvatarGuid(long value) { return this; } /** - * uint64 avatar_guid = 3; + * uint64 avatar_guid = 10; * @return This builder for chaining. */ public Builder clearAvatarGuid() { @@ -599,7 +599,7 @@ public emu.grasscutter.net.proto.AvatarFlycloakChangeNotifyOuterClass.AvatarFlyc java.lang.String[] descriptorData = { "\n AvatarFlycloakChangeNotify.proto\"F\n\032Av" + "atarFlycloakChangeNotify\022\023\n\013flycloak_id\030" + - "\002 \001(\r\022\023\n\013avatar_guid\030\003 \001(\004B\033\n\031emu.grassc" + + "\003 \001(\r\022\023\n\013avatar_guid\030\n \001(\004B\033\n\031emu.grassc" + "utter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarGainFlycloakNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarGainFlycloakNotifyOuterClass.java index db722e75..fe49bdba 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarGainFlycloakNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarGainFlycloakNotifyOuterClass.java @@ -19,15 +19,15 @@ public interface AvatarGainFlycloakNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 flycloak_id = 6; + * uint32 flycloak_id = 4; * @return The flycloakId. */ int getFlycloakId(); } /** * 
-   * CmdId: 29528
-   * Obf: LOFNLHIBOBB
+   * 4.6.0
+   * CmdId: 22682
    *
* * Protobuf type {@code AvatarGainFlycloakNotify} @@ -74,7 +74,7 @@ private AvatarGainFlycloakNotify( case 0: done = true; break; - case 48: { + case 32: { flycloakId_ = input.readUInt32(); break; @@ -111,10 +111,10 @@ private AvatarGainFlycloakNotify( emu.grasscutter.net.proto.AvatarGainFlycloakNotifyOuterClass.AvatarGainFlycloakNotify.class, emu.grasscutter.net.proto.AvatarGainFlycloakNotifyOuterClass.AvatarGainFlycloakNotify.Builder.class); } - public static final int FLYCLOAK_ID_FIELD_NUMBER = 6; + public static final int FLYCLOAK_ID_FIELD_NUMBER = 4; private int flycloakId_; /** - * uint32 flycloak_id = 6; + * uint32 flycloak_id = 4; * @return The flycloakId. */ @java.lang.Override @@ -137,7 +137,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (flycloakId_ != 0) { - output.writeUInt32(6, flycloakId_); + output.writeUInt32(4, flycloakId_); } unknownFields.writeTo(output); } @@ -150,7 +150,7 @@ public int getSerializedSize() { size = 0; if (flycloakId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, flycloakId_); + .computeUInt32Size(4, flycloakId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +279,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 29528
-     * Obf: LOFNLHIBOBB
+     * 4.6.0
+     * CmdId: 22682
      *
* * Protobuf type {@code AvatarGainFlycloakNotify} @@ -431,7 +431,7 @@ public Builder mergeFrom( private int flycloakId_ ; /** - * uint32 flycloak_id = 6; + * uint32 flycloak_id = 4; * @return The flycloakId. */ @java.lang.Override @@ -439,7 +439,7 @@ public int getFlycloakId() { return flycloakId_; } /** - * uint32 flycloak_id = 6; + * uint32 flycloak_id = 4; * @param value The flycloakId to set. * @return This builder for chaining. */ @@ -450,7 +450,7 @@ public Builder setFlycloakId(int value) { return this; } /** - * uint32 flycloak_id = 6; + * uint32 flycloak_id = 4; * @return This builder for chaining. */ public Builder clearFlycloakId() { @@ -527,7 +527,7 @@ public emu.grasscutter.net.proto.AvatarGainFlycloakNotifyOuterClass.AvatarGainFl static { java.lang.String[] descriptorData = { "\n\036AvatarGainFlycloakNotify.proto\"/\n\030Avat" + - "arGainFlycloakNotify\022\023\n\013flycloak_id\030\006 \001(" + + "arGainFlycloakNotify\022\023\n\013flycloak_id\030\004 \001(" + "\rB\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakReqOuterClass.java index aa659e7b..adb9c8e0 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakReqOuterClass.java @@ -19,21 +19,21 @@ public interface AvatarWearFlycloakReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 flycloak_id = 7; - * @return The flycloakId. + * uint64 avatar_guid = 7; + * @return The avatarGuid. */ - int getFlycloakId(); + long getAvatarGuid(); /** - * uint64 avatar_guid = 1; - * @return The avatarGuid. + * uint32 flycloak_id = 8; + * @return The flycloakId. */ - long getAvatarGuid(); + int getFlycloakId(); } /** * 
-   * CmdId: 824
-   * Obf: LNDKKJJEFBJ
+   * 4.6.0
+   * CmdId: 21936
    *
* * Protobuf type {@code AvatarWearFlycloakReq} @@ -80,12 +80,12 @@ private AvatarWearFlycloakReq( case 0: done = true; break; - case 8: { + case 56: { avatarGuid_ = input.readUInt64(); break; } - case 56: { + case 64: { flycloakId_ = input.readUInt32(); break; @@ -122,26 +122,26 @@ private AvatarWearFlycloakReq( emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq.class, emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq.Builder.class); } - public static final int FLYCLOAK_ID_FIELD_NUMBER = 7; - private int flycloakId_; + public static final int AVATAR_GUID_FIELD_NUMBER = 7; + private long avatarGuid_; /** - * uint32 flycloak_id = 7; - * @return The flycloakId. + * uint64 avatar_guid = 7; + * @return The avatarGuid. */ @java.lang.Override - public int getFlycloakId() { - return flycloakId_; + public long getAvatarGuid() { + return avatarGuid_; } - public static final int AVATAR_GUID_FIELD_NUMBER = 1; - private long avatarGuid_; + public static final int FLYCLOAK_ID_FIELD_NUMBER = 8; + private int flycloakId_; /** - * uint64 avatar_guid = 1; - * @return The avatarGuid. + * uint32 flycloak_id = 8; + * @return The flycloakId. */ @java.lang.Override - public long getAvatarGuid() { - return avatarGuid_; + public int getFlycloakId() { + return flycloakId_; } private byte memoizedIsInitialized = -1; @@ -159,10 +159,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (avatarGuid_ != 0L) { - output.writeUInt64(1, avatarGuid_); + output.writeUInt64(7, avatarGuid_); } if (flycloakId_ != 0) { - output.writeUInt32(7, flycloakId_); + output.writeUInt32(8, flycloakId_); } unknownFields.writeTo(output); } @@ -175,11 +175,11 @@ public int getSerializedSize() { size = 0; if (avatarGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(1, avatarGuid_); + .computeUInt64Size(7, avatarGuid_); } if (flycloakId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, flycloakId_); + .computeUInt32Size(8, flycloakId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +196,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq other = (emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq) obj; - if (getFlycloakId() - != other.getFlycloakId()) return false; if (getAvatarGuid() != other.getAvatarGuid()) return false; + if (getFlycloakId() + != other.getFlycloakId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -211,11 +211,11 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + FLYCLOAK_ID_FIELD_NUMBER; - hash = (53 * hash) + getFlycloakId(); hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getAvatarGuid()); + hash = (37 * hash) + FLYCLOAK_ID_FIELD_NUMBER; + hash = (53 * hash) + getFlycloakId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -313,8 +313,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 824
-     * Obf: LNDKKJJEFBJ
+     * 4.6.0
+     * CmdId: 21936
      *
* * Protobuf type {@code AvatarWearFlycloakReq} @@ -354,10 +354,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - flycloakId_ = 0; - avatarGuid_ = 0L; + flycloakId_ = 0; + return this; } @@ -384,8 +384,8 @@ public emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycl @java.lang.Override public emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq buildPartial() { emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq result = new emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq(this); - result.flycloakId_ = flycloakId_; result.avatarGuid_ = avatarGuid_; + result.flycloakId_ = flycloakId_; onBuilt(); return result; } @@ -434,12 +434,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq other) { if (other == emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq.getDefaultInstance()) return this; - if (other.getFlycloakId() != 0) { - setFlycloakId(other.getFlycloakId()); - } if (other.getAvatarGuid() != 0L) { setAvatarGuid(other.getAvatarGuid()); } + if (other.getFlycloakId() != 0) { + setFlycloakId(other.getFlycloakId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -469,64 +469,64 @@ public Builder mergeFrom( return this; } - private int flycloakId_ ; + private long avatarGuid_ ; /** - * uint32 flycloak_id = 7; - * @return The flycloakId. + * uint64 avatar_guid = 7; + * @return The avatarGuid. */ @java.lang.Override - public int getFlycloakId() { - return flycloakId_; + public long getAvatarGuid() { + return avatarGuid_; } /** - * uint32 flycloak_id = 7; - * @param value The flycloakId to set. + * uint64 avatar_guid = 7; + * @param value The avatarGuid to set. * @return This builder for chaining. */ - public Builder setFlycloakId(int value) { + public Builder setAvatarGuid(long value) { - flycloakId_ = value; + avatarGuid_ = value; onChanged(); return this; } /** - * uint32 flycloak_id = 7; + * uint64 avatar_guid = 7; * @return This builder for chaining. */ - public Builder clearFlycloakId() { + public Builder clearAvatarGuid() { - flycloakId_ = 0; + avatarGuid_ = 0L; onChanged(); return this; } - private long avatarGuid_ ; + private int flycloakId_ ; /** - * uint64 avatar_guid = 1; - * @return The avatarGuid. + * uint32 flycloak_id = 8; + * @return The flycloakId. */ @java.lang.Override - public long getAvatarGuid() { - return avatarGuid_; + public int getFlycloakId() { + return flycloakId_; } /** - * uint64 avatar_guid = 1; - * @param value The avatarGuid to set. + * uint32 flycloak_id = 8; + * @param value The flycloakId to set. * @return This builder for chaining. */ - public Builder setAvatarGuid(long value) { + public Builder setFlycloakId(int value) { - avatarGuid_ = value; + flycloakId_ = value; onChanged(); return this; } /** - * uint64 avatar_guid = 1; + * uint32 flycloak_id = 8; * @return This builder for chaining. */ - public Builder clearAvatarGuid() { + public Builder clearFlycloakId() { - avatarGuid_ = 0L; + flycloakId_ = 0; onChanged(); return this; } @@ -598,8 +598,8 @@ public emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycl static { java.lang.String[] descriptorData = { "\n\033AvatarWearFlycloakReq.proto\"A\n\025AvatarW" + - "earFlycloakReq\022\023\n\013flycloak_id\030\007 \001(\r\022\023\n\013a" + - "vatar_guid\030\001 \001(\004B\033\n\031emu.grasscutter.net." + + "earFlycloakReq\022\023\n\013avatar_guid\030\007 \001(\004\022\023\n\013f" + + "lycloak_id\030\010 \001(\rB\033\n\031emu.grasscutter.net." + "protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -611,7 +611,7 @@ public emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycl internal_static_AvatarWearFlycloakReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AvatarWearFlycloakReq_descriptor, - new java.lang.String[] { "FlycloakId", "AvatarGuid", }); + new java.lang.String[] { "AvatarGuid", "FlycloakId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakRspOuterClass.java index 2cb87604..ff9c0179 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakRspOuterClass.java @@ -19,27 +19,27 @@ public interface AvatarWearFlycloakRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 10; + * uint64 avatar_guid = 3; + * @return The avatarGuid. + */ + long getAvatarGuid(); + + /** + * int32 retcode = 4; * @return The retcode. */ int getRetcode(); /** - * uint32 flycloak_id = 6; + * uint32 flycloak_id = 11; * @return The flycloakId. */ int getFlycloakId(); - - /** - * uint64 avatar_guid = 3; - * @return The avatarGuid. - */ - long getAvatarGuid(); } /** * 
-   * CmdId: 21633
-   * Obf: BCLNBCGCHKJ
+   * 4.6.0
+   * CmdId: 924
    *
* * Protobuf type {@code AvatarWearFlycloakRsp} @@ -91,14 +91,14 @@ private AvatarWearFlycloakRsp( avatarGuid_ = input.readUInt64(); break; } - case 48: { + case 32: { - flycloakId_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } - case 80: { + case 88: { - retcode_ = input.readInt32(); + flycloakId_ = input.readUInt32(); break; } default: { @@ -133,10 +133,21 @@ private AvatarWearFlycloakRsp( emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp.class, emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp.Builder.class); } - public static final int RETCODE_FIELD_NUMBER = 10; + public static final int AVATAR_GUID_FIELD_NUMBER = 3; + private long avatarGuid_; + /** + * uint64 avatar_guid = 3; + * @return The avatarGuid. + */ + @java.lang.Override + public long getAvatarGuid() { + return avatarGuid_; + } + + public static final int RETCODE_FIELD_NUMBER = 4; private int retcode_; /** - * int32 retcode = 10; + * int32 retcode = 4; * @return The retcode. */ @java.lang.Override @@ -144,10 +155,10 @@ public int getRetcode() { return retcode_; } - public static final int FLYCLOAK_ID_FIELD_NUMBER = 6; + public static final int FLYCLOAK_ID_FIELD_NUMBER = 11; private int flycloakId_; /** - * uint32 flycloak_id = 6; + * uint32 flycloak_id = 11; * @return The flycloakId. */ @java.lang.Override @@ -155,17 +166,6 @@ public int getFlycloakId() { return flycloakId_; } - public static final int AVATAR_GUID_FIELD_NUMBER = 3; - private long avatarGuid_; - /** - * uint64 avatar_guid = 3; - * @return The avatarGuid. - */ - @java.lang.Override - public long getAvatarGuid() { - return avatarGuid_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -183,11 +183,11 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (avatarGuid_ != 0L) { output.writeUInt64(3, avatarGuid_); } - if (flycloakId_ != 0) { - output.writeUInt32(6, flycloakId_); - } if (retcode_ != 0) { - output.writeInt32(10, retcode_); + output.writeInt32(4, retcode_); + } + if (flycloakId_ != 0) { + output.writeUInt32(11, flycloakId_); } unknownFields.writeTo(output); } @@ -202,13 +202,13 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt64Size(3, avatarGuid_); } - if (flycloakId_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, flycloakId_); + .computeInt32Size(4, retcode_); } - if (retcode_ != 0) { + if (flycloakId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(10, retcode_); + .computeUInt32Size(11, flycloakId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,12 +225,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp other = (emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp) obj; + if (getAvatarGuid() + != other.getAvatarGuid()) return false; if (getRetcode() != other.getRetcode()) return false; if (getFlycloakId() != other.getFlycloakId()) return false; - if (getAvatarGuid() - != other.getAvatarGuid()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -242,13 +242,13 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getAvatarGuid()); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); hash = (37 * hash) + FLYCLOAK_ID_FIELD_NUMBER; hash = (53 * hash) + getFlycloakId(); - hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getAvatarGuid()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -346,8 +346,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 21633
-     * Obf: BCLNBCGCHKJ
+     * 4.6.0
+     * CmdId: 924
      *
* * Protobuf type {@code AvatarWearFlycloakRsp} @@ -387,12 +387,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + avatarGuid_ = 0L; + retcode_ = 0; flycloakId_ = 0; - avatarGuid_ = 0L; - return this; } @@ -419,9 +419,9 @@ public emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycl @java.lang.Override public emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp buildPartial() { emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp result = new emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp(this); + result.avatarGuid_ = avatarGuid_; result.retcode_ = retcode_; result.flycloakId_ = flycloakId_; - result.avatarGuid_ = avatarGuid_; onBuilt(); return result; } @@ -470,15 +470,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp other) { if (other == emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp.getDefaultInstance()) return this; + if (other.getAvatarGuid() != 0L) { + setAvatarGuid(other.getAvatarGuid()); + } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } if (other.getFlycloakId() != 0) { setFlycloakId(other.getFlycloakId()); } - if (other.getAvatarGuid() != 0L) { - setAvatarGuid(other.getAvatarGuid()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -508,95 +508,95 @@ public Builder mergeFrom( return this; } - private int retcode_ ; + private long avatarGuid_ ; /** - * int32 retcode = 10; - * @return The retcode. + * uint64 avatar_guid = 3; + * @return The avatarGuid. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public long getAvatarGuid() { + return avatarGuid_; } /** - * int32 retcode = 10; - * @param value The retcode to set. + * uint64 avatar_guid = 3; + * @param value The avatarGuid to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setAvatarGuid(long value) { - retcode_ = value; + avatarGuid_ = value; onChanged(); return this; } /** - * int32 retcode = 10; + * uint64 avatar_guid = 3; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearAvatarGuid() { - retcode_ = 0; + avatarGuid_ = 0L; onChanged(); return this; } - private int flycloakId_ ; + private int retcode_ ; /** - * uint32 flycloak_id = 6; - * @return The flycloakId. + * int32 retcode = 4; + * @return The retcode. */ @java.lang.Override - public int getFlycloakId() { - return flycloakId_; + public int getRetcode() { + return retcode_; } /** - * uint32 flycloak_id = 6; - * @param value The flycloakId to set. + * int32 retcode = 4; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setFlycloakId(int value) { + public Builder setRetcode(int value) { - flycloakId_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 flycloak_id = 6; + * int32 retcode = 4; * @return This builder for chaining. */ - public Builder clearFlycloakId() { + public Builder clearRetcode() { - flycloakId_ = 0; + retcode_ = 0; onChanged(); return this; } - private long avatarGuid_ ; + private int flycloakId_ ; /** - * uint64 avatar_guid = 3; - * @return The avatarGuid. + * uint32 flycloak_id = 11; + * @return The flycloakId. */ @java.lang.Override - public long getAvatarGuid() { - return avatarGuid_; + public int getFlycloakId() { + return flycloakId_; } /** - * uint64 avatar_guid = 3; - * @param value The avatarGuid to set. + * uint32 flycloak_id = 11; + * @param value The flycloakId to set. * @return This builder for chaining. */ - public Builder setAvatarGuid(long value) { + public Builder setFlycloakId(int value) { - avatarGuid_ = value; + flycloakId_ = value; onChanged(); return this; } /** - * uint64 avatar_guid = 3; + * uint32 flycloak_id = 11; * @return This builder for chaining. */ - public Builder clearAvatarGuid() { + public Builder clearFlycloakId() { - avatarGuid_ = 0L; + flycloakId_ = 0; onChanged(); return this; } @@ -668,8 +668,8 @@ public emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycl static { java.lang.String[] descriptorData = { "\n\033AvatarWearFlycloakRsp.proto\"R\n\025AvatarW" + - "earFlycloakRsp\022\017\n\007retcode\030\n \001(\005\022\023\n\013flycl" + - "oak_id\030\006 \001(\r\022\023\n\013avatar_guid\030\003 \001(\004B\033\n\031emu" + + "earFlycloakRsp\022\023\n\013avatar_guid\030\003 \001(\004\022\017\n\007r" + + "etcode\030\004 \001(\005\022\023\n\013flycloak_id\030\013 \001(\rB\033\n\031emu" + ".grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -681,7 +681,7 @@ public emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycl internal_static_AvatarWearFlycloakRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AvatarWearFlycloakRsp_descriptor, - new java.lang.String[] { "Retcode", "FlycloakId", "AvatarGuid", }); + new java.lang.String[] { "AvatarGuid", "Retcode", "FlycloakId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java index 4ad47ea5..a3a13b54 100644 --- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java +++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java @@ -185,6 +185,10 @@ public final class PacketOpcodes { public static final int AvatarChangeCostumeReq = 27094;//4.6.0 public static final int AvatarChangeCostumeRsp = 657;//4.6.0 public static final int AvatarGainCostumeNotify = 27498;//4.6.0 + public static final int AvatarWearFlycloakReq = 21936; //4.0.0 + public static final int AvatarWearFlycloakRsp = 924;//4.6.0 + public static final int AvatarGainFlycloakNotify = 22682;//4.6.0 + public static final int AvatarFlycloakChangeNotify = 2952; //4.0.0 @@ -312,9 +316,7 @@ public final class PacketOpcodes { public static final int AvatarFetterDataNotify = 39929004; //4.0.0 public static final int AvatarFetterLevelRewardReq = 39928996; //4.0.0 public static final int AvatarFetterLevelRewardRsp = 3993975; //4.0.0 - public static final int AvatarFlycloakChangeNotify = 39923578; //4.0.0 public static final int AvatarFollowRouteNotify = 3996834; //4.0.0 - public static final int AvatarGainFlycloakNotify = 39929528; //4.0.0 public static final int AvatarPromoteGetRewardReq = 399993; //4.0.0 public static final int AvatarPromoteGetRewardRsp = 3997336; //4.0.0 public static final int AvatarPromoteReq = 39923288; //4.0.0 @@ -329,8 +331,6 @@ public final class PacketOpcodes { public static final int AvatarSkillUpgradeRsp = 39922584; //4.0.0 public static final int AvatarUpgradeReq = 39928204; //4.0.0 public static final int AvatarUpgradeRsp = 39924216; //4.0.0 - public static final int AvatarWearFlycloakReq = 399824; //4.0.0 - public static final int AvatarWearFlycloakRsp = 39921633; //4.0.0 public static final int BAAOCAEGJBP = 39922430; //4.0.0 public static final int BBLDMLJIAIM = 3999880; //4.0.0 public static final int BBLFOGIBMGA = 39925847; //4.0.0