Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 08:09:49 +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/QuestUpdateQuestVarRspOuterClass.java
+130 -130
View File
@@ -19,33 +19,33 @@ public final class QuestUpdateQuestVarRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 parent_quest_id = 12;</code>
* @return The parentQuestId.
*/
int getParentQuestId();
/**
* <code>uint32 parent_quest_var_seq = 10;</code>
* <code>uint32 parent_quest_var_seq = 12;</code>
* @return The parentQuestVarSeq.
*/
int getParentQuestVarSeq();
/**
* <code>uint32 quest_id = 14;</code>
* @return The questId.
* <code>uint32 parent_quest_id = 5;</code>
* @return The parentQuestId.
*/
int getQuestId();
int getParentQuestId();
/**
* <code>int32 retcode = 6;</code>
* <code>int32 retcode = 14;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 quest_id = 15;</code>
* @return The questId.
*/
int getQuestId();
}
/**
* <pre>
* CmdId: 442
* Name: GDOPKNJDFAL
* CmdId: 488
* Obf: DDAOEAHEAEK
* </pre>
*
* Protobuf type {@code QuestUpdateQuestVarRsp}
@@ -92,23 +92,23 @@ public final class QuestUpdateQuestVarRspOuterClass {
case 0:
done = true;
break;
case 48: {
retcode_ = input.readInt32();
break;
}
case 80: {
parentQuestVarSeq_ = input.readUInt32();
break;
}
case 96: {
case 40: {
parentQuestId_ = input.readUInt32();
break;
}
case 96: {
parentQuestVarSeq_ = input.readUInt32();
break;
}
case 112: {
retcode_ = input.readInt32();
break;
}
case 120: {
questId_ = input.readUInt32();
break;
}
@@ -144,21 +144,10 @@ public final class QuestUpdateQuestVarRspOuterClass {
emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp.class, emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp.Builder.class);
}
public static final int PARENT_QUEST_ID_FIELD_NUMBER = 12;
private int parentQuestId_;
/**
* <code>uint32 parent_quest_id = 12;</code>
* @return The parentQuestId.
*/
@java.lang.Override
public int getParentQuestId() {
return parentQuestId_;
}
public static final int PARENT_QUEST_VAR_SEQ_FIELD_NUMBER = 10;
public static final int PARENT_QUEST_VAR_SEQ_FIELD_NUMBER = 12;
private int parentQuestVarSeq_;
/**
* <code>uint32 parent_quest_var_seq = 10;</code>
* <code>uint32 parent_quest_var_seq = 12;</code>
* @return The parentQuestVarSeq.
*/
@java.lang.Override
@@ -166,21 +155,21 @@ public final class QuestUpdateQuestVarRspOuterClass {
return parentQuestVarSeq_;
}
public static final int QUEST_ID_FIELD_NUMBER = 14;
private int questId_;
public static final int PARENT_QUEST_ID_FIELD_NUMBER = 5;
private int parentQuestId_;
/**
* <code>uint32 quest_id = 14;</code>
* @return The questId.
* <code>uint32 parent_quest_id = 5;</code>
* @return The parentQuestId.
*/
@java.lang.Override
public int getQuestId() {
return questId_;
public int getParentQuestId() {
return parentQuestId_;
}
public static final int RETCODE_FIELD_NUMBER = 6;
public static final int RETCODE_FIELD_NUMBER = 14;
private int retcode_;
/**
* <code>int32 retcode = 6;</code>
* <code>int32 retcode = 14;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -188,6 +177,17 @@ public final class QuestUpdateQuestVarRspOuterClass {
return retcode_;
}
public static final int QUEST_ID_FIELD_NUMBER = 15;
private int questId_;
/**
* <code>uint32 quest_id = 15;</code>
* @return The questId.
*/
@java.lang.Override
public int getQuestId() {
return questId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -202,17 +202,17 @@ public final class QuestUpdateQuestVarRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(6, retcode_);
if (parentQuestId_ != 0) {
output.writeUInt32(5, parentQuestId_);
}
if (parentQuestVarSeq_ != 0) {
output.writeUInt32(10, parentQuestVarSeq_);
output.writeUInt32(12, parentQuestVarSeq_);
}
if (parentQuestId_ != 0) {
output.writeUInt32(12, parentQuestId_);
if (retcode_ != 0) {
output.writeInt32(14, retcode_);
}
if (questId_ != 0) {
output.writeUInt32(14, questId_);
output.writeUInt32(15, questId_);
}
unknownFields.writeTo(output);
}
@@ -223,21 +223,21 @@ public final class QuestUpdateQuestVarRspOuterClass {
if (size != -1) return size;
size = 0;
if (retcode_ != 0) {
if (parentQuestId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(6, retcode_);
.computeUInt32Size(5, parentQuestId_);
}
if (parentQuestVarSeq_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, parentQuestVarSeq_);
.computeUInt32Size(12, parentQuestVarSeq_);
}
if (parentQuestId_ != 0) {
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, parentQuestId_);
.computeInt32Size(14, retcode_);
}
if (questId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, questId_);
.computeUInt32Size(15, questId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -254,14 +254,14 @@ public final class QuestUpdateQuestVarRspOuterClass {
}
emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp other = (emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp) obj;
if (getParentQuestId()
!= other.getParentQuestId()) return false;
if (getParentQuestVarSeq()
!= other.getParentQuestVarSeq()) return false;
if (getQuestId()
!= other.getQuestId()) return false;
if (getParentQuestId()
!= other.getParentQuestId()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (getQuestId()
!= other.getQuestId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -273,14 +273,14 @@ public final class QuestUpdateQuestVarRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER;
hash = (53 * hash) + getParentQuestId();
hash = (37 * hash) + PARENT_QUEST_VAR_SEQ_FIELD_NUMBER;
hash = (53 * hash) + getParentQuestVarSeq();
hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
hash = (53 * hash) + getQuestId();
hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER;
hash = (53 * hash) + getParentQuestId();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
hash = (53 * hash) + getQuestId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -378,8 +378,8 @@ public final class QuestUpdateQuestVarRspOuterClass {
}
/**
* <pre>
* CmdId: 442
* Name: GDOPKNJDFAL
* CmdId: 488
* Obf: DDAOEAHEAEK
* </pre>
*
* Protobuf type {@code QuestUpdateQuestVarRsp}
@@ -419,14 +419,14 @@ public final class QuestUpdateQuestVarRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
parentQuestId_ = 0;
parentQuestVarSeq_ = 0;
questId_ = 0;
parentQuestId_ = 0;
retcode_ = 0;
questId_ = 0;
return this;
}
@@ -453,10 +453,10 @@ public final class QuestUpdateQuestVarRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp buildPartial() {
emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp result = new emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp(this);
result.parentQuestId_ = parentQuestId_;
result.parentQuestVarSeq_ = parentQuestVarSeq_;
result.questId_ = questId_;
result.parentQuestId_ = parentQuestId_;
result.retcode_ = retcode_;
result.questId_ = questId_;
onBuilt();
return result;
}
@@ -505,18 +505,18 @@ public final class QuestUpdateQuestVarRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp other) {
if (other == emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp.getDefaultInstance()) return this;
if (other.getParentQuestId() != 0) {
setParentQuestId(other.getParentQuestId());
}
if (other.getParentQuestVarSeq() != 0) {
setParentQuestVarSeq(other.getParentQuestVarSeq());
}
if (other.getQuestId() != 0) {
setQuestId(other.getQuestId());
if (other.getParentQuestId() != 0) {
setParentQuestId(other.getParentQuestId());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getQuestId() != 0) {
setQuestId(other.getQuestId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -546,40 +546,9 @@ public final class QuestUpdateQuestVarRspOuterClass {
return this;
}
private int parentQuestId_ ;
/**
* <code>uint32 parent_quest_id = 12;</code>
* @return The parentQuestId.
*/
@java.lang.Override
public int getParentQuestId() {
return parentQuestId_;
}
/**
* <code>uint32 parent_quest_id = 12;</code>
* @param value The parentQuestId to set.
* @return This builder for chaining.
*/
public Builder setParentQuestId(int value) {
parentQuestId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 parent_quest_id = 12;</code>
* @return This builder for chaining.
*/
public Builder clearParentQuestId() {
parentQuestId_ = 0;
onChanged();
return this;
}
private int parentQuestVarSeq_ ;
/**
* <code>uint32 parent_quest_var_seq = 10;</code>
* <code>uint32 parent_quest_var_seq = 12;</code>
* @return The parentQuestVarSeq.
*/
@java.lang.Override
@@ -587,7 +556,7 @@ public final class QuestUpdateQuestVarRspOuterClass {
return parentQuestVarSeq_;
}
/**
* <code>uint32 parent_quest_var_seq = 10;</code>
* <code>uint32 parent_quest_var_seq = 12;</code>
* @param value The parentQuestVarSeq to set.
* @return This builder for chaining.
*/
@@ -598,7 +567,7 @@ public final class QuestUpdateQuestVarRspOuterClass {
return this;
}
/**
* <code>uint32 parent_quest_var_seq = 10;</code>
* <code>uint32 parent_quest_var_seq = 12;</code>
* @return This builder for chaining.
*/
public Builder clearParentQuestVarSeq() {
@@ -608,40 +577,40 @@ public final class QuestUpdateQuestVarRspOuterClass {
return this;
}
private int questId_ ;
private int parentQuestId_ ;
/**
* <code>uint32 quest_id = 14;</code>
* @return The questId.
* <code>uint32 parent_quest_id = 5;</code>
* @return The parentQuestId.
*/
@java.lang.Override
public int getQuestId() {
return questId_;
public int getParentQuestId() {
return parentQuestId_;
}
/**
* <code>uint32 quest_id = 14;</code>
* @param value The questId to set.
* <code>uint32 parent_quest_id = 5;</code>
* @param value The parentQuestId to set.
* @return This builder for chaining.
*/
public Builder setQuestId(int value) {
public Builder setParentQuestId(int value) {
questId_ = value;
parentQuestId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 quest_id = 14;</code>
* <code>uint32 parent_quest_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearQuestId() {
public Builder clearParentQuestId() {
questId_ = 0;
parentQuestId_ = 0;
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 6;</code>
* <code>int32 retcode = 14;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -649,7 +618,7 @@ public final class QuestUpdateQuestVarRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 6;</code>
* <code>int32 retcode = 14;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -660,7 +629,7 @@ public final class QuestUpdateQuestVarRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 6;</code>
* <code>int32 retcode = 14;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -669,6 +638,37 @@ public final class QuestUpdateQuestVarRspOuterClass {
onChanged();
return this;
}
private int questId_ ;
/**
* <code>uint32 quest_id = 15;</code>
* @return The questId.
*/
@java.lang.Override
public int getQuestId() {
return questId_;
}
/**
* <code>uint32 quest_id = 15;</code>
* @param value The questId to set.
* @return This builder for chaining.
*/
public Builder setQuestId(int value) {
questId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 quest_id = 15;</code>
* @return This builder for chaining.
*/
public Builder clearQuestId() {
questId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -737,9 +737,9 @@ public final class QuestUpdateQuestVarRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\034QuestUpdateQuestVarRsp.proto\"r\n\026QuestU" +
"pdateQuestVarRsp\022\027\n\017parent_quest_id\030\014 \001(" +
"\r\022\034\n\024parent_quest_var_seq\030\n \001(\r\022\020\n\010quest" +
"_id\030\016 \001(\r\022\017\n\007retcode\030\006 \001(\005B\033\n\031emu.grassc" +
"pdateQuestVarRsp\022\034\n\024parent_quest_var_seq" +
"\030\014 \001(\r\022\027\n\017parent_quest_id\030\005 \001(\r\022\017\n\007retco" +
"de\030\016 \001(\005\022\020\n\010quest_id\030\017 \001(\rB\033\n\031emu.grassc" +
"utter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -751,7 +751,7 @@ public final class QuestUpdateQuestVarRspOuterClass {
internal_static_QuestUpdateQuestVarRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_QuestUpdateQuestVarRsp_descriptor,
new java.lang.String[] { "ParentQuestId", "ParentQuestVarSeq", "QuestId", "Retcode", });
new java.lang.String[] { "ParentQuestVarSeq", "ParentQuestId", "Retcode", "QuestId", });
}
// @@protoc_insertion_point(outer_class_scope)