From 6350d83ad0872c227a49515ec5aad6285c1e2024 Mon Sep 17 00:00:00 2001 From: Asnxthaony Date: Mon, 25 Apr 2022 13:46:16 +0800 Subject: [PATCH] fix SetPlayerBirthdayRsp --- .../proto/SetPlayerBirthdayReqOuterClass.java | 208 ++++++------- .../proto/SetPlayerBirthdayRspOuterClass.java | 282 +++++++++++------- .../recv/HandlerSetPlayerBirthdayReq.java | 45 ++- .../send/PacketSetPlayerBirthdayRsp.java | 4 +- 4 files changed, 301 insertions(+), 238 deletions(-) diff --git a/src/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayReqOuterClass.java b/src/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayReqOuterClass.java index d49e0f983..7f174dd45 100644 --- a/src/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayReqOuterClass.java +++ b/src/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayReqOuterClass.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: proto/SetPlayerBirthdayReq.proto +// source: SetPlayerBirthdayReq.proto package emu.grasscutter.net.proto; @@ -19,19 +19,19 @@ public final class SetPlayerBirthdayReqOuterClass { com.google.protobuf.MessageOrBuilder { /** - * .Birthday birth = 1; - * @return Whether the birth field is set. + * .Birthday birthday = 1; + * @return Whether the birthday field is set. */ - boolean hasBirth(); + boolean hasBirthday(); /** - * .Birthday birth = 1; - * @return The birth. + * .Birthday birthday = 1; + * @return The birthday. */ - emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirth(); + emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirthday(); /** - * .Birthday birth = 1; + * .Birthday birthday = 1; */ - emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthOrBuilder(); + emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthdayOrBuilder(); } /** * Protobuf type {@code SetPlayerBirthdayReq} @@ -80,13 +80,13 @@ public final class SetPlayerBirthdayReqOuterClass { break; case 10: { emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder subBuilder = null; - if (birth_ != null) { - subBuilder = birth_.toBuilder(); + if (birthday_ != null) { + subBuilder = birthday_.toBuilder(); } - birth_ = input.readMessage(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.parser(), extensionRegistry); + birthday_ = input.readMessage(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(birth_); - birth_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(birthday_); + birthday_ = subBuilder.buildPartial(); } break; @@ -125,30 +125,30 @@ public final class SetPlayerBirthdayReqOuterClass { emu.grasscutter.net.proto.SetPlayerBirthdayReqOuterClass.SetPlayerBirthdayReq.class, emu.grasscutter.net.proto.SetPlayerBirthdayReqOuterClass.SetPlayerBirthdayReq.Builder.class); } - public static final int BIRTH_FIELD_NUMBER = 1; - private emu.grasscutter.net.proto.BirthdayOuterClass.Birthday birth_; + public static final int BIRTHDAY_FIELD_NUMBER = 1; + private emu.grasscutter.net.proto.BirthdayOuterClass.Birthday birthday_; /** - * .Birthday birth = 1; - * @return Whether the birth field is set. + * .Birthday birthday = 1; + * @return Whether the birthday field is set. */ @java.lang.Override - public boolean hasBirth() { - return birth_ != null; + public boolean hasBirthday() { + return birthday_ != null; } /** - * .Birthday birth = 1; - * @return The birth. + * .Birthday birthday = 1; + * @return The birthday. */ @java.lang.Override - public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirth() { - return birth_ == null ? emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.getDefaultInstance() : birth_; + public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirthday() { + return birthday_ == null ? emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.getDefaultInstance() : birthday_; } /** - * .Birthday birth = 1; + * .Birthday birthday = 1; */ @java.lang.Override - public emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthOrBuilder() { - return getBirth(); + public emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthdayOrBuilder() { + return getBirthday(); } private byte memoizedIsInitialized = -1; @@ -165,8 +165,8 @@ public final class SetPlayerBirthdayReqOuterClass { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (birth_ != null) { - output.writeMessage(1, getBirth()); + if (birthday_ != null) { + output.writeMessage(1, getBirthday()); } unknownFields.writeTo(output); } @@ -177,9 +177,9 @@ public final class SetPlayerBirthdayReqOuterClass { if (size != -1) return size; size = 0; - if (birth_ != null) { + if (birthday_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getBirth()); + .computeMessageSize(1, getBirthday()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +196,10 @@ public final class SetPlayerBirthdayReqOuterClass { } emu.grasscutter.net.proto.SetPlayerBirthdayReqOuterClass.SetPlayerBirthdayReq other = (emu.grasscutter.net.proto.SetPlayerBirthdayReqOuterClass.SetPlayerBirthdayReq) obj; - if (hasBirth() != other.hasBirth()) return false; - if (hasBirth()) { - if (!getBirth() - .equals(other.getBirth())) return false; + if (hasBirthday() != other.hasBirthday()) return false; + if (hasBirthday()) { + if (!getBirthday() + .equals(other.getBirthday())) return false; } if (!unknownFields.equals(other.unknownFields)) return false; return true; @@ -212,9 +212,9 @@ public final class SetPlayerBirthdayReqOuterClass { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasBirth()) { - hash = (37 * hash) + BIRTH_FIELD_NUMBER; - hash = (53 * hash) + getBirth().hashCode(); + if (hasBirthday()) { + hash = (37 * hash) + BIRTHDAY_FIELD_NUMBER; + hash = (53 * hash) + getBirthday().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; @@ -349,11 +349,11 @@ public final class SetPlayerBirthdayReqOuterClass { @java.lang.Override public Builder clear() { super.clear(); - if (birthBuilder_ == null) { - birth_ = null; + if (birthdayBuilder_ == null) { + birthday_ = null; } else { - birth_ = null; - birthBuilder_ = null; + birthday_ = null; + birthdayBuilder_ = null; } return this; } @@ -381,10 +381,10 @@ public final class SetPlayerBirthdayReqOuterClass { @java.lang.Override public emu.grasscutter.net.proto.SetPlayerBirthdayReqOuterClass.SetPlayerBirthdayReq buildPartial() { emu.grasscutter.net.proto.SetPlayerBirthdayReqOuterClass.SetPlayerBirthdayReq result = new emu.grasscutter.net.proto.SetPlayerBirthdayReqOuterClass.SetPlayerBirthdayReq(this); - if (birthBuilder_ == null) { - result.birth_ = birth_; + if (birthdayBuilder_ == null) { + result.birthday_ = birthday_; } else { - result.birth_ = birthBuilder_.build(); + result.birthday_ = birthdayBuilder_.build(); } onBuilt(); return result; @@ -434,8 +434,8 @@ public final class SetPlayerBirthdayReqOuterClass { public Builder mergeFrom(emu.grasscutter.net.proto.SetPlayerBirthdayReqOuterClass.SetPlayerBirthdayReq other) { if (other == emu.grasscutter.net.proto.SetPlayerBirthdayReqOuterClass.SetPlayerBirthdayReq.getDefaultInstance()) return this; - if (other.hasBirth()) { - mergeBirth(other.getBirth()); + if (other.hasBirthday()) { + mergeBirthday(other.getBirthday()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -466,123 +466,123 @@ public final class SetPlayerBirthdayReqOuterClass { return this; } - private emu.grasscutter.net.proto.BirthdayOuterClass.Birthday birth_; + private emu.grasscutter.net.proto.BirthdayOuterClass.Birthday birthday_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.BirthdayOuterClass.Birthday, emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder, emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder> birthBuilder_; + emu.grasscutter.net.proto.BirthdayOuterClass.Birthday, emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder, emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder> birthdayBuilder_; /** - * .Birthday birth = 1; - * @return Whether the birth field is set. + * .Birthday birthday = 1; + * @return Whether the birthday field is set. */ - public boolean hasBirth() { - return birthBuilder_ != null || birth_ != null; + public boolean hasBirthday() { + return birthdayBuilder_ != null || birthday_ != null; } /** - * .Birthday birth = 1; - * @return The birth. + * .Birthday birthday = 1; + * @return The birthday. */ - public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirth() { - if (birthBuilder_ == null) { - return birth_ == null ? emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.getDefaultInstance() : birth_; + public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirthday() { + if (birthdayBuilder_ == null) { + return birthday_ == null ? emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.getDefaultInstance() : birthday_; } else { - return birthBuilder_.getMessage(); + return birthdayBuilder_.getMessage(); } } /** - * .Birthday birth = 1; + * .Birthday birthday = 1; */ - public Builder setBirth(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday value) { - if (birthBuilder_ == null) { + public Builder setBirthday(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday value) { + if (birthdayBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - birth_ = value; + birthday_ = value; onChanged(); } else { - birthBuilder_.setMessage(value); + birthdayBuilder_.setMessage(value); } return this; } /** - * .Birthday birth = 1; + * .Birthday birthday = 1; */ - public Builder setBirth( + public Builder setBirthday( emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder builderForValue) { - if (birthBuilder_ == null) { - birth_ = builderForValue.build(); + if (birthdayBuilder_ == null) { + birthday_ = builderForValue.build(); onChanged(); } else { - birthBuilder_.setMessage(builderForValue.build()); + birthdayBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .Birthday birth = 1; + * .Birthday birthday = 1; */ - public Builder mergeBirth(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday value) { - if (birthBuilder_ == null) { - if (birth_ != null) { - birth_ = - emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.newBuilder(birth_).mergeFrom(value).buildPartial(); + public Builder mergeBirthday(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday value) { + if (birthdayBuilder_ == null) { + if (birthday_ != null) { + birthday_ = + emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.newBuilder(birthday_).mergeFrom(value).buildPartial(); } else { - birth_ = value; + birthday_ = value; } onChanged(); } else { - birthBuilder_.mergeFrom(value); + birthdayBuilder_.mergeFrom(value); } return this; } /** - * .Birthday birth = 1; + * .Birthday birthday = 1; */ - public Builder clearBirth() { - if (birthBuilder_ == null) { - birth_ = null; + public Builder clearBirthday() { + if (birthdayBuilder_ == null) { + birthday_ = null; onChanged(); } else { - birth_ = null; - birthBuilder_ = null; + birthday_ = null; + birthdayBuilder_ = null; } return this; } /** - * .Birthday birth = 1; + * .Birthday birthday = 1; */ - public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder getBirthBuilder() { + public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder getBirthdayBuilder() { onChanged(); - return getBirthFieldBuilder().getBuilder(); + return getBirthdayFieldBuilder().getBuilder(); } /** - * .Birthday birth = 1; + * .Birthday birthday = 1; */ - public emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthOrBuilder() { - if (birthBuilder_ != null) { - return birthBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthdayOrBuilder() { + if (birthdayBuilder_ != null) { + return birthdayBuilder_.getMessageOrBuilder(); } else { - return birth_ == null ? - emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.getDefaultInstance() : birth_; + return birthday_ == null ? + emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.getDefaultInstance() : birthday_; } } /** - * .Birthday birth = 1; + * .Birthday birthday = 1; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.BirthdayOuterClass.Birthday, emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder, emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder> - getBirthFieldBuilder() { - if (birthBuilder_ == null) { - birthBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getBirthdayFieldBuilder() { + if (birthdayBuilder_ == null) { + birthdayBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.BirthdayOuterClass.Birthday, emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder, emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder>( - getBirth(), + getBirthday(), getParentForChildren(), isClean()); - birth_ = null; + birthday_ = null; } - return birthBuilder_; + return birthdayBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -651,10 +651,10 @@ public final class SetPlayerBirthdayReqOuterClass { descriptor; static { java.lang.String[] descriptorData = { - "\n proto/SetPlayerBirthdayReq.proto\032\024prot" + - "o/Birthday.proto\"0\n\024SetPlayerBirthdayReq" + - "\022\030\n\005birth\030\001 \001(\0132\t.BirthdayB\033\n\031emu.grassc" + - "utter.net.protob\006proto3" + "\n\032SetPlayerBirthdayReq.proto\032\016Birthday.p" + + "roto\"3\n\024SetPlayerBirthdayReq\022\033\n\010birthday" + + "\030\001 \001(\0132\t.BirthdayB\033\n\031emu.grasscutter.net" + + ".protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -666,7 +666,7 @@ public final class SetPlayerBirthdayReqOuterClass { internal_static_SetPlayerBirthdayReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_SetPlayerBirthdayReq_descriptor, - new java.lang.String[] { "Birth", }); + new java.lang.String[] { "Birthday", }); emu.grasscutter.net.proto.BirthdayOuterClass.getDescriptor(); } diff --git a/src/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayRspOuterClass.java b/src/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayRspOuterClass.java index acb24b8b2..e77af9ae9 100644 --- a/src/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayRspOuterClass.java +++ b/src/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayRspOuterClass.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: proto/SetPlayerBirthdayRsp.proto +// source: SetPlayerBirthdayRsp.proto package emu.grasscutter.net.proto; @@ -19,19 +19,25 @@ public final class SetPlayerBirthdayRspOuterClass { com.google.protobuf.MessageOrBuilder { /** - * .Birthday birth = 1; - * @return Whether the birth field is set. + * int32 retcode = 1; + * @return The retcode. */ - boolean hasBirth(); + int getRetcode(); + /** - * .Birthday birth = 1; - * @return The birth. + * .Birthday birthday = 2; + * @return Whether the birthday field is set. */ - emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirth(); + boolean hasBirthday(); /** - * .Birthday birth = 1; + * .Birthday birthday = 2; + * @return The birthday. */ - emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthOrBuilder(); + emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirthday(); + /** + * .Birthday birthday = 2; + */ + emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthdayOrBuilder(); } /** * Protobuf type {@code SetPlayerBirthdayRsp} @@ -78,15 +84,20 @@ public final class SetPlayerBirthdayRspOuterClass { case 0: done = true; break; - case 10: { + case 8: { + + retcode_ = input.readInt32(); + break; + } + case 18: { emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder subBuilder = null; - if (birth_ != null) { - subBuilder = birth_.toBuilder(); + if (birthday_ != null) { + subBuilder = birthday_.toBuilder(); } - birth_ = input.readMessage(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.parser(), extensionRegistry); + birthday_ = input.readMessage(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(birth_); - birth_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(birthday_); + birthday_ = subBuilder.buildPartial(); } break; @@ -125,30 +136,41 @@ public final class SetPlayerBirthdayRspOuterClass { emu.grasscutter.net.proto.SetPlayerBirthdayRspOuterClass.SetPlayerBirthdayRsp.class, emu.grasscutter.net.proto.SetPlayerBirthdayRspOuterClass.SetPlayerBirthdayRsp.Builder.class); } - public static final int BIRTH_FIELD_NUMBER = 1; - private emu.grasscutter.net.proto.BirthdayOuterClass.Birthday birth_; + public static final int RETCODE_FIELD_NUMBER = 1; + private int retcode_; /** - * .Birthday birth = 1; - * @return Whether the birth field is set. + * int32 retcode = 1; + * @return The retcode. */ @java.lang.Override - public boolean hasBirth() { - return birth_ != null; + public int getRetcode() { + return retcode_; + } + + public static final int BIRTHDAY_FIELD_NUMBER = 2; + private emu.grasscutter.net.proto.BirthdayOuterClass.Birthday birthday_; + /** + * .Birthday birthday = 2; + * @return Whether the birthday field is set. + */ + @java.lang.Override + public boolean hasBirthday() { + return birthday_ != null; } /** - * .Birthday birth = 1; - * @return The birth. + * .Birthday birthday = 2; + * @return The birthday. */ @java.lang.Override - public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirth() { - return birth_ == null ? emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.getDefaultInstance() : birth_; + public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirthday() { + return birthday_ == null ? emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.getDefaultInstance() : birthday_; } /** - * .Birthday birth = 1; + * .Birthday birthday = 2; */ @java.lang.Override - public emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthOrBuilder() { - return getBirth(); + public emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthdayOrBuilder() { + return getBirthday(); } private byte memoizedIsInitialized = -1; @@ -165,8 +187,11 @@ public final class SetPlayerBirthdayRspOuterClass { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (birth_ != null) { - output.writeMessage(1, getBirth()); + if (retcode_ != 0) { + output.writeInt32(1, retcode_); + } + if (birthday_ != null) { + output.writeMessage(2, getBirthday()); } unknownFields.writeTo(output); } @@ -177,9 +202,13 @@ public final class SetPlayerBirthdayRspOuterClass { if (size != -1) return size; size = 0; - if (birth_ != null) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getBirth()); + .computeInt32Size(1, retcode_); + } + if (birthday_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, getBirthday()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +225,12 @@ public final class SetPlayerBirthdayRspOuterClass { } emu.grasscutter.net.proto.SetPlayerBirthdayRspOuterClass.SetPlayerBirthdayRsp other = (emu.grasscutter.net.proto.SetPlayerBirthdayRspOuterClass.SetPlayerBirthdayRsp) obj; - if (hasBirth() != other.hasBirth()) return false; - if (hasBirth()) { - if (!getBirth() - .equals(other.getBirth())) return false; + if (getRetcode() + != other.getRetcode()) return false; + if (hasBirthday() != other.hasBirthday()) return false; + if (hasBirthday()) { + if (!getBirthday() + .equals(other.getBirthday())) return false; } if (!unknownFields.equals(other.unknownFields)) return false; return true; @@ -212,9 +243,11 @@ public final class SetPlayerBirthdayRspOuterClass { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasBirth()) { - hash = (37 * hash) + BIRTH_FIELD_NUMBER; - hash = (53 * hash) + getBirth().hashCode(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); + if (hasBirthday()) { + hash = (37 * hash) + BIRTHDAY_FIELD_NUMBER; + hash = (53 * hash) + getBirthday().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; @@ -349,11 +382,13 @@ public final class SetPlayerBirthdayRspOuterClass { @java.lang.Override public Builder clear() { super.clear(); - if (birthBuilder_ == null) { - birth_ = null; + retcode_ = 0; + + if (birthdayBuilder_ == null) { + birthday_ = null; } else { - birth_ = null; - birthBuilder_ = null; + birthday_ = null; + birthdayBuilder_ = null; } return this; } @@ -381,10 +416,11 @@ public final class SetPlayerBirthdayRspOuterClass { @java.lang.Override public emu.grasscutter.net.proto.SetPlayerBirthdayRspOuterClass.SetPlayerBirthdayRsp buildPartial() { emu.grasscutter.net.proto.SetPlayerBirthdayRspOuterClass.SetPlayerBirthdayRsp result = new emu.grasscutter.net.proto.SetPlayerBirthdayRspOuterClass.SetPlayerBirthdayRsp(this); - if (birthBuilder_ == null) { - result.birth_ = birth_; + result.retcode_ = retcode_; + if (birthdayBuilder_ == null) { + result.birthday_ = birthday_; } else { - result.birth_ = birthBuilder_.build(); + result.birthday_ = birthdayBuilder_.build(); } onBuilt(); return result; @@ -434,8 +470,11 @@ public final class SetPlayerBirthdayRspOuterClass { public Builder mergeFrom(emu.grasscutter.net.proto.SetPlayerBirthdayRspOuterClass.SetPlayerBirthdayRsp other) { if (other == emu.grasscutter.net.proto.SetPlayerBirthdayRspOuterClass.SetPlayerBirthdayRsp.getDefaultInstance()) return this; - if (other.hasBirth()) { - mergeBirth(other.getBirth()); + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } + if (other.hasBirthday()) { + mergeBirthday(other.getBirthday()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -466,123 +505,154 @@ public final class SetPlayerBirthdayRspOuterClass { return this; } - private emu.grasscutter.net.proto.BirthdayOuterClass.Birthday birth_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.BirthdayOuterClass.Birthday, emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder, emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder> birthBuilder_; + private int retcode_ ; /** - * .Birthday birth = 1; - * @return Whether the birth field is set. + * int32 retcode = 1; + * @return The retcode. */ - public boolean hasBirth() { - return birthBuilder_ != null || birth_ != null; + @java.lang.Override + public int getRetcode() { + return retcode_; } /** - * .Birthday birth = 1; - * @return The birth. + * int32 retcode = 1; + * @param value The retcode to set. + * @return This builder for chaining. */ - public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirth() { - if (birthBuilder_ == null) { - return birth_ == null ? emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.getDefaultInstance() : birth_; + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 1; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; + onChanged(); + return this; + } + + private emu.grasscutter.net.proto.BirthdayOuterClass.Birthday birthday_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.BirthdayOuterClass.Birthday, emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder, emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder> birthdayBuilder_; + /** + * .Birthday birthday = 2; + * @return Whether the birthday field is set. + */ + public boolean hasBirthday() { + return birthdayBuilder_ != null || birthday_ != null; + } + /** + * .Birthday birthday = 2; + * @return The birthday. + */ + public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirthday() { + if (birthdayBuilder_ == null) { + return birthday_ == null ? emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.getDefaultInstance() : birthday_; } else { - return birthBuilder_.getMessage(); + return birthdayBuilder_.getMessage(); } } /** - * .Birthday birth = 1; + * .Birthday birthday = 2; */ - public Builder setBirth(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday value) { - if (birthBuilder_ == null) { + public Builder setBirthday(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday value) { + if (birthdayBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - birth_ = value; + birthday_ = value; onChanged(); } else { - birthBuilder_.setMessage(value); + birthdayBuilder_.setMessage(value); } return this; } /** - * .Birthday birth = 1; + * .Birthday birthday = 2; */ - public Builder setBirth( + public Builder setBirthday( emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder builderForValue) { - if (birthBuilder_ == null) { - birth_ = builderForValue.build(); + if (birthdayBuilder_ == null) { + birthday_ = builderForValue.build(); onChanged(); } else { - birthBuilder_.setMessage(builderForValue.build()); + birthdayBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .Birthday birth = 1; + * .Birthday birthday = 2; */ - public Builder mergeBirth(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday value) { - if (birthBuilder_ == null) { - if (birth_ != null) { - birth_ = - emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.newBuilder(birth_).mergeFrom(value).buildPartial(); + public Builder mergeBirthday(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday value) { + if (birthdayBuilder_ == null) { + if (birthday_ != null) { + birthday_ = + emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.newBuilder(birthday_).mergeFrom(value).buildPartial(); } else { - birth_ = value; + birthday_ = value; } onChanged(); } else { - birthBuilder_.mergeFrom(value); + birthdayBuilder_.mergeFrom(value); } return this; } /** - * .Birthday birth = 1; + * .Birthday birthday = 2; */ - public Builder clearBirth() { - if (birthBuilder_ == null) { - birth_ = null; + public Builder clearBirthday() { + if (birthdayBuilder_ == null) { + birthday_ = null; onChanged(); } else { - birth_ = null; - birthBuilder_ = null; + birthday_ = null; + birthdayBuilder_ = null; } return this; } /** - * .Birthday birth = 1; + * .Birthday birthday = 2; */ - public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder getBirthBuilder() { + public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder getBirthdayBuilder() { onChanged(); - return getBirthFieldBuilder().getBuilder(); + return getBirthdayFieldBuilder().getBuilder(); } /** - * .Birthday birth = 1; + * .Birthday birthday = 2; */ - public emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthOrBuilder() { - if (birthBuilder_ != null) { - return birthBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthdayOrBuilder() { + if (birthdayBuilder_ != null) { + return birthdayBuilder_.getMessageOrBuilder(); } else { - return birth_ == null ? - emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.getDefaultInstance() : birth_; + return birthday_ == null ? + emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.getDefaultInstance() : birthday_; } } /** - * .Birthday birth = 1; + * .Birthday birthday = 2; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.BirthdayOuterClass.Birthday, emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder, emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder> - getBirthFieldBuilder() { - if (birthBuilder_ == null) { - birthBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getBirthdayFieldBuilder() { + if (birthdayBuilder_ == null) { + birthdayBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.BirthdayOuterClass.Birthday, emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder, emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder>( - getBirth(), + getBirthday(), getParentForChildren(), isClean()); - birth_ = null; + birthday_ = null; } - return birthBuilder_; + return birthdayBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -651,10 +721,10 @@ public final class SetPlayerBirthdayRspOuterClass { descriptor; static { java.lang.String[] descriptorData = { - "\n proto/SetPlayerBirthdayRsp.proto\032\024prot" + - "o/Birthday.proto\"0\n\024SetPlayerBirthdayRsp" + - "\022\030\n\005birth\030\001 \001(\0132\t.BirthdayB\033\n\031emu.grassc" + - "utter.net.protob\006proto3" + "\n\032SetPlayerBirthdayRsp.proto\032\016Birthday.p" + + "roto\"D\n\024SetPlayerBirthdayRsp\022\017\n\007retcode\030" + + "\001 \001(\005\022\033\n\010birthday\030\002 \001(\0132\t.BirthdayB\033\n\031em" + + "u.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -666,7 +736,7 @@ public final class SetPlayerBirthdayRspOuterClass { internal_static_SetPlayerBirthdayRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_SetPlayerBirthdayRsp_descriptor, - new java.lang.String[] { "Birth", }); + new java.lang.String[] { "Retcode", "Birthday", }); emu.grasscutter.net.proto.BirthdayOuterClass.getDescriptor(); } diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBirthdayReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBirthdayReq.java index 0edb08f73..5bfa9f8d5 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBirthdayReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBirthdayReq.java @@ -1,38 +1,33 @@ package emu.grasscutter.server.packet.recv; +import emu.grasscutter.net.packet.Opcodes; +import emu.grasscutter.net.packet.PacketHandler; +import emu.grasscutter.net.packet.PacketOpcodes; +import emu.grasscutter.net.proto.SetPlayerBirthdayReqOuterClass.SetPlayerBirthdayReq; +import emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail; import emu.grasscutter.server.game.GameSession; import emu.grasscutter.server.packet.send.PacketGetPlayerSocialDetailRsp; import emu.grasscutter.server.packet.send.PacketSetPlayerBirthdayRsp; -import emu.grasscutter.net.packet.Opcodes; -import emu.grasscutter.net.packet.PacketOpcodes; -import emu.grasscutter.net.packet.PacketHandler; - -import emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail; -import emu.grasscutter.net.proto.SetPlayerBirthdayReqOuterClass.SetPlayerBirthdayReq; - -import com.google.gson.Gson; - @Opcodes(PacketOpcodes.SetPlayerBirthdayReq) public class HandlerSetPlayerBirthdayReq extends PacketHandler { - @Override - public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { - SetPlayerBirthdayReq req = SetPlayerBirthdayReq.parseFrom(payload); + @Override + public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { + SetPlayerBirthdayReq req = SetPlayerBirthdayReq.parseFrom(payload); - if(req.getBirth() != null && req.getBirth().getDay() > 0 && req.getBirth().getMonth() > 0) - { - int day = req.getBirth().getDay(); - int month = req.getBirth().getMonth(); + if (req.getBirthday().getDay() > 0 && req.getBirthday().getMonth() > 0) { + int day = req.getBirthday().getDay(); + int month = req.getBirthday().getMonth(); - // Update birthday value - session.getPlayer().setBirthday(day, month); + // Update birthday value + session.getPlayer().setBirthday(day, month); - // Save birthday month and day - session.getPlayer().save(); - SocialDetail.Builder detail = session.getPlayer().getSocialDetail(); + // Save birthday month and day + session.getPlayer().save(); + SocialDetail.Builder detail = session.getPlayer().getSocialDetail(); - session.send(new PacketSetPlayerBirthdayRsp(session.getPlayer())); - session.send(new PacketGetPlayerSocialDetailRsp(detail)); - } - } + session.send(new PacketSetPlayerBirthdayRsp(session.getPlayer())); + session.send(new PacketGetPlayerSocialDetailRsp(detail)); + } + } } diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerBirthdayRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerBirthdayRsp.java index 9b73b6b13..135d22f2f 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerBirthdayRsp.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketSetPlayerBirthdayRsp.java @@ -1,18 +1,16 @@ package emu.grasscutter.server.packet.send; -import emu.grasscutter.Grasscutter; import emu.grasscutter.game.GenshinPlayer; import emu.grasscutter.net.packet.GenshinPacket; import emu.grasscutter.net.packet.PacketOpcodes; import emu.grasscutter.net.proto.SetPlayerBirthdayRspOuterClass.SetPlayerBirthdayRsp; -import emu.grasscutter.net.proto.BirthdayOuterClass.Birthday; public class PacketSetPlayerBirthdayRsp extends GenshinPacket { public PacketSetPlayerBirthdayRsp(GenshinPlayer player) { super(PacketOpcodes.SetPlayerBirthdayRsp); SetPlayerBirthdayRsp proto = SetPlayerBirthdayRsp.newBuilder() - .setBirth(player.getBirthday().toProto()) + .setBirthday(player.getBirthday().toProto()) .build(); this.setData(proto);