mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-05 21:23:42 +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:
+129
-129
@@ -19,27 +19,27 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 game_time = 9;</code>
|
||||
* @return The gameTime.
|
||||
* <code>int32 retcode = 12;</code>
|
||||
* @return The retcode.
|
||||
*/
|
||||
int getGameTime();
|
||||
int getRetcode();
|
||||
|
||||
/**
|
||||
* <code>uint32 client_game_time = 1;</code>
|
||||
* <code>uint32 client_game_time = 11;</code>
|
||||
* @return The clientGameTime.
|
||||
*/
|
||||
int getClientGameTime();
|
||||
|
||||
/**
|
||||
* <code>int32 retcode = 12;</code>
|
||||
* @return The retcode.
|
||||
* <code>uint32 game_time = 15;</code>
|
||||
* @return The gameTime.
|
||||
*/
|
||||
int getRetcode();
|
||||
int getGameTime();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 130
|
||||
* Name: DFPBHODHPKM
|
||||
* CmdId: 129
|
||||
* Obf: MJEGBKCMNIE
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code SkipPlayerGameTimeRsp}
|
||||
@@ -86,21 +86,21 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 8: {
|
||||
case 88: {
|
||||
|
||||
clientGameTime_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 72: {
|
||||
|
||||
gameTime_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 96: {
|
||||
|
||||
retcode_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
case 120: {
|
||||
|
||||
gameTime_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
if (!parseUnknownField(
|
||||
input, unknownFields, extensionRegistry, tag)) {
|
||||
@@ -133,28 +133,6 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp.class, emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp.Builder.class);
|
||||
}
|
||||
|
||||
public static final int GAME_TIME_FIELD_NUMBER = 9;
|
||||
private int gameTime_;
|
||||
/**
|
||||
* <code>uint32 game_time = 9;</code>
|
||||
* @return The gameTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getGameTime() {
|
||||
return gameTime_;
|
||||
}
|
||||
|
||||
public static final int CLIENT_GAME_TIME_FIELD_NUMBER = 1;
|
||||
private int clientGameTime_;
|
||||
/**
|
||||
* <code>uint32 client_game_time = 1;</code>
|
||||
* @return The clientGameTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getClientGameTime() {
|
||||
return clientGameTime_;
|
||||
}
|
||||
|
||||
public static final int RETCODE_FIELD_NUMBER = 12;
|
||||
private int retcode_;
|
||||
/**
|
||||
@@ -166,6 +144,28 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
return retcode_;
|
||||
}
|
||||
|
||||
public static final int CLIENT_GAME_TIME_FIELD_NUMBER = 11;
|
||||
private int clientGameTime_;
|
||||
/**
|
||||
* <code>uint32 client_game_time = 11;</code>
|
||||
* @return The clientGameTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getClientGameTime() {
|
||||
return clientGameTime_;
|
||||
}
|
||||
|
||||
public static final int GAME_TIME_FIELD_NUMBER = 15;
|
||||
private int gameTime_;
|
||||
/**
|
||||
* <code>uint32 game_time = 15;</code>
|
||||
* @return The gameTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getGameTime() {
|
||||
return gameTime_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -181,14 +181,14 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (clientGameTime_ != 0) {
|
||||
output.writeUInt32(1, clientGameTime_);
|
||||
}
|
||||
if (gameTime_ != 0) {
|
||||
output.writeUInt32(9, gameTime_);
|
||||
output.writeUInt32(11, clientGameTime_);
|
||||
}
|
||||
if (retcode_ != 0) {
|
||||
output.writeInt32(12, retcode_);
|
||||
}
|
||||
if (gameTime_ != 0) {
|
||||
output.writeUInt32(15, gameTime_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
|
||||
@@ -200,16 +200,16 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
size = 0;
|
||||
if (clientGameTime_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(1, clientGameTime_);
|
||||
}
|
||||
if (gameTime_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(9, gameTime_);
|
||||
.computeUInt32Size(11, clientGameTime_);
|
||||
}
|
||||
if (retcode_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(12, retcode_);
|
||||
}
|
||||
if (gameTime_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(15, gameTime_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
return size;
|
||||
@@ -225,12 +225,12 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp other = (emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp) obj;
|
||||
|
||||
if (getGameTime()
|
||||
!= other.getGameTime()) return false;
|
||||
if (getClientGameTime()
|
||||
!= other.getClientGameTime()) return false;
|
||||
if (getRetcode()
|
||||
!= other.getRetcode()) return false;
|
||||
if (getClientGameTime()
|
||||
!= other.getClientGameTime()) return false;
|
||||
if (getGameTime()
|
||||
!= other.getGameTime()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -242,12 +242,12 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + GAME_TIME_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getGameTime();
|
||||
hash = (37 * hash) + CLIENT_GAME_TIME_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getClientGameTime();
|
||||
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getRetcode();
|
||||
hash = (37 * hash) + CLIENT_GAME_TIME_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getClientGameTime();
|
||||
hash = (37 * hash) + GAME_TIME_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getGameTime();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -345,8 +345,8 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 130
|
||||
* Name: DFPBHODHPKM
|
||||
* CmdId: 129
|
||||
* Obf: MJEGBKCMNIE
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code SkipPlayerGameTimeRsp}
|
||||
@@ -386,11 +386,11 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
gameTime_ = 0;
|
||||
retcode_ = 0;
|
||||
|
||||
clientGameTime_ = 0;
|
||||
|
||||
retcode_ = 0;
|
||||
gameTime_ = 0;
|
||||
|
||||
return this;
|
||||
}
|
||||
@@ -418,9 +418,9 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp buildPartial() {
|
||||
emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp result = new emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp(this);
|
||||
result.gameTime_ = gameTime_;
|
||||
result.clientGameTime_ = clientGameTime_;
|
||||
result.retcode_ = retcode_;
|
||||
result.clientGameTime_ = clientGameTime_;
|
||||
result.gameTime_ = gameTime_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -469,14 +469,14 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp other) {
|
||||
if (other == emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp.getDefaultInstance()) return this;
|
||||
if (other.getGameTime() != 0) {
|
||||
setGameTime(other.getGameTime());
|
||||
if (other.getRetcode() != 0) {
|
||||
setRetcode(other.getRetcode());
|
||||
}
|
||||
if (other.getClientGameTime() != 0) {
|
||||
setClientGameTime(other.getClientGameTime());
|
||||
}
|
||||
if (other.getRetcode() != 0) {
|
||||
setRetcode(other.getRetcode());
|
||||
if (other.getGameTime() != 0) {
|
||||
setGameTime(other.getGameTime());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
@@ -507,68 +507,6 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int gameTime_ ;
|
||||
/**
|
||||
* <code>uint32 game_time = 9;</code>
|
||||
* @return The gameTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getGameTime() {
|
||||
return gameTime_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 game_time = 9;</code>
|
||||
* @param value The gameTime to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setGameTime(int value) {
|
||||
|
||||
gameTime_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 game_time = 9;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearGameTime() {
|
||||
|
||||
gameTime_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int clientGameTime_ ;
|
||||
/**
|
||||
* <code>uint32 client_game_time = 1;</code>
|
||||
* @return The clientGameTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getClientGameTime() {
|
||||
return clientGameTime_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 client_game_time = 1;</code>
|
||||
* @param value The clientGameTime to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setClientGameTime(int value) {
|
||||
|
||||
clientGameTime_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 client_game_time = 1;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearClientGameTime() {
|
||||
|
||||
clientGameTime_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int retcode_ ;
|
||||
/**
|
||||
* <code>int32 retcode = 12;</code>
|
||||
@@ -599,6 +537,68 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int clientGameTime_ ;
|
||||
/**
|
||||
* <code>uint32 client_game_time = 11;</code>
|
||||
* @return The clientGameTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getClientGameTime() {
|
||||
return clientGameTime_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 client_game_time = 11;</code>
|
||||
* @param value The clientGameTime to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setClientGameTime(int value) {
|
||||
|
||||
clientGameTime_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 client_game_time = 11;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearClientGameTime() {
|
||||
|
||||
clientGameTime_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int gameTime_ ;
|
||||
/**
|
||||
* <code>uint32 game_time = 15;</code>
|
||||
* @return The gameTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getGameTime() {
|
||||
return gameTime_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 game_time = 15;</code>
|
||||
* @param value The gameTime to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setGameTime(int value) {
|
||||
|
||||
gameTime_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 game_time = 15;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearGameTime() {
|
||||
|
||||
gameTime_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -667,8 +667,8 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\033SkipPlayerGameTimeRsp.proto\"U\n\025SkipPla" +
|
||||
"yerGameTimeRsp\022\021\n\tgame_time\030\t \001(\r\022\030\n\020cli" +
|
||||
"ent_game_time\030\001 \001(\r\022\017\n\007retcode\030\014 \001(\005B\033\n\031" +
|
||||
"yerGameTimeRsp\022\017\n\007retcode\030\014 \001(\005\022\030\n\020clien" +
|
||||
"t_game_time\030\013 \001(\r\022\021\n\tgame_time\030\017 \001(\rB\033\n\031" +
|
||||
"emu.grasscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -680,7 +680,7 @@ public final class SkipPlayerGameTimeRspOuterClass {
|
||||
internal_static_SkipPlayerGameTimeRsp_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_SkipPlayerGameTimeRsp_descriptor,
|
||||
new java.lang.String[] { "GameTime", "ClientGameTime", "Retcode", });
|
||||
new java.lang.String[] { "Retcode", "ClientGameTime", "GameTime", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user