Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 13:13:35 +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/AvatarExpeditionStartReqOuterClass.java
+91 -91
View File
@@ -19,27 +19,27 @@ public final class AvatarExpeditionStartReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 exp_id = 7;</code>
* @return The expId.
*/
int getExpId();
/**
* <code>uint32 hour_time = 3;</code>
* <code>uint32 hour_time = 11;</code>
* @return The hourTime.
*/
int getHourTime();
/**
* <code>uint64 avatar_guid = 12;</code>
* <code>uint32 exp_id = 6;</code>
* @return The expId.
*/
int getExpId();
/**
* <code>uint64 avatar_guid = 3;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
}
/**
* <pre>
* CmdId: 1749
* Name: MBNHDAMLHMP
* CmdId: 1691
* Obf: LONEJHBMOFM
* </pre>
*
* Protobuf type {@code AvatarExpeditionStartReq}
@@ -88,17 +88,17 @@ public final class AvatarExpeditionStartReqOuterClass {
break;
case 24: {
hourTime_ = input.readUInt32();
avatarGuid_ = input.readUInt64();
break;
}
case 56: {
case 48: {
expId_ = input.readUInt32();
break;
}
case 96: {
case 88: {
avatarGuid_ = input.readUInt64();
hourTime_ = input.readUInt32();
break;
}
default: {
@@ -133,21 +133,10 @@ public final class AvatarExpeditionStartReqOuterClass {
emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq.class, emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq.Builder.class);
}
public static final int EXP_ID_FIELD_NUMBER = 7;
private int expId_;
/**
* <code>uint32 exp_id = 7;</code>
* @return The expId.
*/
@java.lang.Override
public int getExpId() {
return expId_;
}
public static final int HOUR_TIME_FIELD_NUMBER = 3;
public static final int HOUR_TIME_FIELD_NUMBER = 11;
private int hourTime_;
/**
* <code>uint32 hour_time = 3;</code>
* <code>uint32 hour_time = 11;</code>
* @return The hourTime.
*/
@java.lang.Override
@@ -155,10 +144,21 @@ public final class AvatarExpeditionStartReqOuterClass {
return hourTime_;
}
public static final int AVATAR_GUID_FIELD_NUMBER = 12;
public static final int EXP_ID_FIELD_NUMBER = 6;
private int expId_;
/**
* <code>uint32 exp_id = 6;</code>
* @return The expId.
*/
@java.lang.Override
public int getExpId() {
return expId_;
}
public static final int AVATAR_GUID_FIELD_NUMBER = 3;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 12;</code>
* <code>uint64 avatar_guid = 3;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -180,14 +180,14 @@ public final class AvatarExpeditionStartReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (hourTime_ != 0) {
output.writeUInt32(3, hourTime_);
if (avatarGuid_ != 0L) {
output.writeUInt64(3, avatarGuid_);
}
if (expId_ != 0) {
output.writeUInt32(7, expId_);
output.writeUInt32(6, expId_);
}
if (avatarGuid_ != 0L) {
output.writeUInt64(12, avatarGuid_);
if (hourTime_ != 0) {
output.writeUInt32(11, hourTime_);
}
unknownFields.writeTo(output);
}
@@ -198,17 +198,17 @@ public final class AvatarExpeditionStartReqOuterClass {
if (size != -1) return size;
size = 0;
if (hourTime_ != 0) {
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, hourTime_);
.computeUInt64Size(3, avatarGuid_);
}
if (expId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(7, expId_);
.computeUInt32Size(6, expId_);
}
if (avatarGuid_ != 0L) {
if (hourTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(12, avatarGuid_);
.computeUInt32Size(11, hourTime_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -225,10 +225,10 @@ public final class AvatarExpeditionStartReqOuterClass {
}
emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq other = (emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq) obj;
if (getExpId()
!= other.getExpId()) return false;
if (getHourTime()
!= other.getHourTime()) return false;
if (getExpId()
!= other.getExpId()) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,10 +242,10 @@ public final class AvatarExpeditionStartReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + EXP_ID_FIELD_NUMBER;
hash = (53 * hash) + getExpId();
hash = (37 * hash) + HOUR_TIME_FIELD_NUMBER;
hash = (53 * hash) + getHourTime();
hash = (37 * hash) + EXP_ID_FIELD_NUMBER;
hash = (53 * hash) + getExpId();
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
@@ -346,8 +346,8 @@ public final class AvatarExpeditionStartReqOuterClass {
}
/**
* <pre>
* CmdId: 1749
* Name: MBNHDAMLHMP
* CmdId: 1691
* Obf: LONEJHBMOFM
* </pre>
*
* Protobuf type {@code AvatarExpeditionStartReq}
@@ -387,10 +387,10 @@ public final class AvatarExpeditionStartReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
expId_ = 0;
hourTime_ = 0;
expId_ = 0;
avatarGuid_ = 0L;
return this;
@@ -419,8 +419,8 @@ public final class AvatarExpeditionStartReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq buildPartial() {
emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq result = new emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq(this);
result.expId_ = expId_;
result.hourTime_ = hourTime_;
result.expId_ = expId_;
result.avatarGuid_ = avatarGuid_;
onBuilt();
return result;
@@ -470,12 +470,12 @@ public final class AvatarExpeditionStartReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq other) {
if (other == emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq.getDefaultInstance()) return this;
if (other.getExpId() != 0) {
setExpId(other.getExpId());
}
if (other.getHourTime() != 0) {
setHourTime(other.getHourTime());
}
if (other.getExpId() != 0) {
setExpId(other.getExpId());
}
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
@@ -508,40 +508,9 @@ public final class AvatarExpeditionStartReqOuterClass {
return this;
}
private int expId_ ;
/**
* <code>uint32 exp_id = 7;</code>
* @return The expId.
*/
@java.lang.Override
public int getExpId() {
return expId_;
}
/**
* <code>uint32 exp_id = 7;</code>
* @param value The expId to set.
* @return This builder for chaining.
*/
public Builder setExpId(int value) {
expId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 exp_id = 7;</code>
* @return This builder for chaining.
*/
public Builder clearExpId() {
expId_ = 0;
onChanged();
return this;
}
private int hourTime_ ;
/**
* <code>uint32 hour_time = 3;</code>
* <code>uint32 hour_time = 11;</code>
* @return The hourTime.
*/
@java.lang.Override
@@ -549,7 +518,7 @@ public final class AvatarExpeditionStartReqOuterClass {
return hourTime_;
}
/**
* <code>uint32 hour_time = 3;</code>
* <code>uint32 hour_time = 11;</code>
* @param value The hourTime to set.
* @return This builder for chaining.
*/
@@ -560,7 +529,7 @@ public final class AvatarExpeditionStartReqOuterClass {
return this;
}
/**
* <code>uint32 hour_time = 3;</code>
* <code>uint32 hour_time = 11;</code>
* @return This builder for chaining.
*/
public Builder clearHourTime() {
@@ -570,9 +539,40 @@ public final class AvatarExpeditionStartReqOuterClass {
return this;
}
private int expId_ ;
/**
* <code>uint32 exp_id = 6;</code>
* @return The expId.
*/
@java.lang.Override
public int getExpId() {
return expId_;
}
/**
* <code>uint32 exp_id = 6;</code>
* @param value The expId to set.
* @return This builder for chaining.
*/
public Builder setExpId(int value) {
expId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 exp_id = 6;</code>
* @return This builder for chaining.
*/
public Builder clearExpId() {
expId_ = 0;
onChanged();
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 12;</code>
* <code>uint64 avatar_guid = 3;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -580,7 +580,7 @@ public final class AvatarExpeditionStartReqOuterClass {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 12;</code>
* <code>uint64 avatar_guid = 3;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
@@ -591,7 +591,7 @@ public final class AvatarExpeditionStartReqOuterClass {
return this;
}
/**
* <code>uint64 avatar_guid = 12;</code>
* <code>uint64 avatar_guid = 3;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
@@ -668,8 +668,8 @@ public final class AvatarExpeditionStartReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\036AvatarExpeditionStartReq.proto\"R\n\030Avat" +
"arExpeditionStartReq\022\016\n\006exp_id\030\007 \001(\r\022\021\n\t" +
"hour_time\030\003 \001(\r\022\023\n\013avatar_guid\030\014 \001(\004B\033\n\031" +
"arExpeditionStartReq\022\021\n\thour_time\030\013 \001(\r\022" +
"\016\n\006exp_id\030\006 \001(\r\022\023\n\013avatar_guid\030\003 \001(\004B\033\n\031" +
"emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +681,7 @@ public final class AvatarExpeditionStartReqOuterClass {
internal_static_AvatarExpeditionStartReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarExpeditionStartReq_descriptor,
new java.lang.String[] { "ExpId", "HourTime", "AvatarGuid", });
new java.lang.String[] { "HourTime", "ExpId", "AvatarGuid", });
}
// @@protoc_insertion_point(outer_class_scope)