Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-26 05:19:58 +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/AvatarSkillUpgradeReqOuterClass.java
+95 -95
View File
@@ -19,27 +19,27 @@ public final class AvatarSkillUpgradeReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 avatar_guid = 14;</code>
* <code>uint32 old_level = 10;</code>
* @return The oldLevel.
*/
int getOldLevel();
/**
* <code>uint64 avatar_guid = 2;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>uint32 avatar_skill_id = 7;</code>
* <code>uint32 avatar_skill_id = 8;</code>
* @return The avatarSkillId.
*/
int getAvatarSkillId();
/**
* <code>uint32 old_level = 15;</code>
* @return The oldLevel.
*/
int getOldLevel();
}
/**
* <pre>
* CmdId: 1078
* Name: PPGGAIJGNKM
* CmdId: 1064
* Obf: MDDPDCJCKCB
* </pre>
*
* Protobuf type {@code AvatarSkillUpgradeReq}
@@ -86,17 +86,17 @@ public final class AvatarSkillUpgradeReqOuterClass {
case 0:
done = true;
break;
case 56: {
avatarSkillId_ = input.readUInt32();
break;
}
case 112: {
case 16: {
avatarGuid_ = input.readUInt64();
break;
}
case 120: {
case 64: {
avatarSkillId_ = input.readUInt32();
break;
}
case 80: {
oldLevel_ = input.readUInt32();
break;
@@ -133,10 +133,21 @@ public final class AvatarSkillUpgradeReqOuterClass {
emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq.class, emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq.Builder.class);
}
public static final int AVATAR_GUID_FIELD_NUMBER = 14;
public static final int OLD_LEVEL_FIELD_NUMBER = 10;
private int oldLevel_;
/**
* <code>uint32 old_level = 10;</code>
* @return The oldLevel.
*/
@java.lang.Override
public int getOldLevel() {
return oldLevel_;
}
public static final int AVATAR_GUID_FIELD_NUMBER = 2;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 14;</code>
* <code>uint64 avatar_guid = 2;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -144,10 +155,10 @@ public final class AvatarSkillUpgradeReqOuterClass {
return avatarGuid_;
}
public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 7;
public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 8;
private int avatarSkillId_;
/**
* <code>uint32 avatar_skill_id = 7;</code>
* <code>uint32 avatar_skill_id = 8;</code>
* @return The avatarSkillId.
*/
@java.lang.Override
@@ -155,17 +166,6 @@ public final class AvatarSkillUpgradeReqOuterClass {
return avatarSkillId_;
}
public static final int OLD_LEVEL_FIELD_NUMBER = 15;
private int oldLevel_;
/**
* <code>uint32 old_level = 15;</code>
* @return The oldLevel.
*/
@java.lang.Override
public int getOldLevel() {
return oldLevel_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -180,14 +180,14 @@ public final class AvatarSkillUpgradeReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (avatarSkillId_ != 0) {
output.writeUInt32(7, avatarSkillId_);
}
if (avatarGuid_ != 0L) {
output.writeUInt64(14, avatarGuid_);
output.writeUInt64(2, avatarGuid_);
}
if (avatarSkillId_ != 0) {
output.writeUInt32(8, avatarSkillId_);
}
if (oldLevel_ != 0) {
output.writeUInt32(15, oldLevel_);
output.writeUInt32(10, oldLevel_);
}
unknownFields.writeTo(output);
}
@@ -198,17 +198,17 @@ public final class AvatarSkillUpgradeReqOuterClass {
if (size != -1) return size;
size = 0;
if (avatarSkillId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(7, avatarSkillId_);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(14, avatarGuid_);
.computeUInt64Size(2, avatarGuid_);
}
if (avatarSkillId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, avatarSkillId_);
}
if (oldLevel_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, oldLevel_);
.computeUInt32Size(10, oldLevel_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -225,12 +225,12 @@ public final class AvatarSkillUpgradeReqOuterClass {
}
emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq other = (emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq) obj;
if (getOldLevel()
!= other.getOldLevel()) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (getAvatarSkillId()
!= other.getAvatarSkillId()) return false;
if (getOldLevel()
!= other.getOldLevel()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -242,13 +242,13 @@ public final class AvatarSkillUpgradeReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getOldLevel();
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (37 * hash) + AVATAR_SKILL_ID_FIELD_NUMBER;
hash = (53 * hash) + getAvatarSkillId();
hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getOldLevel();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -346,8 +346,8 @@ public final class AvatarSkillUpgradeReqOuterClass {
}
/**
* <pre>
* CmdId: 1078
* Name: PPGGAIJGNKM
* CmdId: 1064
* Obf: MDDPDCJCKCB
* </pre>
*
* Protobuf type {@code AvatarSkillUpgradeReq}
@@ -387,12 +387,12 @@ public final class AvatarSkillUpgradeReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
oldLevel_ = 0;
avatarGuid_ = 0L;
avatarSkillId_ = 0;
oldLevel_ = 0;
return this;
}
@@ -419,9 +419,9 @@ public final class AvatarSkillUpgradeReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq buildPartial() {
emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq result = new emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq(this);
result.oldLevel_ = oldLevel_;
result.avatarGuid_ = avatarGuid_;
result.avatarSkillId_ = avatarSkillId_;
result.oldLevel_ = oldLevel_;
onBuilt();
return result;
}
@@ -470,15 +470,15 @@ public final class AvatarSkillUpgradeReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq other) {
if (other == emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq.getDefaultInstance()) return this;
if (other.getOldLevel() != 0) {
setOldLevel(other.getOldLevel());
}
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
if (other.getAvatarSkillId() != 0) {
setAvatarSkillId(other.getAvatarSkillId());
}
if (other.getOldLevel() != 0) {
setOldLevel(other.getOldLevel());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -508,9 +508,40 @@ public final class AvatarSkillUpgradeReqOuterClass {
return this;
}
private int oldLevel_ ;
/**
* <code>uint32 old_level = 10;</code>
* @return The oldLevel.
*/
@java.lang.Override
public int getOldLevel() {
return oldLevel_;
}
/**
* <code>uint32 old_level = 10;</code>
* @param value The oldLevel to set.
* @return This builder for chaining.
*/
public Builder setOldLevel(int value) {
oldLevel_ = value;
onChanged();
return this;
}
/**
* <code>uint32 old_level = 10;</code>
* @return This builder for chaining.
*/
public Builder clearOldLevel() {
oldLevel_ = 0;
onChanged();
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 14;</code>
* <code>uint64 avatar_guid = 2;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -518,7 +549,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 14;</code>
* <code>uint64 avatar_guid = 2;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
@@ -529,7 +560,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
return this;
}
/**
* <code>uint64 avatar_guid = 14;</code>
* <code>uint64 avatar_guid = 2;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
@@ -541,7 +572,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
private int avatarSkillId_ ;
/**
* <code>uint32 avatar_skill_id = 7;</code>
* <code>uint32 avatar_skill_id = 8;</code>
* @return The avatarSkillId.
*/
@java.lang.Override
@@ -549,7 +580,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
return avatarSkillId_;
}
/**
* <code>uint32 avatar_skill_id = 7;</code>
* <code>uint32 avatar_skill_id = 8;</code>
* @param value The avatarSkillId to set.
* @return This builder for chaining.
*/
@@ -560,7 +591,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
return this;
}
/**
* <code>uint32 avatar_skill_id = 7;</code>
* <code>uint32 avatar_skill_id = 8;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarSkillId() {
@@ -569,37 +600,6 @@ public final class AvatarSkillUpgradeReqOuterClass {
onChanged();
return this;
}
private int oldLevel_ ;
/**
* <code>uint32 old_level = 15;</code>
* @return The oldLevel.
*/
@java.lang.Override
public int getOldLevel() {
return oldLevel_;
}
/**
* <code>uint32 old_level = 15;</code>
* @param value The oldLevel to set.
* @return This builder for chaining.
*/
public Builder setOldLevel(int value) {
oldLevel_ = value;
onChanged();
return this;
}
/**
* <code>uint32 old_level = 15;</code>
* @return This builder for chaining.
*/
public Builder clearOldLevel() {
oldLevel_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -668,8 +668,8 @@ public final class AvatarSkillUpgradeReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\033AvatarSkillUpgradeReq.proto\"X\n\025AvatarS" +
"killUpgradeReq\022\023\n\013avatar_guid\030\016 \001(\004\022\027\n\017a" +
"vatar_skill_id\030\007 \001(\r\022\021\n\told_level\030\017 \001(\rB" +
"killUpgradeReq\022\021\n\told_level\030\n \001(\r\022\023\n\013ava" +
"tar_guid\030\002 \001(\004\022\027\n\017avatar_skill_id\030\010 \001(\rB" +
"\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +681,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
internal_static_AvatarSkillUpgradeReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarSkillUpgradeReq_descriptor,
new java.lang.String[] { "AvatarGuid", "AvatarSkillId", "OldLevel", });
new java.lang.String[] { "OldLevel", "AvatarGuid", "AvatarSkillId", });
}
// @@protoc_insertion_point(outer_class_scope)