mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-24 13:19: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:
Magix
GitHub
+88
-88
@@ -19,30 +19,30 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>.Vector position = 3;</code>
|
||||
* <code>uint64 chair_id = 11;</code>
|
||||
* @return The chairId.
|
||||
*/
|
||||
long getChairId();
|
||||
|
||||
/**
|
||||
* <code>.Vector position = 4;</code>
|
||||
* @return Whether the position field is set.
|
||||
*/
|
||||
boolean hasPosition();
|
||||
/**
|
||||
* <code>.Vector position = 3;</code>
|
||||
* <code>.Vector position = 4;</code>
|
||||
* @return The position.
|
||||
*/
|
||||
emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition();
|
||||
/**
|
||||
* <code>.Vector position = 3;</code>
|
||||
* <code>.Vector position = 4;</code>
|
||||
*/
|
||||
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
|
||||
|
||||
/**
|
||||
* <code>uint64 chair_id = 7;</code>
|
||||
* @return The chairId.
|
||||
*/
|
||||
long getChairId();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 369
|
||||
* Name: AMHAGIPKAMI
|
||||
* CmdId: 370
|
||||
* Obf: MMMMKEELLIA
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code EvtAvatarLockChairReq}
|
||||
@@ -89,7 +89,7 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 26: {
|
||||
case 34: {
|
||||
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
|
||||
if (position_ != null) {
|
||||
subBuilder = position_.toBuilder();
|
||||
@@ -102,7 +102,7 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
|
||||
break;
|
||||
}
|
||||
case 56: {
|
||||
case 88: {
|
||||
|
||||
chairId_ = input.readUInt64();
|
||||
break;
|
||||
@@ -139,10 +139,21 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq.class, emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq.Builder.class);
|
||||
}
|
||||
|
||||
public static final int POSITION_FIELD_NUMBER = 3;
|
||||
public static final int CHAIR_ID_FIELD_NUMBER = 11;
|
||||
private long chairId_;
|
||||
/**
|
||||
* <code>uint64 chair_id = 11;</code>
|
||||
* @return The chairId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getChairId() {
|
||||
return chairId_;
|
||||
}
|
||||
|
||||
public static final int POSITION_FIELD_NUMBER = 4;
|
||||
private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
|
||||
/**
|
||||
* <code>.Vector position = 3;</code>
|
||||
* <code>.Vector position = 4;</code>
|
||||
* @return Whether the position field is set.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -150,7 +161,7 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
return position_ != null;
|
||||
}
|
||||
/**
|
||||
* <code>.Vector position = 3;</code>
|
||||
* <code>.Vector position = 4;</code>
|
||||
* @return The position.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -158,24 +169,13 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
|
||||
}
|
||||
/**
|
||||
* <code>.Vector position = 3;</code>
|
||||
* <code>.Vector position = 4;</code>
|
||||
*/
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
|
||||
return getPosition();
|
||||
}
|
||||
|
||||
public static final int CHAIR_ID_FIELD_NUMBER = 7;
|
||||
private long chairId_;
|
||||
/**
|
||||
* <code>uint64 chair_id = 7;</code>
|
||||
* @return The chairId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getChairId() {
|
||||
return chairId_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -191,10 +191,10 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (position_ != null) {
|
||||
output.writeMessage(3, getPosition());
|
||||
output.writeMessage(4, getPosition());
|
||||
}
|
||||
if (chairId_ != 0L) {
|
||||
output.writeUInt64(7, chairId_);
|
||||
output.writeUInt64(11, chairId_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -207,11 +207,11 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
size = 0;
|
||||
if (position_ != null) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeMessageSize(3, getPosition());
|
||||
.computeMessageSize(4, getPosition());
|
||||
}
|
||||
if (chairId_ != 0L) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt64Size(7, chairId_);
|
||||
.computeUInt64Size(11, chairId_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -228,13 +228,13 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq other = (emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq) obj;
|
||||
|
||||
if (getChairId()
|
||||
!= other.getChairId()) return false;
|
||||
if (hasPosition() != other.hasPosition()) return false;
|
||||
if (hasPosition()) {
|
||||
if (!getPosition()
|
||||
.equals(other.getPosition())) return false;
|
||||
}
|
||||
if (getChairId()
|
||||
!= other.getChairId()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -246,13 +246,13 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + CHAIR_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
|
||||
getChairId());
|
||||
if (hasPosition()) {
|
||||
hash = (37 * hash) + POSITION_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getPosition().hashCode();
|
||||
}
|
||||
hash = (37 * hash) + CHAIR_ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
|
||||
getChairId());
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -350,8 +350,8 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 369
|
||||
* Name: AMHAGIPKAMI
|
||||
* CmdId: 370
|
||||
* Obf: MMMMKEELLIA
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code EvtAvatarLockChairReq}
|
||||
@@ -391,14 +391,14 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
chairId_ = 0L;
|
||||
|
||||
if (positionBuilder_ == null) {
|
||||
position_ = null;
|
||||
} else {
|
||||
position_ = null;
|
||||
positionBuilder_ = null;
|
||||
}
|
||||
chairId_ = 0L;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -425,12 +425,12 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq buildPartial() {
|
||||
emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq result = new emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq(this);
|
||||
result.chairId_ = chairId_;
|
||||
if (positionBuilder_ == null) {
|
||||
result.position_ = position_;
|
||||
} else {
|
||||
result.position_ = positionBuilder_.build();
|
||||
}
|
||||
result.chairId_ = chairId_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -479,12 +479,12 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq other) {
|
||||
if (other == emu.grasscutter.net.proto.EvtAvatarLockChairReqOuterClass.EvtAvatarLockChairReq.getDefaultInstance()) return this;
|
||||
if (other.hasPosition()) {
|
||||
mergePosition(other.getPosition());
|
||||
}
|
||||
if (other.getChairId() != 0L) {
|
||||
setChairId(other.getChairId());
|
||||
}
|
||||
if (other.hasPosition()) {
|
||||
mergePosition(other.getPosition());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -514,18 +514,49 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private long chairId_ ;
|
||||
/**
|
||||
* <code>uint64 chair_id = 11;</code>
|
||||
* @return The chairId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getChairId() {
|
||||
return chairId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 chair_id = 11;</code>
|
||||
* @param value The chairId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setChairId(long value) {
|
||||
|
||||
chairId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 chair_id = 11;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearChairId() {
|
||||
|
||||
chairId_ = 0L;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
|
||||
private com.google.protobuf.SingleFieldBuilderV3<
|
||||
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> positionBuilder_;
|
||||
/**
|
||||
* <code>.Vector position = 3;</code>
|
||||
* <code>.Vector position = 4;</code>
|
||||
* @return Whether the position field is set.
|
||||
*/
|
||||
public boolean hasPosition() {
|
||||
return positionBuilder_ != null || position_ != null;
|
||||
}
|
||||
/**
|
||||
* <code>.Vector position = 3;</code>
|
||||
* <code>.Vector position = 4;</code>
|
||||
* @return The position.
|
||||
*/
|
||||
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
|
||||
@@ -536,7 +567,7 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>.Vector position = 3;</code>
|
||||
* <code>.Vector position = 4;</code>
|
||||
*/
|
||||
public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
|
||||
if (positionBuilder_ == null) {
|
||||
@@ -552,7 +583,7 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.Vector position = 3;</code>
|
||||
* <code>.Vector position = 4;</code>
|
||||
*/
|
||||
public Builder setPosition(
|
||||
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
|
||||
@@ -566,7 +597,7 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.Vector position = 3;</code>
|
||||
* <code>.Vector position = 4;</code>
|
||||
*/
|
||||
public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
|
||||
if (positionBuilder_ == null) {
|
||||
@@ -584,7 +615,7 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.Vector position = 3;</code>
|
||||
* <code>.Vector position = 4;</code>
|
||||
*/
|
||||
public Builder clearPosition() {
|
||||
if (positionBuilder_ == null) {
|
||||
@@ -598,7 +629,7 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.Vector position = 3;</code>
|
||||
* <code>.Vector position = 4;</code>
|
||||
*/
|
||||
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuilder() {
|
||||
|
||||
@@ -606,7 +637,7 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
return getPositionFieldBuilder().getBuilder();
|
||||
}
|
||||
/**
|
||||
* <code>.Vector position = 3;</code>
|
||||
* <code>.Vector position = 4;</code>
|
||||
*/
|
||||
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
|
||||
if (positionBuilder_ != null) {
|
||||
@@ -617,7 +648,7 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>.Vector position = 3;</code>
|
||||
* <code>.Vector position = 4;</code>
|
||||
*/
|
||||
private com.google.protobuf.SingleFieldBuilderV3<
|
||||
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>
|
||||
@@ -632,37 +663,6 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
}
|
||||
return positionBuilder_;
|
||||
}
|
||||
|
||||
private long chairId_ ;
|
||||
/**
|
||||
* <code>uint64 chair_id = 7;</code>
|
||||
* @return The chairId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public long getChairId() {
|
||||
return chairId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 chair_id = 7;</code>
|
||||
* @param value The chairId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setChairId(long value) {
|
||||
|
||||
chairId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint64 chair_id = 7;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearChairId() {
|
||||
|
||||
chairId_ = 0L;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -731,8 +731,8 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\033EvtAvatarLockChairReq.proto\032\014Vector.pr" +
|
||||
"oto\"D\n\025EvtAvatarLockChairReq\022\031\n\010position" +
|
||||
"\030\003 \001(\0132\007.Vector\022\020\n\010chair_id\030\007 \001(\004B\033\n\031emu" +
|
||||
"oto\"D\n\025EvtAvatarLockChairReq\022\020\n\010chair_id" +
|
||||
"\030\013 \001(\004\022\031\n\010position\030\004 \001(\0132\007.VectorB\033\n\031emu" +
|
||||
".grasscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -745,7 +745,7 @@ public final class EvtAvatarLockChairReqOuterClass {
|
||||
internal_static_EvtAvatarLockChairReq_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_EvtAvatarLockChairReq_descriptor,
|
||||
new java.lang.String[] { "Position", "ChairId", });
|
||||
new java.lang.String[] { "ChairId", "Position", });
|
||||
emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user