Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-09 06:23:35 +08:00
Code Issues Projects Releases Wiki Activity

Add support for v3.5.0 (#2090)

Browse Source 
* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
This commit is contained in:
Colleiflower
2023-03-31 19:13:32 +00:00
committed by GitHub
Unverified
parent 922f7bca51
commit 516e5975e1
1383 changed files with 167226 additions and 586936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/SetPlayerHeadImageRspOuterClass.java
+161 -284
View File
@@ -19,33 +19,38 @@ public final class SetPlayerHeadImageRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>int32 retcode = 5;</code>
* <code>.ProfilePicture profile_picture = 10;</code>
* @return Whether the profilePicture field is set.
*/
boolean hasProfilePicture();
/**
* <code>.ProfilePicture profile_picture = 10;</code>
* @return The profilePicture.
*/
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture();
/**
* <code>.ProfilePicture profile_picture = 10;</code>
*/
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder();
/**
* <code>int32 retcode = 15;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 avatarId = 2;</code>
* <code>uint32 avatar_id = 2;</code>
* @return The avatarId.
*/
int getAvatarId();
/**
* <code>.ProfilePicture profilePicture = 9;</code>
* @return Whether the profilePicture field is set.
*/
boolean hasProfilePicture();
/**
* <code>.ProfilePicture profilePicture = 9;</code>
* @return The profilePicture.
*/
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture();
/**
* <code>.ProfilePicture profilePicture = 9;</code>
*/
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder();
}
/**
* <pre>
* Name: FKFHNKPJGND
* CmdId: 4061
* </pre>
*
* Protobuf type {@code SetPlayerHeadImageRsp}
*/
public static final class SetPlayerHeadImageRsp extends
@@ -95,12 +100,7 @@ public final class SetPlayerHeadImageRspOuterClass {
avatarId_ = input.readUInt32();
break;
}
case 40: {
retcode_ = input.readInt32();
break;
}
case 74: {
case 82: {
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder subBuilder = null;
if (profilePicture_ != null) {
subBuilder = profilePicture_.toBuilder();
@@ -113,6 +113,11 @@ public final class SetPlayerHeadImageRspOuterClass {
break;
}
case 120: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -145,163 +150,10 @@ public final class SetPlayerHeadImageRspOuterClass {
emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp.class, emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp.Builder.class);
}
/**
* Protobuf enum {@code SetPlayerHeadImageRsp.EDBGDNODIJJ}
*/
public enum EDBGDNODIJJ
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 4039;</code>
*/
PEPPOHPHJOJ(1, 4039),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final EDBGDNODIJJ DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 4039;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 4039;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final int DCDNILFDFLB_VALUE = 0;
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
public static final int NNBKOLMPOEA_VALUE = 1;
public final int getNumber() {
if (index == -1) {
throw new java.lang.IllegalArgumentException(
"Can't get the number of an unknown enum value.");
}
return value;
}
/**
* @param value The numeric wire value of the corresponding enum entry.
* @return The enum associated with the given numeric wire value.
* @deprecated Use {@link #forNumber(int)} instead.
*/
@java.lang.Deprecated
public static EDBGDNODIJJ valueOf(int value) {
return forNumber(value);
}
/**
* @param value The numeric wire value of the corresponding enum entry.
* @return The enum associated with the given numeric wire value.
*/
public static EDBGDNODIJJ forNumber(int value) {
switch (value) {
case 0: return NONE;
case 4039: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<EDBGDNODIJJ>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
EDBGDNODIJJ> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<EDBGDNODIJJ>() {
public EDBGDNODIJJ findValueByNumber(int number) {
return EDBGDNODIJJ.forNumber(number);
}
};
public final com.google.protobuf.Descriptors.EnumValueDescriptor
getValueDescriptor() {
if (index == -1) {
throw new java.lang.IllegalStateException(
"Can't get the descriptor of an unrecognized enum value.");
}
return getDescriptor().getValues().get(index);
}
public final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptorForType() {
return getDescriptor();
}
public static final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
return emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp.getDescriptor().getEnumTypes().get(0);
}
private static final EDBGDNODIJJ[] VALUES = getStaticValuesArray();
private static EDBGDNODIJJ[] getStaticValuesArray() {
return new EDBGDNODIJJ[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static EDBGDNODIJJ valueOf(
com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
throw new java.lang.IllegalArgumentException(
"EnumValueDescriptor is not for this type.");
}
if (desc.getIndex() == -1) {
return UNRECOGNIZED;
}
return VALUES[desc.getIndex()];
}
private final int index;
private final int value;
private EDBGDNODIJJ(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:SetPlayerHeadImageRsp.EDBGDNODIJJ)
}
public static final int RETCODE_FIELD_NUMBER = 5;
private int retcode_;
/**
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int AVATARID_FIELD_NUMBER = 2;
private int avatarId_;
/**
* <code>uint32 avatarId = 2;</code>
* @return The avatarId.
*/
@java.lang.Override
public int getAvatarId() {
return avatarId_;
}
public static final int PROFILEPICTURE_FIELD_NUMBER = 9;
public static final int PROFILE_PICTURE_FIELD_NUMBER = 10;
private emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture profilePicture_;
/**
* <code>.ProfilePicture profilePicture = 9;</code>
* <code>.ProfilePicture profile_picture = 10;</code>
* @return Whether the profilePicture field is set.
*/
@java.lang.Override
@@ -309,7 +161,7 @@ public final class SetPlayerHeadImageRspOuterClass {
return profilePicture_ != null;
}
/**
* <code>.ProfilePicture profilePicture = 9;</code>
* <code>.ProfilePicture profile_picture = 10;</code>
* @return The profilePicture.
*/
@java.lang.Override
@@ -317,13 +169,35 @@ public final class SetPlayerHeadImageRspOuterClass {
return profilePicture_ == null ? emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance() : profilePicture_;
}
/**
* <code>.ProfilePicture profilePicture = 9;</code>
* <code>.ProfilePicture profile_picture = 10;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder() {
return getProfilePicture();
}
public static final int RETCODE_FIELD_NUMBER = 15;
private int retcode_;
/**
* <code>int32 retcode = 15;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int AVATAR_ID_FIELD_NUMBER = 2;
private int avatarId_;
/**
* <code>uint32 avatar_id = 2;</code>
* @return The avatarId.
*/
@java.lang.Override
public int getAvatarId() {
return avatarId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -341,11 +215,11 @@ public final class SetPlayerHeadImageRspOuterClass {
if (avatarId_ != 0) {
output.writeUInt32(2, avatarId_);
}
if (retcode_ != 0) {
output.writeInt32(5, retcode_);
}
if (profilePicture_ != null) {
output.writeMessage(9, getProfilePicture());
output.writeMessage(10, getProfilePicture());
}
if (retcode_ != 0) {
output.writeInt32(15, retcode_);
}
unknownFields.writeTo(output);
}
@@ -360,13 +234,13 @@ public final class SetPlayerHeadImageRspOuterClass {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, avatarId_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(5, retcode_);
}
if (profilePicture_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(9, getProfilePicture());
.computeMessageSize(10, getProfilePicture());
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(15, retcode_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -383,15 +257,15 @@ public final class SetPlayerHeadImageRspOuterClass {
}
emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp other = (emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp) obj;
if (getRetcode()
!= other.getRetcode()) return false;
if (getAvatarId()
!= other.getAvatarId()) return false;
if (hasProfilePicture() != other.hasProfilePicture()) return false;
if (hasProfilePicture()) {
if (!getProfilePicture()
.equals(other.getProfilePicture())) return false;
}
if (getRetcode()
!= other.getRetcode()) return false;
if (getAvatarId()
!= other.getAvatarId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -403,14 +277,14 @@ public final class SetPlayerHeadImageRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + AVATARID_FIELD_NUMBER;
hash = (53 * hash) + getAvatarId();
if (hasProfilePicture()) {
hash = (37 * hash) + PROFILEPICTURE_FIELD_NUMBER;
hash = (37 * hash) + PROFILE_PICTURE_FIELD_NUMBER;
hash = (53 * hash) + getProfilePicture().hashCode();
}
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
hash = (53 * hash) + getAvatarId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -507,6 +381,11 @@ public final class SetPlayerHeadImageRspOuterClass {
return builder;
}
/**
* <pre>
* Name: FKFHNKPJGND
* CmdId: 4061
* </pre>
*
* Protobuf type {@code SetPlayerHeadImageRsp}
*/
public static final class Builder extends
@@ -544,16 +423,16 @@ public final class SetPlayerHeadImageRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
retcode_ = 0;
avatarId_ = 0;
if (profilePictureBuilder_ == null) {
profilePicture_ = null;
} else {
profilePicture_ = null;
profilePictureBuilder_ = null;
}
retcode_ = 0;
avatarId_ = 0;
return this;
}
@@ -580,13 +459,13 @@ public final class SetPlayerHeadImageRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp buildPartial() {
emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp result = new emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp(this);
result.retcode_ = retcode_;
result.avatarId_ = avatarId_;
if (profilePictureBuilder_ == null) {
result.profilePicture_ = profilePicture_;
} else {
result.profilePicture_ = profilePictureBuilder_.build();
}
result.retcode_ = retcode_;
result.avatarId_ = avatarId_;
onBuilt();
return result;
}
@@ -635,15 +514,15 @@ public final class SetPlayerHeadImageRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp other) {
if (other == emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp.getDefaultInstance()) return this;
if (other.hasProfilePicture()) {
mergeProfilePicture(other.getProfilePicture());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getAvatarId() != 0) {
setAvatarId(other.getAvatarId());
}
if (other.hasProfilePicture()) {
mergeProfilePicture(other.getProfilePicture());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -673,80 +552,18 @@ public final class SetPlayerHeadImageRspOuterClass {
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 5;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 5;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private int avatarId_ ;
/**
* <code>uint32 avatarId = 2;</code>
* @return The avatarId.
*/
@java.lang.Override
public int getAvatarId() {
return avatarId_;
}
/**
* <code>uint32 avatarId = 2;</code>
* @param value The avatarId to set.
* @return This builder for chaining.
*/
public Builder setAvatarId(int value) {
avatarId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 avatarId = 2;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarId() {
avatarId_ = 0;
onChanged();
return this;
}
private emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture profilePicture_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder> profilePictureBuilder_;
/**
* <code>.ProfilePicture profilePicture = 9;</code>
* <code>.ProfilePicture profile_picture = 10;</code>
* @return Whether the profilePicture field is set.
*/
public boolean hasProfilePicture() {
return profilePictureBuilder_ != null || profilePicture_ != null;
}
/**
* <code>.ProfilePicture profilePicture = 9;</code>
* <code>.ProfilePicture profile_picture = 10;</code>
* @return The profilePicture.
*/
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture() {
@@ -757,7 +574,7 @@ public final class SetPlayerHeadImageRspOuterClass {
}
}
/**
* <code>.ProfilePicture profilePicture = 9;</code>
* <code>.ProfilePicture profile_picture = 10;</code>
*/
public Builder setProfilePicture(emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture value) {
if (profilePictureBuilder_ == null) {
@@ -773,7 +590,7 @@ public final class SetPlayerHeadImageRspOuterClass {
return this;
}
/**
* <code>.ProfilePicture profilePicture = 9;</code>
* <code>.ProfilePicture profile_picture = 10;</code>
*/
public Builder setProfilePicture(
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder builderForValue) {
@@ -787,7 +604,7 @@ public final class SetPlayerHeadImageRspOuterClass {
return this;
}
/**
* <code>.ProfilePicture profilePicture = 9;</code>
* <code>.ProfilePicture profile_picture = 10;</code>
*/
public Builder mergeProfilePicture(emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture value) {
if (profilePictureBuilder_ == null) {
@@ -805,7 +622,7 @@ public final class SetPlayerHeadImageRspOuterClass {
return this;
}
/**
* <code>.ProfilePicture profilePicture = 9;</code>
* <code>.ProfilePicture profile_picture = 10;</code>
*/
public Builder clearProfilePicture() {
if (profilePictureBuilder_ == null) {
@@ -819,7 +636,7 @@ public final class SetPlayerHeadImageRspOuterClass {
return this;
}
/**
* <code>.ProfilePicture profilePicture = 9;</code>
* <code>.ProfilePicture profile_picture = 10;</code>
*/
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder getProfilePictureBuilder() {
@@ -827,7 +644,7 @@ public final class SetPlayerHeadImageRspOuterClass {
return getProfilePictureFieldBuilder().getBuilder();
}
/**
* <code>.ProfilePicture profilePicture = 9;</code>
* <code>.ProfilePicture profile_picture = 10;</code>
*/
public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder() {
if (profilePictureBuilder_ != null) {
@@ -838,7 +655,7 @@ public final class SetPlayerHeadImageRspOuterClass {
}
}
/**
* <code>.ProfilePicture profilePicture = 9;</code>
* <code>.ProfilePicture profile_picture = 10;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder>
@@ -853,6 +670,68 @@ public final class SetPlayerHeadImageRspOuterClass {
}
return profilePictureBuilder_;
}
private int retcode_ ;
/**
* <code>int32 retcode = 15;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 15;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 15;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private int avatarId_ ;
/**
* <code>uint32 avatar_id = 2;</code>
* @return The avatarId.
*/
@java.lang.Override
public int getAvatarId() {
return avatarId_;
}
/**
* <code>uint32 avatar_id = 2;</code>
* @param value The avatarId to set.
* @return This builder for chaining.
*/
public Builder setAvatarId(int value) {
avatarId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 avatar_id = 2;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarId() {
avatarId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -921,11 +800,9 @@ public final class SetPlayerHeadImageRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\033SetPlayerHeadImageRsp.proto\032\024ProfilePi" +
"cture.proto\"\264\001\n\025SetPlayerHeadImageRsp\022\017\n" +
"\007retcode\030\005 \001(\005\022\020\n\010avatarId\030\002 \001(\r\022\'\n\016prof" +
"ilePicture\030\t \001(\0132\017.ProfilePicture\"O\n\013EDB" +
"GDNODIJJ\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\307\037\022\017\n\013" +
"DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031em" +
"cture.proto\"e\n\025SetPlayerHeadImageRsp\022(\n\017" +
"profile_picture\030\n \001(\0132\017.ProfilePicture\022\017" +
"\n\007retcode\030\017 \001(\005\022\021\n\tavatar_id\030\002 \001(\rB\033\n\031em" +
"u.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -938,7 +815,7 @@ public final class SetPlayerHeadImageRspOuterClass {
internal_static_SetPlayerHeadImageRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SetPlayerHeadImageRsp_descriptor,
new java.lang.String[] { "Retcode", "AvatarId", "ProfilePicture", });
new java.lang.String[] { "ProfilePicture", "Retcode", "AvatarId", });
emu.grasscutter.net.proto.ProfilePictureOuterClass.getDescriptor();
}