Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 15:40:42 +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/NpcTalkRspOuterClass.java
+52 -52
View File
@@ -19,25 +19,25 @@ public final class NpcTalkRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 entity_id = 5;</code>
* <code>uint32 entity_id = 15;</code>
* @return The entityId.
*/
int getEntityId();
/**
* <code>uint32 cur_talk_id = 3;</code>
* <code>uint32 cur_talk_id = 1;</code>
* @return The curTalkId.
*/
int getCurTalkId();
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 npc_entity_id = 8;</code>
* <code>uint32 npc_entity_id = 11;</code>
* @return The npcEntityId.
*/
int getNpcEntityId();
@@ -45,7 +45,7 @@ public final class NpcTalkRspOuterClass {
/**
* <pre>
* CmdId: 596
* Name: BFJDBEKGICD
* Obf: OAFFPIJPBBM
* </pre>
*
* Protobuf type {@code NpcTalkRsp}
@@ -92,24 +92,24 @@ public final class NpcTalkRspOuterClass {
case 0:
done = true;
break;
case 24: {
case 8: {
curTalkId_ = input.readUInt32();
break;
}
case 40: {
case 72: {
entityId_ = input.readUInt32();
retcode_ = input.readInt32();
break;
}
case 64: {
case 88: {
npcEntityId_ = input.readUInt32();
break;
}
case 96: {
case 120: {
retcode_ = input.readInt32();
entityId_ = input.readUInt32();
break;
}
default: {
@@ -144,10 +144,10 @@ public final class NpcTalkRspOuterClass {
emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp.class, emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp.Builder.class);
}
public static final int ENTITY_ID_FIELD_NUMBER = 5;
public static final int ENTITY_ID_FIELD_NUMBER = 15;
private int entityId_;
/**
* <code>uint32 entity_id = 5;</code>
* <code>uint32 entity_id = 15;</code>
* @return The entityId.
*/
@java.lang.Override
@@ -155,10 +155,10 @@ public final class NpcTalkRspOuterClass {
return entityId_;
}
public static final int CUR_TALK_ID_FIELD_NUMBER = 3;
public static final int CUR_TALK_ID_FIELD_NUMBER = 1;
private int curTalkId_;
/**
* <code>uint32 cur_talk_id = 3;</code>
* <code>uint32 cur_talk_id = 1;</code>
* @return The curTalkId.
*/
@java.lang.Override
@@ -166,10 +166,10 @@ public final class NpcTalkRspOuterClass {
return curTalkId_;
}
public static final int RETCODE_FIELD_NUMBER = 12;
public static final int RETCODE_FIELD_NUMBER = 9;
private int retcode_;
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -177,10 +177,10 @@ public final class NpcTalkRspOuterClass {
return retcode_;
}
public static final int NPC_ENTITY_ID_FIELD_NUMBER = 8;
public static final int NPC_ENTITY_ID_FIELD_NUMBER = 11;
private int npcEntityId_;
/**
* <code>uint32 npc_entity_id = 8;</code>
* <code>uint32 npc_entity_id = 11;</code>
* @return The npcEntityId.
*/
@java.lang.Override
@@ -203,16 +203,16 @@ public final class NpcTalkRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (curTalkId_ != 0) {
output.writeUInt32(3, curTalkId_);
}
if (entityId_ != 0) {
output.writeUInt32(5, entityId_);
}
if (npcEntityId_ != 0) {
output.writeUInt32(8, npcEntityId_);
output.writeUInt32(1, curTalkId_);
}
if (retcode_ != 0) {
output.writeInt32(12, retcode_);
output.writeInt32(9, retcode_);
}
if (npcEntityId_ != 0) {
output.writeUInt32(11, npcEntityId_);
}
if (entityId_ != 0) {
output.writeUInt32(15, entityId_);
}
unknownFields.writeTo(output);
}
@@ -225,19 +225,19 @@ public final class NpcTalkRspOuterClass {
size = 0;
if (curTalkId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, curTalkId_);
}
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, entityId_);
}
if (npcEntityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, npcEntityId_);
.computeUInt32Size(1, curTalkId_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(12, retcode_);
.computeInt32Size(9, retcode_);
}
if (npcEntityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, npcEntityId_);
}
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, entityId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -379,7 +379,7 @@ public final class NpcTalkRspOuterClass {
/**
* <pre>
* CmdId: 596
* Name: BFJDBEKGICD
* Obf: OAFFPIJPBBM
* </pre>
*
* Protobuf type {@code NpcTalkRsp}
@@ -548,7 +548,7 @@ public final class NpcTalkRspOuterClass {
private int entityId_ ;
/**
* <code>uint32 entity_id = 5;</code>
* <code>uint32 entity_id = 15;</code>
* @return The entityId.
*/
@java.lang.Override
@@ -556,7 +556,7 @@ public final class NpcTalkRspOuterClass {
return entityId_;
}
/**
* <code>uint32 entity_id = 5;</code>
* <code>uint32 entity_id = 15;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
@@ -567,7 +567,7 @@ public final class NpcTalkRspOuterClass {
return this;
}
/**
* <code>uint32 entity_id = 5;</code>
* <code>uint32 entity_id = 15;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
@@ -579,7 +579,7 @@ public final class NpcTalkRspOuterClass {
private int curTalkId_ ;
/**
* <code>uint32 cur_talk_id = 3;</code>
* <code>uint32 cur_talk_id = 1;</code>
* @return The curTalkId.
*/
@java.lang.Override
@@ -587,7 +587,7 @@ public final class NpcTalkRspOuterClass {
return curTalkId_;
}
/**
* <code>uint32 cur_talk_id = 3;</code>
* <code>uint32 cur_talk_id = 1;</code>
* @param value The curTalkId to set.
* @return This builder for chaining.
*/
@@ -598,7 +598,7 @@ public final class NpcTalkRspOuterClass {
return this;
}
/**
* <code>uint32 cur_talk_id = 3;</code>
* <code>uint32 cur_talk_id = 1;</code>
* @return This builder for chaining.
*/
public Builder clearCurTalkId() {
@@ -610,7 +610,7 @@ public final class NpcTalkRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -618,7 +618,7 @@ public final class NpcTalkRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 9;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -629,7 +629,7 @@ public final class NpcTalkRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 9;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -641,7 +641,7 @@ public final class NpcTalkRspOuterClass {
private int npcEntityId_ ;
/**
* <code>uint32 npc_entity_id = 8;</code>
* <code>uint32 npc_entity_id = 11;</code>
* @return The npcEntityId.
*/
@java.lang.Override
@@ -649,7 +649,7 @@ public final class NpcTalkRspOuterClass {
return npcEntityId_;
}
/**
* <code>uint32 npc_entity_id = 8;</code>
* <code>uint32 npc_entity_id = 11;</code>
* @param value The npcEntityId to set.
* @return This builder for chaining.
*/
@@ -660,7 +660,7 @@ public final class NpcTalkRspOuterClass {
return this;
}
/**
* <code>uint32 npc_entity_id = 8;</code>
* <code>uint32 npc_entity_id = 11;</code>
* @return This builder for chaining.
*/
public Builder clearNpcEntityId() {
@@ -737,8 +737,8 @@ public final class NpcTalkRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\020NpcTalkRsp.proto\"\\\n\nNpcTalkRsp\022\021\n\tenti" +
"ty_id\030\005 \001(\r\022\023\n\013cur_talk_id\030\003 \001(\r\022\017\n\007retc" +
"ode\030\014 \001(\005\022\025\n\rnpc_entity_id\030\010 \001(\rB\033\n\031emu." +
"ty_id\030\017 \001(\r\022\023\n\013cur_talk_id\030\001 \001(\r\022\017\n\007retc" +
"ode\030\t \001(\005\022\025\n\rnpc_entity_id\030\013 \001(\rB\033\n\031emu." +
"grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor