mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-23 19:29:50 +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 SetOpenStateReqOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 key = 3;</code>
|
||||
* @return The key.
|
||||
*/
|
||||
int getKey();
|
||||
|
||||
/**
|
||||
* <code>uint32 value = 14;</code>
|
||||
* <code>uint32 value = 12;</code>
|
||||
* @return The value.
|
||||
*/
|
||||
int getValue();
|
||||
|
||||
/**
|
||||
* <code>uint32 key = 5;</code>
|
||||
* @return The key.
|
||||
*/
|
||||
int getKey();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 186
|
||||
* Name: GBJPMDHMOGG
|
||||
* CmdId: 133
|
||||
* Obf: MNNNDMABDMJ
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code SetOpenStateReq}
|
||||
@@ -80,12 +80,12 @@ public final class SetOpenStateReqOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 24: {
|
||||
case 40: {
|
||||
|
||||
key_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 112: {
|
||||
case 96: {
|
||||
|
||||
value_ = input.readUInt32();
|
||||
break;
|
||||
@@ -122,21 +122,10 @@ public final class SetOpenStateReqOuterClass {
|
||||
emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq.class, emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq.Builder.class);
|
||||
}
|
||||
|
||||
public static final int KEY_FIELD_NUMBER = 3;
|
||||
private int key_;
|
||||
/**
|
||||
* <code>uint32 key = 3;</code>
|
||||
* @return The key.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getKey() {
|
||||
return key_;
|
||||
}
|
||||
|
||||
public static final int VALUE_FIELD_NUMBER = 14;
|
||||
public static final int VALUE_FIELD_NUMBER = 12;
|
||||
private int value_;
|
||||
/**
|
||||
* <code>uint32 value = 14;</code>
|
||||
* <code>uint32 value = 12;</code>
|
||||
* @return The value.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -144,6 +133,17 @@ public final class SetOpenStateReqOuterClass {
|
||||
return value_;
|
||||
}
|
||||
|
||||
public static final int KEY_FIELD_NUMBER = 5;
|
||||
private int key_;
|
||||
/**
|
||||
* <code>uint32 key = 5;</code>
|
||||
* @return The key.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getKey() {
|
||||
return key_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -159,10 +159,10 @@ public final class SetOpenStateReqOuterClass {
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (key_ != 0) {
|
||||
output.writeUInt32(3, key_);
|
||||
output.writeUInt32(5, key_);
|
||||
}
|
||||
if (value_ != 0) {
|
||||
output.writeUInt32(14, value_);
|
||||
output.writeUInt32(12, value_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -175,11 +175,11 @@ public final class SetOpenStateReqOuterClass {
|
||||
size = 0;
|
||||
if (key_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(3, key_);
|
||||
.computeUInt32Size(5, key_);
|
||||
}
|
||||
if (value_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(14, value_);
|
||||
.computeUInt32Size(12, value_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -196,10 +196,10 @@ public final class SetOpenStateReqOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq other = (emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq) obj;
|
||||
|
||||
if (getKey()
|
||||
!= other.getKey()) return false;
|
||||
if (getValue()
|
||||
!= other.getValue()) return false;
|
||||
if (getKey()
|
||||
!= other.getKey()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -211,10 +211,10 @@ public final class SetOpenStateReqOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + KEY_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getKey();
|
||||
hash = (37 * hash) + VALUE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getValue();
|
||||
hash = (37 * hash) + KEY_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getKey();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -312,8 +312,8 @@ public final class SetOpenStateReqOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 186
|
||||
* Name: GBJPMDHMOGG
|
||||
* CmdId: 133
|
||||
* Obf: MNNNDMABDMJ
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code SetOpenStateReq}
|
||||
@@ -353,10 +353,10 @@ public final class SetOpenStateReqOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
key_ = 0;
|
||||
|
||||
value_ = 0;
|
||||
|
||||
key_ = 0;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -383,8 +383,8 @@ public final class SetOpenStateReqOuterClass {
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq buildPartial() {
|
||||
emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq result = new emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq(this);
|
||||
result.key_ = key_;
|
||||
result.value_ = value_;
|
||||
result.key_ = key_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -433,12 +433,12 @@ public final class SetOpenStateReqOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq other) {
|
||||
if (other == emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq.getDefaultInstance()) return this;
|
||||
if (other.getKey() != 0) {
|
||||
setKey(other.getKey());
|
||||
}
|
||||
if (other.getValue() != 0) {
|
||||
setValue(other.getValue());
|
||||
}
|
||||
if (other.getKey() != 0) {
|
||||
setKey(other.getKey());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -468,40 +468,9 @@ public final class SetOpenStateReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int key_ ;
|
||||
/**
|
||||
* <code>uint32 key = 3;</code>
|
||||
* @return The key.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getKey() {
|
||||
return key_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 key = 3;</code>
|
||||
* @param value The key to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setKey(int value) {
|
||||
|
||||
key_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 key = 3;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearKey() {
|
||||
|
||||
key_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int value_ ;
|
||||
/**
|
||||
* <code>uint32 value = 14;</code>
|
||||
* <code>uint32 value = 12;</code>
|
||||
* @return The value.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -509,7 +478,7 @@ public final class SetOpenStateReqOuterClass {
|
||||
return value_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 value = 14;</code>
|
||||
* <code>uint32 value = 12;</code>
|
||||
* @param value The value to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -520,7 +489,7 @@ public final class SetOpenStateReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 value = 14;</code>
|
||||
* <code>uint32 value = 12;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearValue() {
|
||||
@@ -529,6 +498,37 @@ public final class SetOpenStateReqOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int key_ ;
|
||||
/**
|
||||
* <code>uint32 key = 5;</code>
|
||||
* @return The key.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getKey() {
|
||||
return key_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 key = 5;</code>
|
||||
* @param value The key to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setKey(int value) {
|
||||
|
||||
key_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 key = 5;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearKey() {
|
||||
|
||||
key_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -597,7 +597,7 @@ public final class SetOpenStateReqOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\025SetOpenStateReq.proto\"-\n\017SetOpenStateR" +
|
||||
"eq\022\013\n\003key\030\003 \001(\r\022\r\n\005value\030\016 \001(\rB\033\n\031emu.gr" +
|
||||
"eq\022\r\n\005value\030\014 \001(\r\022\013\n\003key\030\005 \001(\rB\033\n\031emu.gr" +
|
||||
"asscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -609,7 +609,7 @@ public final class SetOpenStateReqOuterClass {
|
||||
internal_static_SetOpenStateReq_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_SetOpenStateReq_descriptor,
|
||||
new java.lang.String[] { "Key", "Value", });
|
||||
new java.lang.String[] { "Value", "Key", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user