Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 19:43:45 +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/SkipPlayerGameTimeReqOuterClass.java
+95 -95
View File
@@ -19,27 +19,27 @@ public final class SkipPlayerGameTimeReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>bool is_force_set = 6;</code>
* @return The isForceSet.
*/
boolean getIsForceSet();
/**
* <code>uint32 game_time = 5;</code>
* <code>uint32 game_time = 6;</code>
* @return The gameTime.
*/
int getGameTime();
/**
* <code>uint32 client_game_time = 14;</code>
* <code>bool is_force_set = 12;</code>
* @return The isForceSet.
*/
boolean getIsForceSet();
/**
* <code>uint32 client_game_time = 11;</code>
* @return The clientGameTime.
*/
int getClientGameTime();
}
/**
* <pre>
* CmdId: 123
* Name: GHMNCNNHLAI
* CmdId: 165
* Obf: CLJNJBDHDEN
* </pre>
*
* Protobuf type {@code SkipPlayerGameTimeReq}
@@ -86,21 +86,21 @@ public final class SkipPlayerGameTimeReqOuterClass {
case 0:
done = true;
break;
case 40: {
case 48: {
gameTime_ = input.readUInt32();
break;
}
case 48: {
isForceSet_ = input.readBool();
break;
}
case 112: {
case 88: {
clientGameTime_ = input.readUInt32();
break;
}
case 96: {
isForceSet_ = input.readBool();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +133,10 @@ public final class SkipPlayerGameTimeReqOuterClass {
emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq.class, emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq.Builder.class);
}
public static final int IS_FORCE_SET_FIELD_NUMBER = 6;
private boolean isForceSet_;
/**
* <code>bool is_force_set = 6;</code>
* @return The isForceSet.
*/
@java.lang.Override
public boolean getIsForceSet() {
return isForceSet_;
}
public static final int GAME_TIME_FIELD_NUMBER = 5;
public static final int GAME_TIME_FIELD_NUMBER = 6;
private int gameTime_;
/**
* <code>uint32 game_time = 5;</code>
* <code>uint32 game_time = 6;</code>
* @return The gameTime.
*/
@java.lang.Override
@@ -155,10 +144,21 @@ public final class SkipPlayerGameTimeReqOuterClass {
return gameTime_;
}
public static final int CLIENT_GAME_TIME_FIELD_NUMBER = 14;
public static final int IS_FORCE_SET_FIELD_NUMBER = 12;
private boolean isForceSet_;
/**
* <code>bool is_force_set = 12;</code>
* @return The isForceSet.
*/
@java.lang.Override
public boolean getIsForceSet() {
return isForceSet_;
}
public static final int CLIENT_GAME_TIME_FIELD_NUMBER = 11;
private int clientGameTime_;
/**
* <code>uint32 client_game_time = 14;</code>
* <code>uint32 client_game_time = 11;</code>
* @return The clientGameTime.
*/
@java.lang.Override
@@ -181,13 +181,13 @@ public final class SkipPlayerGameTimeReqOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (gameTime_ != 0) {
output.writeUInt32(5, gameTime_);
}
if (isForceSet_ != false) {
output.writeBool(6, isForceSet_);
output.writeUInt32(6, gameTime_);
}
if (clientGameTime_ != 0) {
output.writeUInt32(14, clientGameTime_);
output.writeUInt32(11, clientGameTime_);
}
if (isForceSet_ != false) {
output.writeBool(12, isForceSet_);
}
unknownFields.writeTo(output);
}
@@ -200,15 +200,15 @@ public final class SkipPlayerGameTimeReqOuterClass {
size = 0;
if (gameTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, gameTime_);
}
if (isForceSet_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(6, isForceSet_);
.computeUInt32Size(6, gameTime_);
}
if (clientGameTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, clientGameTime_);
.computeUInt32Size(11, clientGameTime_);
}
if (isForceSet_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(12, isForceSet_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -225,10 +225,10 @@ public final class SkipPlayerGameTimeReqOuterClass {
}
emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq other = (emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq) obj;
if (getIsForceSet()
!= other.getIsForceSet()) return false;
if (getGameTime()
!= other.getGameTime()) return false;
if (getIsForceSet()
!= other.getIsForceSet()) return false;
if (getClientGameTime()
!= other.getClientGameTime()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,11 +242,11 @@ public final class SkipPlayerGameTimeReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + GAME_TIME_FIELD_NUMBER;
hash = (53 * hash) + getGameTime();
hash = (37 * hash) + IS_FORCE_SET_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsForceSet());
hash = (37 * hash) + GAME_TIME_FIELD_NUMBER;
hash = (53 * hash) + getGameTime();
hash = (37 * hash) + CLIENT_GAME_TIME_FIELD_NUMBER;
hash = (53 * hash) + getClientGameTime();
hash = (29 * hash) + unknownFields.hashCode();
@@ -346,8 +346,8 @@ public final class SkipPlayerGameTimeReqOuterClass {
}
/**
* <pre>
* CmdId: 123
* Name: GHMNCNNHLAI
* CmdId: 165
* Obf: CLJNJBDHDEN
* </pre>
*
* Protobuf type {@code SkipPlayerGameTimeReq}
@@ -387,10 +387,10 @@ public final class SkipPlayerGameTimeReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
isForceSet_ = false;
gameTime_ = 0;
isForceSet_ = false;
clientGameTime_ = 0;
return this;
@@ -419,8 +419,8 @@ public final class SkipPlayerGameTimeReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq buildPartial() {
emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq result = new emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq(this);
result.isForceSet_ = isForceSet_;
result.gameTime_ = gameTime_;
result.isForceSet_ = isForceSet_;
result.clientGameTime_ = clientGameTime_;
onBuilt();
return result;
@@ -470,12 +470,12 @@ public final class SkipPlayerGameTimeReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq other) {
if (other == emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq.getDefaultInstance()) return this;
if (other.getIsForceSet() != false) {
setIsForceSet(other.getIsForceSet());
}
if (other.getGameTime() != 0) {
setGameTime(other.getGameTime());
}
if (other.getIsForceSet() != false) {
setIsForceSet(other.getIsForceSet());
}
if (other.getClientGameTime() != 0) {
setClientGameTime(other.getClientGameTime());
}
@@ -508,40 +508,9 @@ public final class SkipPlayerGameTimeReqOuterClass {
return this;
}
private boolean isForceSet_ ;
/**
* <code>bool is_force_set = 6;</code>
* @return The isForceSet.
*/
@java.lang.Override
public boolean getIsForceSet() {
return isForceSet_;
}
/**
* <code>bool is_force_set = 6;</code>
* @param value The isForceSet to set.
* @return This builder for chaining.
*/
public Builder setIsForceSet(boolean value) {
isForceSet_ = value;
onChanged();
return this;
}
/**
* <code>bool is_force_set = 6;</code>
* @return This builder for chaining.
*/
public Builder clearIsForceSet() {
isForceSet_ = false;
onChanged();
return this;
}
private int gameTime_ ;
/**
* <code>uint32 game_time = 5;</code>
* <code>uint32 game_time = 6;</code>
* @return The gameTime.
*/
@java.lang.Override
@@ -549,7 +518,7 @@ public final class SkipPlayerGameTimeReqOuterClass {
return gameTime_;
}
/**
* <code>uint32 game_time = 5;</code>
* <code>uint32 game_time = 6;</code>
* @param value The gameTime to set.
* @return This builder for chaining.
*/
@@ -560,7 +529,7 @@ public final class SkipPlayerGameTimeReqOuterClass {
return this;
}
/**
* <code>uint32 game_time = 5;</code>
* <code>uint32 game_time = 6;</code>
* @return This builder for chaining.
*/
public Builder clearGameTime() {
@@ -570,9 +539,40 @@ public final class SkipPlayerGameTimeReqOuterClass {
return this;
}
private boolean isForceSet_ ;
/**
* <code>bool is_force_set = 12;</code>
* @return The isForceSet.
*/
@java.lang.Override
public boolean getIsForceSet() {
return isForceSet_;
}
/**
* <code>bool is_force_set = 12;</code>
* @param value The isForceSet to set.
* @return This builder for chaining.
*/
public Builder setIsForceSet(boolean value) {
isForceSet_ = value;
onChanged();
return this;
}
/**
* <code>bool is_force_set = 12;</code>
* @return This builder for chaining.
*/
public Builder clearIsForceSet() {
isForceSet_ = false;
onChanged();
return this;
}
private int clientGameTime_ ;
/**
* <code>uint32 client_game_time = 14;</code>
* <code>uint32 client_game_time = 11;</code>
* @return The clientGameTime.
*/
@java.lang.Override
@@ -580,7 +580,7 @@ public final class SkipPlayerGameTimeReqOuterClass {
return clientGameTime_;
}
/**
* <code>uint32 client_game_time = 14;</code>
* <code>uint32 client_game_time = 11;</code>
* @param value The clientGameTime to set.
* @return This builder for chaining.
*/
@@ -591,7 +591,7 @@ public final class SkipPlayerGameTimeReqOuterClass {
return this;
}
/**
* <code>uint32 client_game_time = 14;</code>
* <code>uint32 client_game_time = 11;</code>
* @return This builder for chaining.
*/
public Builder clearClientGameTime() {
@@ -668,8 +668,8 @@ public final class SkipPlayerGameTimeReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\033SkipPlayerGameTimeReq.proto\"Z\n\025SkipPla" +
"yerGameTimeReq\022\024\n\014is_force_set\030\006 \001(\010\022\021\n\t" +
"game_time\030\005 \001(\r\022\030\n\020client_game_time\030\016 \001(" +
"yerGameTimeReq\022\021\n\tgame_time\030\006 \001(\r\022\024\n\014is_" +
"force_set\030\014 \001(\010\022\030\n\020client_game_time\030\013 \001(" +
"\rB\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +681,7 @@ public final class SkipPlayerGameTimeReqOuterClass {
internal_static_SkipPlayerGameTimeReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SkipPlayerGameTimeReq_descriptor,
new java.lang.String[] { "IsForceSet", "GameTime", "ClientGameTime", });
new java.lang.String[] { "GameTime", "IsForceSet", "ClientGameTime", });
}
// @@protoc_insertion_point(outer_class_scope)