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

Upgrade to REL3.7 (#2164)

Browse Source 
* Remove hardcoded quest data

* Remove deprecated fields

* Try to fix packet

* Apply fix for token exchange

* Upgrade to REL3.7

* Add obfuscated protocol definitions

* Add missing enum (other protos too maybe)

* Re-add field setters and add note on removal
This commit is contained in:
Magix
2023-05-26 21:29:02 -07:00
committed by GitHub
Unverified
parent 19bf2dfc69
commit 71f6198361
1382 changed files with 227149 additions and 199653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/ProudSkillExtraLevelNotifyOuterClass.java
+157 -217
View File
@@ -19,45 +19,33 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 avatar_guid = 15;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <pre>
* CBAGHCLLOCO
* </pre>
*
* <code>uint32 talent_index = 10;</code>
* <code>uint32 talent_index = 12;</code>
* @return The talentIndex.
*/
int getTalentIndex();
/**
* <pre>
* KPPFFPBNNAC
* </pre>
*
* <code>uint32 talent_type = 3;</code>
* @return The talentType.
*/
int getTalentType();
/**
* <pre>
* LDLMAGLNLEA
* </pre>
*
* <code>uint32 extra_level = 4;</code>
* <code>uint32 extra_level = 5;</code>
* @return The extraLevel.
*/
int getExtraLevel();
/**
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>uint32 talent_type = 6;</code>
* @return The talentType.
*/
int getTalentType();
}
/**
* <pre>
* CmdId: 1099
* Name: FHFLCAHNFCP
* CmdId: 1094
* Obf: GCKJMOIPFPE
* </pre>
*
* Protobuf type {@code ProudSkillExtraLevelNotify}
@@ -104,22 +92,22 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
case 0:
done = true;
break;
case 24: {
talentType_ = input.readUInt32();
break;
}
case 32: {
case 40: {
extraLevel_ = input.readUInt32();
break;
}
case 80: {
case 48: {
talentType_ = input.readUInt32();
break;
}
case 96: {
talentIndex_ = input.readUInt32();
break;
}
case 120: {
case 104: {
avatarGuid_ = input.readUInt64();
break;
@@ -156,25 +144,10 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify.class, emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify.Builder.class);
}
public static final int AVATAR_GUID_FIELD_NUMBER = 15;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 15;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
public static final int TALENT_INDEX_FIELD_NUMBER = 10;
public static final int TALENT_INDEX_FIELD_NUMBER = 12;
private int talentIndex_;
/**
* <pre>
* CBAGHCLLOCO
* </pre>
*
* <code>uint32 talent_index = 10;</code>
* <code>uint32 talent_index = 12;</code>
* @return The talentIndex.
*/
@java.lang.Override
@@ -182,29 +155,10 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
return talentIndex_;
}
public static final int TALENT_TYPE_FIELD_NUMBER = 3;
private int talentType_;
/**
* <pre>
* KPPFFPBNNAC
* </pre>
*
* <code>uint32 talent_type = 3;</code>
* @return The talentType.
*/
@java.lang.Override
public int getTalentType() {
return talentType_;
}
public static final int EXTRA_LEVEL_FIELD_NUMBER = 4;
public static final int EXTRA_LEVEL_FIELD_NUMBER = 5;
private int extraLevel_;
/**
* <pre>
* LDLMAGLNLEA
* </pre>
*
* <code>uint32 extra_level = 4;</code>
* <code>uint32 extra_level = 5;</code>
* @return The extraLevel.
*/
@java.lang.Override
@@ -212,6 +166,28 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
return extraLevel_;
}
public static final int AVATAR_GUID_FIELD_NUMBER = 13;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
public static final int TALENT_TYPE_FIELD_NUMBER = 6;
private int talentType_;
/**
* <code>uint32 talent_type = 6;</code>
* @return The talentType.
*/
@java.lang.Override
public int getTalentType() {
return talentType_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -226,17 +202,17 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (talentType_ != 0) {
output.writeUInt32(3, talentType_);
}
if (extraLevel_ != 0) {
output.writeUInt32(4, extraLevel_);
output.writeUInt32(5, extraLevel_);
}
if (talentType_ != 0) {
output.writeUInt32(6, talentType_);
}
if (talentIndex_ != 0) {
output.writeUInt32(10, talentIndex_);
output.writeUInt32(12, talentIndex_);
}
if (avatarGuid_ != 0L) {
output.writeUInt64(15, avatarGuid_);
output.writeUInt64(13, avatarGuid_);
}
unknownFields.writeTo(output);
}
@@ -247,21 +223,21 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (talentType_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, talentType_);
}
if (extraLevel_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, extraLevel_);
.computeUInt32Size(5, extraLevel_);
}
if (talentType_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, talentType_);
}
if (talentIndex_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, talentIndex_);
.computeUInt32Size(12, talentIndex_);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(15, avatarGuid_);
.computeUInt64Size(13, avatarGuid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -278,14 +254,14 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
}
emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify other = (emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify) obj;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (getTalentIndex()
!= other.getTalentIndex()) return false;
if (getTalentType()
!= other.getTalentType()) return false;
if (getExtraLevel()
!= other.getExtraLevel()) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (getTalentType()
!= other.getTalentType()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -297,15 +273,15 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TALENT_INDEX_FIELD_NUMBER;
hash = (53 * hash) + getTalentIndex();
hash = (37 * hash) + EXTRA_LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getExtraLevel();
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (37 * hash) + TALENT_INDEX_FIELD_NUMBER;
hash = (53 * hash) + getTalentIndex();
hash = (37 * hash) + TALENT_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getTalentType();
hash = (37 * hash) + EXTRA_LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getExtraLevel();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -403,8 +379,8 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1099
* Name: FHFLCAHNFCP
* CmdId: 1094
* Obf: GCKJMOIPFPE
* </pre>
*
* Protobuf type {@code ProudSkillExtraLevelNotify}
@@ -444,14 +420,14 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
avatarGuid_ = 0L;
talentIndex_ = 0;
talentType_ = 0;
extraLevel_ = 0;
avatarGuid_ = 0L;
talentType_ = 0;
return this;
}
@@ -478,10 +454,10 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify buildPartial() {
emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify result = new emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify(this);
result.avatarGuid_ = avatarGuid_;
result.talentIndex_ = talentIndex_;
result.talentType_ = talentType_;
result.extraLevel_ = extraLevel_;
result.avatarGuid_ = avatarGuid_;
result.talentType_ = talentType_;
onBuilt();
return result;
}
@@ -530,18 +506,18 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify other) {
if (other == emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify.getDefaultInstance()) return this;
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
if (other.getTalentIndex() != 0) {
setTalentIndex(other.getTalentIndex());
}
if (other.getTalentType() != 0) {
setTalentType(other.getTalentType());
}
if (other.getExtraLevel() != 0) {
setExtraLevel(other.getExtraLevel());
}
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
if (other.getTalentType() != 0) {
setTalentType(other.getTalentType());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -571,44 +547,9 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 15;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 15;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuid(long value) {
avatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 avatar_guid = 15;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
private int talentIndex_ ;
/**
* <pre>
* CBAGHCLLOCO
* </pre>
*
* <code>uint32 talent_index = 10;</code>
* <code>uint32 talent_index = 12;</code>
* @return The talentIndex.
*/
@java.lang.Override
@@ -616,11 +557,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
return talentIndex_;
}
/**
* <pre>
* CBAGHCLLOCO
* </pre>
*
* <code>uint32 talent_index = 10;</code>
* <code>uint32 talent_index = 12;</code>
* @param value The talentIndex to set.
* @return This builder for chaining.
*/
@@ -631,11 +568,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
return this;
}
/**
* <pre>
* CBAGHCLLOCO
* </pre>
*
* <code>uint32 talent_index = 10;</code>
* <code>uint32 talent_index = 12;</code>
* @return This builder for chaining.
*/
public Builder clearTalentIndex() {
@@ -645,56 +578,9 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
return this;
}
private int talentType_ ;
/**
* <pre>
* KPPFFPBNNAC
* </pre>
*
* <code>uint32 talent_type = 3;</code>
* @return The talentType.
*/
@java.lang.Override
public int getTalentType() {
return talentType_;
}
/**
* <pre>
* KPPFFPBNNAC
* </pre>
*
* <code>uint32 talent_type = 3;</code>
* @param value The talentType to set.
* @return This builder for chaining.
*/
public Builder setTalentType(int value) {
talentType_ = value;
onChanged();
return this;
}
/**
* <pre>
* KPPFFPBNNAC
* </pre>
*
* <code>uint32 talent_type = 3;</code>
* @return This builder for chaining.
*/
public Builder clearTalentType() {
talentType_ = 0;
onChanged();
return this;
}
private int extraLevel_ ;
/**
* <pre>
* LDLMAGLNLEA
* </pre>
*
* <code>uint32 extra_level = 4;</code>
* <code>uint32 extra_level = 5;</code>
* @return The extraLevel.
*/
@java.lang.Override
@@ -702,11 +588,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
return extraLevel_;
}
/**
* <pre>
* LDLMAGLNLEA
* </pre>
*
* <code>uint32 extra_level = 4;</code>
* <code>uint32 extra_level = 5;</code>
* @param value The extraLevel to set.
* @return This builder for chaining.
*/
@@ -717,11 +599,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
return this;
}
/**
* <pre>
* LDLMAGLNLEA
* </pre>
*
* <code>uint32 extra_level = 4;</code>
* <code>uint32 extra_level = 5;</code>
* @return This builder for chaining.
*/
public Builder clearExtraLevel() {
@@ -730,6 +608,68 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
onChanged();
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 13;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuid(long value) {
avatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 avatar_guid = 13;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
private int talentType_ ;
/**
* <code>uint32 talent_type = 6;</code>
* @return The talentType.
*/
@java.lang.Override
public int getTalentType() {
return talentType_;
}
/**
* <code>uint32 talent_type = 6;</code>
* @param value The talentType to set.
* @return This builder for chaining.
*/
public Builder setTalentType(int value) {
talentType_ = value;
onChanged();
return this;
}
/**
* <code>uint32 talent_type = 6;</code>
* @return This builder for chaining.
*/
public Builder clearTalentType() {
talentType_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -798,9 +738,9 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n ProudSkillExtraLevelNotify.proto\"q\n\032Pr" +
"oudSkillExtraLevelNotify\022\023\n\013avatar_guid\030" +
"\017 \001(\004\022\024\n\014talent_index\030\n \001(\r\022\023\n\013talent_ty" +
"pe\030\003 \001(\r\022\023\n\013extra_level\030\004 \001(\rB\033\n\031emu.gra" +
"oudSkillExtraLevelNotify\022\024\n\014talent_index" +
"\030\014 \001(\r\022\023\n\013extra_level\030\005 \001(\r\022\023\n\013avatar_gu" +
"id\030\r \001(\004\022\023\n\013talent_type\030\006 \001(\rB\033\n\031emu.gra" +
"sscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -812,7 +752,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
internal_static_ProudSkillExtraLevelNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ProudSkillExtraLevelNotify_descriptor,
new java.lang.String[] { "AvatarGuid", "TalentIndex", "TalentType", "ExtraLevel", });
new java.lang.String[] { "TalentIndex", "ExtraLevel", "AvatarGuid", "TalentType", });
}
// @@protoc_insertion_point(outer_class_scope)