Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-08 21:03:40 +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/UnlockAvatarTalentRspOuterClass.java
+101 -224
View File
@@ -19,24 +19,29 @@ public final class UnlockAvatarTalentRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint64 avatarGuid = 13;</code>
* <code>uint64 avatar_guid = 5;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>uint32 talentId = 2;</code>
* <code>uint32 talent_id = 13;</code>
* @return The talentId.
*/
int getTalentId();
/**
* <code>int32 retcode = 4;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* Name: EFFKKHNDIAF
* CmdId: 1075
* </pre>
*
* Protobuf type {@code UnlockAvatarTalentRsp}
*/
public static final class UnlockAvatarTalentRsp extends
@@ -81,19 +86,19 @@ public final class UnlockAvatarTalentRspOuterClass {
case 0:
done = true;
break;
case 8: {
case 32: {
retcode_ = input.readInt32();
break;
}
case 16: {
case 40: {
talentId_ = input.readUInt32();
avatarGuid_ = input.readUInt64();
break;
}
case 104: {
avatarGuid_ = input.readUInt64();
talentId_ = input.readUInt32();
break;
}
default: {
@@ -128,152 +133,10 @@ public final class UnlockAvatarTalentRspOuterClass {
emu.grasscutter.net.proto.UnlockAvatarTalentRspOuterClass.UnlockAvatarTalentRsp.class, emu.grasscutter.net.proto.UnlockAvatarTalentRspOuterClass.UnlockAvatarTalentRsp.Builder.class);
}
/**
* Protobuf enum {@code UnlockAvatarTalentRsp.DCIFFOCCBNH}
*/
public enum DCIFFOCCBNH
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1055;</code>
*/
PEPPOHPHJOJ(1, 1055),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final DCIFFOCCBNH DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1055;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1055;
/**
* <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 DCIFFOCCBNH 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 DCIFFOCCBNH forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1055: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<DCIFFOCCBNH>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
DCIFFOCCBNH> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<DCIFFOCCBNH>() {
public DCIFFOCCBNH findValueByNumber(int number) {
return DCIFFOCCBNH.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.UnlockAvatarTalentRspOuterClass.UnlockAvatarTalentRsp.getDescriptor().getEnumTypes().get(0);
}
private static final DCIFFOCCBNH[] VALUES = getStaticValuesArray();
private static DCIFFOCCBNH[] getStaticValuesArray() {
return new DCIFFOCCBNH[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static DCIFFOCCBNH 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 DCIFFOCCBNH(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:UnlockAvatarTalentRsp.DCIFFOCCBNH)
}
public static final int RETCODE_FIELD_NUMBER = 1;
private int retcode_;
/**
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int AVATARGUID_FIELD_NUMBER = 13;
public static final int AVATAR_GUID_FIELD_NUMBER = 5;
private long avatarGuid_;
/**
* <code>uint64 avatarGuid = 13;</code>
* <code>uint64 avatar_guid = 5;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -281,10 +144,10 @@ public final class UnlockAvatarTalentRspOuterClass {
return avatarGuid_;
}
public static final int TALENTID_FIELD_NUMBER = 2;
public static final int TALENT_ID_FIELD_NUMBER = 13;
private int talentId_;
/**
* <code>uint32 talentId = 2;</code>
* <code>uint32 talent_id = 13;</code>
* @return The talentId.
*/
@java.lang.Override
@@ -292,6 +155,17 @@ public final class UnlockAvatarTalentRspOuterClass {
return talentId_;
}
public static final int RETCODE_FIELD_NUMBER = 4;
private int retcode_;
/**
* <code>int32 retcode = 4;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -307,13 +181,13 @@ public final class UnlockAvatarTalentRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(1, retcode_);
}
if (talentId_ != 0) {
output.writeUInt32(2, talentId_);
output.writeInt32(4, retcode_);
}
if (avatarGuid_ != 0L) {
output.writeUInt64(13, avatarGuid_);
output.writeUInt64(5, avatarGuid_);
}
if (talentId_ != 0) {
output.writeUInt32(13, talentId_);
}
unknownFields.writeTo(output);
}
@@ -326,15 +200,15 @@ public final class UnlockAvatarTalentRspOuterClass {
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(1, retcode_);
}
if (talentId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, talentId_);
.computeInt32Size(4, retcode_);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(13, avatarGuid_);
.computeUInt64Size(5, avatarGuid_);
}
if (talentId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, talentId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -351,12 +225,12 @@ public final class UnlockAvatarTalentRspOuterClass {
}
emu.grasscutter.net.proto.UnlockAvatarTalentRspOuterClass.UnlockAvatarTalentRsp other = (emu.grasscutter.net.proto.UnlockAvatarTalentRspOuterClass.UnlockAvatarTalentRsp) obj;
if (getRetcode()
!= other.getRetcode()) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (getTalentId()
!= other.getTalentId()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -368,13 +242,13 @@ public final class UnlockAvatarTalentRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + AVATARGUID_FIELD_NUMBER;
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (37 * hash) + TALENTID_FIELD_NUMBER;
hash = (37 * hash) + TALENT_ID_FIELD_NUMBER;
hash = (53 * hash) + getTalentId();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -471,6 +345,11 @@ public final class UnlockAvatarTalentRspOuterClass {
return builder;
}
/**
* <pre>
* Name: EFFKKHNDIAF
* CmdId: 1075
* </pre>
*
* Protobuf type {@code UnlockAvatarTalentRsp}
*/
public static final class Builder extends
@@ -508,12 +387,12 @@ public final class UnlockAvatarTalentRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
retcode_ = 0;
avatarGuid_ = 0L;
talentId_ = 0;
retcode_ = 0;
return this;
}
@@ -540,9 +419,9 @@ public final class UnlockAvatarTalentRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.UnlockAvatarTalentRspOuterClass.UnlockAvatarTalentRsp buildPartial() {
emu.grasscutter.net.proto.UnlockAvatarTalentRspOuterClass.UnlockAvatarTalentRsp result = new emu.grasscutter.net.proto.UnlockAvatarTalentRspOuterClass.UnlockAvatarTalentRsp(this);
result.retcode_ = retcode_;
result.avatarGuid_ = avatarGuid_;
result.talentId_ = talentId_;
result.retcode_ = retcode_;
onBuilt();
return result;
}
@@ -591,15 +470,15 @@ public final class UnlockAvatarTalentRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.UnlockAvatarTalentRspOuterClass.UnlockAvatarTalentRsp other) {
if (other == emu.grasscutter.net.proto.UnlockAvatarTalentRspOuterClass.UnlockAvatarTalentRsp.getDefaultInstance()) return this;
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
if (other.getTalentId() != 0) {
setTalentId(other.getTalentId());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -629,40 +508,9 @@ public final class UnlockAvatarTalentRspOuterClass {
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 1;</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 = 1;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatarGuid = 13;</code>
* <code>uint64 avatar_guid = 5;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -670,7 +518,7 @@ public final class UnlockAvatarTalentRspOuterClass {
return avatarGuid_;
}
/**
* <code>uint64 avatarGuid = 13;</code>
* <code>uint64 avatar_guid = 5;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
@@ -681,7 +529,7 @@ public final class UnlockAvatarTalentRspOuterClass {
return this;
}
/**
* <code>uint64 avatarGuid = 13;</code>
* <code>uint64 avatar_guid = 5;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
@@ -693,7 +541,7 @@ public final class UnlockAvatarTalentRspOuterClass {
private int talentId_ ;
/**
* <code>uint32 talentId = 2;</code>
* <code>uint32 talent_id = 13;</code>
* @return The talentId.
*/
@java.lang.Override
@@ -701,7 +549,7 @@ public final class UnlockAvatarTalentRspOuterClass {
return talentId_;
}
/**
* <code>uint32 talentId = 2;</code>
* <code>uint32 talent_id = 13;</code>
* @param value The talentId to set.
* @return This builder for chaining.
*/
@@ -712,7 +560,7 @@ public final class UnlockAvatarTalentRspOuterClass {
return this;
}
/**
* <code>uint32 talentId = 2;</code>
* <code>uint32 talent_id = 13;</code>
* @return This builder for chaining.
*/
public Builder clearTalentId() {
@@ -721,6 +569,37 @@ public final class UnlockAvatarTalentRspOuterClass {
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 4;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 4;</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 = 4;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -788,11 +667,9 @@ public final class UnlockAvatarTalentRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\033UnlockAvatarTalentRsp.proto\"\237\001\n\025Unlock" +
"AvatarTalentRsp\022\017\n\007retcode\030\001 \001(\005\022\022\n\navat" +
"arGuid\030\r \001(\004\022\020\n\010talentId\030\002 \001(\r\"O\n\013DCIFFO" +
"CCBNH\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\237\010\022\017\n\013DCD" +
"NILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.g" +
"\n\033UnlockAvatarTalentRsp.proto\"P\n\025UnlockA" +
"vatarTalentRsp\022\023\n\013avatar_guid\030\005 \001(\004\022\021\n\tt" +
"alent_id\030\r \001(\r\022\017\n\007retcode\030\004 \001(\005B\033\n\031emu.g" +
"rasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -804,7 +681,7 @@ public final class UnlockAvatarTalentRspOuterClass {
internal_static_UnlockAvatarTalentRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_UnlockAvatarTalentRsp_descriptor,
new java.lang.String[] { "Retcode", "AvatarGuid", "TalentId", });
new java.lang.String[] { "AvatarGuid", "TalentId", "Retcode", });
}
// @@protoc_insertion_point(outer_class_scope)