mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-23 10:39:54 +08:00
Upgrade to REL3.7 (#2164)
* 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:
@@ -19,21 +19,21 @@ public final class QuestTransmitReqOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 point_id = 2;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
int getPointId();
|
||||
|
||||
/**
|
||||
* <code>uint32 quest_id = 3;</code>
|
||||
* <code>uint32 quest_id = 8;</code>
|
||||
* @return The questId.
|
||||
*/
|
||||
int getQuestId();
|
||||
|
||||
/**
|
||||
* <code>uint32 point_id = 13;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
int getPointId();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 433
|
||||
* Name: INOINOLAGLI
|
||||
* CmdId: 442
|
||||
* Obf: NBIBEFFJOJP
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code QuestTransmitReq}
|
||||
@@ -80,16 +80,16 @@ public final class QuestTransmitReqOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 16: {
|
||||
|
||||
pointId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 24: {
|
||||
case 64: {
|
||||
|
||||
questId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 104: {
|
||||
|
||||
pointId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
if (!parseUnknownField(
|
||||
input, unknownFields, extensionRegistry, tag)) {
|
||||
@@ -122,21 +122,10 @@ public final class QuestTransmitReqOuterClass {
|
||||
emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq.class, emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq.Builder.class);
|
||||
}
|
||||
|
||||
public static final int POINT_ID_FIELD_NUMBER = 2;
|
||||
private int pointId_;
|
||||
/**
|
||||
* <code>uint32 point_id = 2;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getPointId() {
|
||||
return pointId_;
|
||||
}
|
||||
|
||||
public static final int QUEST_ID_FIELD_NUMBER = 3;
|
||||
public static final int QUEST_ID_FIELD_NUMBER = 8;
|
||||
private int questId_;
|
||||
/**
|
||||
* <code>uint32 quest_id = 3;</code>
|
||||
* <code>uint32 quest_id = 8;</code>
|
||||
* @return The questId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -144,6 +133,17 @@ public final class QuestTransmitReqOuterClass {
|
||||
return questId_;
|
||||
}
|
||||
|
||||
public static final int POINT_ID_FIELD_NUMBER = 13;
|
||||
private int pointId_;
|
||||
/**
|
||||
* <code>uint32 point_id = 13;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getPointId() {
|
||||
return pointId_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -158,11 +158,11 @@ public final class QuestTransmitReqOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (pointId_ != 0) {
|
||||
output.writeUInt32(2, pointId_);
|
||||
}
|
||||
if (questId_ != 0) {
|
||||
output.writeUInt32(3, questId_);
|
||||
output.writeUInt32(8, questId_);
|
||||
}
|
||||
if (pointId_ != 0) {
|
||||
output.writeUInt32(13, pointId_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -173,13 +173,13 @@ public final class QuestTransmitReqOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (pointId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(2, pointId_);
|
||||
}
|
||||
if (questId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(3, questId_);
|
||||
.computeUInt32Size(8, questId_);
|
||||
}
|
||||
if (pointId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(13, pointId_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -196,10 +196,10 @@ public final class QuestTransmitReqOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq other = (emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq) obj;
|
||||
|
||||
if (getPointId()
|
||||
!= other.getPointId()) return false;
|
||||
if (getQuestId()
|
||||
!= other.getQuestId()) return false;
|
||||
if (getPointId()
|
||||
!= other.getPointId()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -211,10 +211,10 @@ public final class QuestTransmitReqOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getPointId();
|
||||
hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getQuestId();
|
||||
hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getPointId();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -312,8 +312,8 @@ public final class QuestTransmitReqOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 433
|
||||
* Name: INOINOLAGLI
|
||||
* CmdId: 442
|
||||
* Obf: NBIBEFFJOJP
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code QuestTransmitReq}
|
||||
@@ -353,10 +353,10 @@ public final class QuestTransmitReqOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
pointId_ = 0;
|
||||
|
||||
questId_ = 0;
|
||||
|
||||
pointId_ = 0;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -383,8 +383,8 @@ public final class QuestTransmitReqOuterClass {
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq buildPartial() {
|
||||
emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq result = new emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq(this);
|
||||
result.pointId_ = pointId_;
|
||||
result.questId_ = questId_;
|
||||
result.pointId_ = pointId_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -433,12 +433,12 @@ public final class QuestTransmitReqOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq other) {
|
||||
if (other == emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq.getDefaultInstance()) return this;
|
||||
if (other.getPointId() != 0) {
|
||||
setPointId(other.getPointId());
|
||||
}
|
||||
if (other.getQuestId() != 0) {
|
||||
setQuestId(other.getQuestId());
|
||||
}
|
||||
if (other.getPointId() != 0) {
|
||||
setPointId(other.getPointId());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -468,40 +468,9 @@ public final class QuestTransmitReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int pointId_ ;
|
||||
/**
|
||||
* <code>uint32 point_id = 2;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getPointId() {
|
||||
return pointId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 point_id = 2;</code>
|
||||
* @param value The pointId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setPointId(int value) {
|
||||
|
||||
pointId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 point_id = 2;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearPointId() {
|
||||
|
||||
pointId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int questId_ ;
|
||||
/**
|
||||
* <code>uint32 quest_id = 3;</code>
|
||||
* <code>uint32 quest_id = 8;</code>
|
||||
* @return The questId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -509,7 +478,7 @@ public final class QuestTransmitReqOuterClass {
|
||||
return questId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 quest_id = 3;</code>
|
||||
* <code>uint32 quest_id = 8;</code>
|
||||
* @param value The questId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -520,7 +489,7 @@ public final class QuestTransmitReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 quest_id = 3;</code>
|
||||
* <code>uint32 quest_id = 8;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearQuestId() {
|
||||
@@ -529,6 +498,37 @@ public final class QuestTransmitReqOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int pointId_ ;
|
||||
/**
|
||||
* <code>uint32 point_id = 13;</code>
|
||||
* @return The pointId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getPointId() {
|
||||
return pointId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 point_id = 13;</code>
|
||||
* @param value The pointId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setPointId(int value) {
|
||||
|
||||
pointId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 point_id = 13;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearPointId() {
|
||||
|
||||
pointId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -597,7 +597,7 @@ public final class QuestTransmitReqOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\026QuestTransmitReq.proto\"6\n\020QuestTransmi" +
|
||||
"tReq\022\020\n\010point_id\030\002 \001(\r\022\020\n\010quest_id\030\003 \001(\r" +
|
||||
"tReq\022\020\n\010quest_id\030\010 \001(\r\022\020\n\010point_id\030\r \001(\r" +
|
||||
"B\033\n\031emu.grasscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -609,7 +609,7 @@ public final class QuestTransmitReqOuterClass {
|
||||
internal_static_QuestTransmitReq_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_QuestTransmitReq_descriptor,
|
||||
new java.lang.String[] { "PointId", "QuestId", });
|
||||
new java.lang.String[] { "QuestId", "PointId", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user