Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-21 06:59:50 +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/ActivityTakeWatcherRewardRspOuterClass.java
+39 -39
View File
@@ -19,27 +19,27 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>int32 retcode = 9;</code>
* <code>int32 retcode = 6;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 activity_id = 7;</code>
* <code>uint32 activity_id = 8;</code>
* @return The activityId.
*/
int getActivityId();
/**
* <code>uint32 watcher_id = 10;</code>
* <code>uint32 watcher_id = 3;</code>
* @return The watcherId.
*/
int getWatcherId();
}
/**
* <pre>
* CmdId: 2122
* Name: IIEIAEEFLGL
* CmdId: 2111
* Obf: BHBNNEDNMOG
* </pre>
*
* Protobuf type {@code ActivityTakeWatcherRewardRsp}
@@ -86,19 +86,19 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
case 0:
done = true;
break;
case 56: {
case 24: {
activityId_ = input.readUInt32();
watcherId_ = input.readUInt32();
break;
}
case 72: {
case 48: {
retcode_ = input.readInt32();
break;
}
case 80: {
case 64: {
watcherId_ = input.readUInt32();
activityId_ = input.readUInt32();
break;
}
default: {
@@ -133,10 +133,10 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp.class, emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp.Builder.class);
}
public static final int RETCODE_FIELD_NUMBER = 9;
public static final int RETCODE_FIELD_NUMBER = 6;
private int retcode_;
/**
* <code>int32 retcode = 9;</code>
* <code>int32 retcode = 6;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -144,10 +144,10 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
return retcode_;
}
public static final int ACTIVITY_ID_FIELD_NUMBER = 7;
public static final int ACTIVITY_ID_FIELD_NUMBER = 8;
private int activityId_;
/**
* <code>uint32 activity_id = 7;</code>
* <code>uint32 activity_id = 8;</code>
* @return The activityId.
*/
@java.lang.Override
@@ -155,10 +155,10 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
return activityId_;
}
public static final int WATCHER_ID_FIELD_NUMBER = 10;
public static final int WATCHER_ID_FIELD_NUMBER = 3;
private int watcherId_;
/**
* <code>uint32 watcher_id = 10;</code>
* <code>uint32 watcher_id = 3;</code>
* @return The watcherId.
*/
@java.lang.Override
@@ -180,14 +180,14 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (activityId_ != 0) {
output.writeUInt32(7, activityId_);
if (watcherId_ != 0) {
output.writeUInt32(3, watcherId_);
}
if (retcode_ != 0) {
output.writeInt32(9, retcode_);
output.writeInt32(6, retcode_);
}
if (watcherId_ != 0) {
output.writeUInt32(10, watcherId_);
if (activityId_ != 0) {
output.writeUInt32(8, activityId_);
}
unknownFields.writeTo(output);
}
@@ -198,17 +198,17 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
if (size != -1) return size;
size = 0;
if (activityId_ != 0) {
if (watcherId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(7, activityId_);
.computeUInt32Size(3, watcherId_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(9, retcode_);
.computeInt32Size(6, retcode_);
}
if (watcherId_ != 0) {
if (activityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(10, watcherId_);
.computeUInt32Size(8, activityId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -345,8 +345,8 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
}
/**
* <pre>
* CmdId: 2122
* Name: IIEIAEEFLGL
* CmdId: 2111
* Obf: BHBNNEDNMOG
* </pre>
*
* Protobuf type {@code ActivityTakeWatcherRewardRsp}
@@ -509,7 +509,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 9;</code>
* <code>int32 retcode = 6;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -517,7 +517,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 9;</code>
* <code>int32 retcode = 6;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -528,7 +528,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 9;</code>
* <code>int32 retcode = 6;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -540,7 +540,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
private int activityId_ ;
/**
* <code>uint32 activity_id = 7;</code>
* <code>uint32 activity_id = 8;</code>
* @return The activityId.
*/
@java.lang.Override
@@ -548,7 +548,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
return activityId_;
}
/**
* <code>uint32 activity_id = 7;</code>
* <code>uint32 activity_id = 8;</code>
* @param value The activityId to set.
* @return This builder for chaining.
*/
@@ -559,7 +559,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
return this;
}
/**
* <code>uint32 activity_id = 7;</code>
* <code>uint32 activity_id = 8;</code>
* @return This builder for chaining.
*/
public Builder clearActivityId() {
@@ -571,7 +571,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
private int watcherId_ ;
/**
* <code>uint32 watcher_id = 10;</code>
* <code>uint32 watcher_id = 3;</code>
* @return The watcherId.
*/
@java.lang.Override
@@ -579,7 +579,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
return watcherId_;
}
/**
* <code>uint32 watcher_id = 10;</code>
* <code>uint32 watcher_id = 3;</code>
* @param value The watcherId to set.
* @return This builder for chaining.
*/
@@ -590,7 +590,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
return this;
}
/**
* <code>uint32 watcher_id = 10;</code>
* <code>uint32 watcher_id = 3;</code>
* @return This builder for chaining.
*/
public Builder clearWatcherId() {
@@ -668,8 +668,8 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
java.lang.String[] descriptorData = {
"\n\"ActivityTakeWatcherRewardRsp.proto\"X\n\034" +
"ActivityTakeWatcherRewardRsp\022\017\n\007retcode\030" +
"\t \001(\005\022\023\n\013activity_id\030\007 \001(\r\022\022\n\nwatcher_id" +
"\030\n \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
"\006 \001(\005\022\023\n\013activity_id\030\010 \001(\r\022\022\n\nwatcher_id" +
"\030\003 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
"to3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor