Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 11:59:54 +08:00
Code Issues Projects Releases Wiki Activity

Add support for game version 3.6 (#2110)

Browse Source 
* Update to game version `3.6.0` (pt. 1)

not complete!

* Update to game version `3.6.0` (pt. 2)

not complete!

* Update compiled definitions
This commit is contained in:
Magix
2023-04-30 19:08:54 -07:00
committed by GitHub
Unverified
parent 60e8106b01
commit c4f1208f45
1323 changed files with 434863 additions and 141164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/NpcTalkRspOuterClass.java
+125 -125
View File
@@ -19,33 +19,33 @@ public final class NpcTalkRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 cur_talk_id = 5;</code>
* @return The curTalkId.
*/
int getCurTalkId();
/**
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 entity_id = 4;</code>
* <code>uint32 entity_id = 5;</code>
* @return The entityId.
*/
int getEntityId();
/**
* <code>uint32 npc_entity_id = 11;</code>
* <code>uint32 cur_talk_id = 3;</code>
* @return The curTalkId.
*/
int getCurTalkId();
/**
* <code>int32 retcode = 12;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 npc_entity_id = 8;</code>
* @return The npcEntityId.
*/
int getNpcEntityId();
}
/**
* <pre>
* Name: GHMPDOBCADL
* CmdId: 575
* CmdId: 596
* Name: BFJDBEKGICD
* </pre>
*
* Protobuf type {@code NpcTalkRsp}
@@ -92,26 +92,26 @@ public final class NpcTalkRspOuterClass {
case 0:
done = true;
break;
case 16: {
retcode_ = input.readInt32();
break;
}
case 32: {
entityId_ = input.readUInt32();
break;
}
case 40: {
case 24: {
curTalkId_ = input.readUInt32();
break;
}
case 88: {
case 40: {
entityId_ = input.readUInt32();
break;
}
case 64: {
npcEntityId_ = input.readUInt32();
break;
}
case 96: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -144,32 +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 CUR_TALK_ID_FIELD_NUMBER = 5;
private int curTalkId_;
/**
* <code>uint32 cur_talk_id = 5;</code>
* @return The curTalkId.
*/
@java.lang.Override
public int getCurTalkId() {
return curTalkId_;
}
public static final int RETCODE_FIELD_NUMBER = 2;
private int retcode_;
/**
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int ENTITY_ID_FIELD_NUMBER = 4;
public static final int ENTITY_ID_FIELD_NUMBER = 5;
private int entityId_;
/**
* <code>uint32 entity_id = 4;</code>
* <code>uint32 entity_id = 5;</code>
* @return The entityId.
*/
@java.lang.Override
@@ -177,10 +155,32 @@ public final class NpcTalkRspOuterClass {
return entityId_;
}
public static final int NPC_ENTITY_ID_FIELD_NUMBER = 11;
public static final int CUR_TALK_ID_FIELD_NUMBER = 3;
private int curTalkId_;
/**
* <code>uint32 cur_talk_id = 3;</code>
* @return The curTalkId.
*/
@java.lang.Override
public int getCurTalkId() {
return curTalkId_;
}
public static final int RETCODE_FIELD_NUMBER = 12;
private int retcode_;
/**
* <code>int32 retcode = 12;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int NPC_ENTITY_ID_FIELD_NUMBER = 8;
private int npcEntityId_;
/**
* <code>uint32 npc_entity_id = 11;</code>
* <code>uint32 npc_entity_id = 8;</code>
* @return The npcEntityId.
*/
@java.lang.Override
@@ -202,17 +202,17 @@ public final class NpcTalkRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(2, retcode_);
if (curTalkId_ != 0) {
output.writeUInt32(3, curTalkId_);
}
if (entityId_ != 0) {
output.writeUInt32(4, entityId_);
}
if (curTalkId_ != 0) {
output.writeUInt32(5, curTalkId_);
output.writeUInt32(5, entityId_);
}
if (npcEntityId_ != 0) {
output.writeUInt32(11, npcEntityId_);
output.writeUInt32(8, npcEntityId_);
}
if (retcode_ != 0) {
output.writeInt32(12, retcode_);
}
unknownFields.writeTo(output);
}
@@ -223,21 +223,21 @@ public final class NpcTalkRspOuterClass {
if (size != -1) return size;
size = 0;
if (retcode_ != 0) {
if (curTalkId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(2, retcode_);
.computeUInt32Size(3, curTalkId_);
}
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, entityId_);
}
if (curTalkId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, curTalkId_);
.computeUInt32Size(5, entityId_);
}
if (npcEntityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, npcEntityId_);
.computeUInt32Size(8, npcEntityId_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(12, retcode_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -254,12 +254,12 @@ public final class NpcTalkRspOuterClass {
}
emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp other = (emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp) obj;
if (getEntityId()
!= other.getEntityId()) return false;
if (getCurTalkId()
!= other.getCurTalkId()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (getEntityId()
!= other.getEntityId()) return false;
if (getNpcEntityId()
!= other.getNpcEntityId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -273,12 +273,12 @@ public final class NpcTalkRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getEntityId();
hash = (37 * hash) + CUR_TALK_ID_FIELD_NUMBER;
hash = (53 * hash) + getCurTalkId();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getEntityId();
hash = (37 * hash) + NPC_ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getNpcEntityId();
hash = (29 * hash) + unknownFields.hashCode();
@@ -378,8 +378,8 @@ public final class NpcTalkRspOuterClass {
}
/**
* <pre>
* Name: GHMPDOBCADL
* CmdId: 575
* CmdId: 596
* Name: BFJDBEKGICD
* </pre>
*
* Protobuf type {@code NpcTalkRsp}
@@ -419,12 +419,12 @@ public final class NpcTalkRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
entityId_ = 0;
curTalkId_ = 0;
retcode_ = 0;
entityId_ = 0;
npcEntityId_ = 0;
return this;
@@ -453,9 +453,9 @@ public final class NpcTalkRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp buildPartial() {
emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp result = new emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp(this);
result.entityId_ = entityId_;
result.curTalkId_ = curTalkId_;
result.retcode_ = retcode_;
result.entityId_ = entityId_;
result.npcEntityId_ = npcEntityId_;
onBuilt();
return result;
@@ -505,15 +505,15 @@ public final class NpcTalkRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp other) {
if (other == emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp.getDefaultInstance()) return this;
if (other.getEntityId() != 0) {
setEntityId(other.getEntityId());
}
if (other.getCurTalkId() != 0) {
setCurTalkId(other.getCurTalkId());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getEntityId() != 0) {
setEntityId(other.getEntityId());
}
if (other.getNpcEntityId() != 0) {
setNpcEntityId(other.getNpcEntityId());
}
@@ -546,9 +546,40 @@ public final class NpcTalkRspOuterClass {
return this;
}
private int entityId_ ;
/**
* <code>uint32 entity_id = 5;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
/**
* <code>uint32 entity_id = 5;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
public Builder setEntityId(int value) {
entityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 entity_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
entityId_ = 0;
onChanged();
return this;
}
private int curTalkId_ ;
/**
* <code>uint32 cur_talk_id = 5;</code>
* <code>uint32 cur_talk_id = 3;</code>
* @return The curTalkId.
*/
@java.lang.Override
@@ -556,7 +587,7 @@ public final class NpcTalkRspOuterClass {
return curTalkId_;
}
/**
* <code>uint32 cur_talk_id = 5;</code>
* <code>uint32 cur_talk_id = 3;</code>
* @param value The curTalkId to set.
* @return This builder for chaining.
*/
@@ -567,7 +598,7 @@ public final class NpcTalkRspOuterClass {
return this;
}
/**
* <code>uint32 cur_talk_id = 5;</code>
* <code>uint32 cur_talk_id = 3;</code>
* @return This builder for chaining.
*/
public Builder clearCurTalkId() {
@@ -579,7 +610,7 @@ public final class NpcTalkRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 2;</code>
* <code>int32 retcode = 12;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -587,7 +618,7 @@ public final class NpcTalkRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 2;</code>
* <code>int32 retcode = 12;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -598,7 +629,7 @@ public final class NpcTalkRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 2;</code>
* <code>int32 retcode = 12;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -608,40 +639,9 @@ public final class NpcTalkRspOuterClass {
return this;
}
private int entityId_ ;
/**
* <code>uint32 entity_id = 4;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
/**
* <code>uint32 entity_id = 4;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
public Builder setEntityId(int value) {
entityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 entity_id = 4;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
entityId_ = 0;
onChanged();
return this;
}
private int npcEntityId_ ;
/**
* <code>uint32 npc_entity_id = 11;</code>
* <code>uint32 npc_entity_id = 8;</code>
* @return The npcEntityId.
*/
@java.lang.Override
@@ -649,7 +649,7 @@ public final class NpcTalkRspOuterClass {
return npcEntityId_;
}
/**
* <code>uint32 npc_entity_id = 11;</code>
* <code>uint32 npc_entity_id = 8;</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 = 11;</code>
* <code>uint32 npc_entity_id = 8;</code>
* @return This builder for chaining.
*/
public Builder clearNpcEntityId() {
@@ -736,9 +736,9 @@ public final class NpcTalkRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\020NpcTalkRsp.proto\"\\\n\nNpcTalkRsp\022\023\n\013cur_" +
"talk_id\030\005 \001(\r\022\017\n\007retcode\030\002 \001(\005\022\021\n\tentity" +
"_id\030\004 \001(\r\022\025\n\rnpc_entity_id\030\013 \001(\rB\033\n\031emu." +
"\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." +
"grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -750,7 +750,7 @@ public final class NpcTalkRspOuterClass {
internal_static_NpcTalkRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_NpcTalkRsp_descriptor,
new java.lang.String[] { "CurTalkId", "Retcode", "EntityId", "NpcEntityId", });
new java.lang.String[] { "EntityId", "CurTalkId", "Retcode", "NpcEntityId", });
}
// @@protoc_insertion_point(outer_class_scope)