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

Update gc to 3.3 (#1981)

Browse Source 
* replace the deprecated api

* update proto

* delete music game

* fixed codes

* fix costume switch

* fix mail bug

* Bump version number.

* Re-add max boss chest number

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
This commit is contained in:
Simplxs
2022-12-24 05:12:02 +08:00
committed by GitHub
Unverified
parent 8b83dbf58c
commit 92fbaa8670
1142 changed files with 474411 additions and 169883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/NpcTalkRspOuterClass.java
+130 -124
View File
@@ -19,35 +19,38 @@ public final class NpcTalkRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 cur_talk_id = 9;</code>
* @return The curTalkId.
*/
int getCurTalkId();
/**
* <code>uint32 npc_entity_id = 6;</code>
* @return The npcEntityId.
*/
int getNpcEntityId();
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 11;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 entity_id = 13;</code>
* <code>uint32 cur_talk_id = 12;</code>
* @return The curTalkId.
*/
int getCurTalkId();
/**
* <code>uint32 npc_entity_id = 4;</code>
* @return The npcEntityId.
*/
int getNpcEntityId();
/**
* <code>uint32 entity_id = 2;</code>
* @return The entityId.
*/
int getEntityId();
}
/**
* <pre>
* CmdId: 598
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 530;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code NpcTalkRsp}
@@ -94,24 +97,24 @@ public final class NpcTalkRspOuterClass {
case 0:
done = true;
break;
case 24: {
case 16: {
retcode_ = input.readInt32();
entityId_ = input.readUInt32();
break;
}
case 48: {
case 32: {
npcEntityId_ = input.readUInt32();
break;
}
case 72: {
case 88: {
curTalkId_ = input.readUInt32();
retcode_ = input.readInt32();
break;
}
case 104: {
case 96: {
entityId_ = input.readUInt32();
curTalkId_ = input.readUInt32();
break;
}
default: {
@@ -146,32 +149,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 = 9;
private int curTalkId_;
/**
* <code>uint32 cur_talk_id = 9;</code>
* @return The curTalkId.
*/
@java.lang.Override
public int getCurTalkId() {
return curTalkId_;
}
public static final int NPC_ENTITY_ID_FIELD_NUMBER = 6;
private int npcEntityId_;
/**
* <code>uint32 npc_entity_id = 6;</code>
* @return The npcEntityId.
*/
@java.lang.Override
public int getNpcEntityId() {
return npcEntityId_;
}
public static final int RETCODE_FIELD_NUMBER = 3;
public static final int RETCODE_FIELD_NUMBER = 11;
private int retcode_;
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 11;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -179,10 +160,32 @@ public final class NpcTalkRspOuterClass {
return retcode_;
}
public static final int ENTITY_ID_FIELD_NUMBER = 13;
public static final int CUR_TALK_ID_FIELD_NUMBER = 12;
private int curTalkId_;
/**
* <code>uint32 cur_talk_id = 12;</code>
* @return The curTalkId.
*/
@java.lang.Override
public int getCurTalkId() {
return curTalkId_;
}
public static final int NPC_ENTITY_ID_FIELD_NUMBER = 4;
private int npcEntityId_;
/**
* <code>uint32 npc_entity_id = 4;</code>
* @return The npcEntityId.
*/
@java.lang.Override
public int getNpcEntityId() {
return npcEntityId_;
}
public static final int ENTITY_ID_FIELD_NUMBER = 2;
private int entityId_;
/**
* <code>uint32 entity_id = 13;</code>
* <code>uint32 entity_id = 2;</code>
* @return The entityId.
*/
@java.lang.Override
@@ -204,17 +207,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(3, retcode_);
if (entityId_ != 0) {
output.writeUInt32(2, entityId_);
}
if (npcEntityId_ != 0) {
output.writeUInt32(6, npcEntityId_);
output.writeUInt32(4, npcEntityId_);
}
if (retcode_ != 0) {
output.writeInt32(11, retcode_);
}
if (curTalkId_ != 0) {
output.writeUInt32(9, curTalkId_);
}
if (entityId_ != 0) {
output.writeUInt32(13, entityId_);
output.writeUInt32(12, curTalkId_);
}
unknownFields.writeTo(output);
}
@@ -225,21 +228,21 @@ public final class NpcTalkRspOuterClass {
if (size != -1) return size;
size = 0;
if (retcode_ != 0) {
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(3, retcode_);
.computeUInt32Size(2, entityId_);
}
if (npcEntityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, npcEntityId_);
.computeUInt32Size(4, npcEntityId_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(11, retcode_);
}
if (curTalkId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, curTalkId_);
}
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, entityId_);
.computeUInt32Size(12, curTalkId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -256,12 +259,12 @@ public final class NpcTalkRspOuterClass {
}
emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp other = (emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp) obj;
if (getRetcode()
!= other.getRetcode()) return false;
if (getCurTalkId()
!= other.getCurTalkId()) return false;
if (getNpcEntityId()
!= other.getNpcEntityId()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (getEntityId()
!= other.getEntityId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -275,12 +278,12 @@ public final class NpcTalkRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + CUR_TALK_ID_FIELD_NUMBER;
hash = (53 * hash) + getCurTalkId();
hash = (37 * hash) + NPC_ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getNpcEntityId();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getEntityId();
hash = (29 * hash) + unknownFields.hashCode();
@@ -380,10 +383,13 @@ public final class NpcTalkRspOuterClass {
}
/**
* <pre>
* CmdId: 598
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 530;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code NpcTalkRsp}
@@ -423,12 +429,12 @@ public final class NpcTalkRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
retcode_ = 0;
curTalkId_ = 0;
npcEntityId_ = 0;
retcode_ = 0;
entityId_ = 0;
return this;
@@ -457,9 +463,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.retcode_ = retcode_;
result.curTalkId_ = curTalkId_;
result.npcEntityId_ = npcEntityId_;
result.retcode_ = retcode_;
result.entityId_ = entityId_;
onBuilt();
return result;
@@ -509,15 +515,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.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getCurTalkId() != 0) {
setCurTalkId(other.getCurTalkId());
}
if (other.getNpcEntityId() != 0) {
setNpcEntityId(other.getNpcEntityId());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getEntityId() != 0) {
setEntityId(other.getEntityId());
}
@@ -550,9 +556,40 @@ public final class NpcTalkRspOuterClass {
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 11;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 11;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 11;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private int curTalkId_ ;
/**
* <code>uint32 cur_talk_id = 9;</code>
* <code>uint32 cur_talk_id = 12;</code>
* @return The curTalkId.
*/
@java.lang.Override
@@ -560,7 +597,7 @@ public final class NpcTalkRspOuterClass {
return curTalkId_;
}
/**
* <code>uint32 cur_talk_id = 9;</code>
* <code>uint32 cur_talk_id = 12;</code>
* @param value The curTalkId to set.
* @return This builder for chaining.
*/
@@ -571,7 +608,7 @@ public final class NpcTalkRspOuterClass {
return this;
}
/**
* <code>uint32 cur_talk_id = 9;</code>
* <code>uint32 cur_talk_id = 12;</code>
* @return This builder for chaining.
*/
public Builder clearCurTalkId() {
@@ -583,7 +620,7 @@ public final class NpcTalkRspOuterClass {
private int npcEntityId_ ;
/**
* <code>uint32 npc_entity_id = 6;</code>
* <code>uint32 npc_entity_id = 4;</code>
* @return The npcEntityId.
*/
@java.lang.Override
@@ -591,7 +628,7 @@ public final class NpcTalkRspOuterClass {
return npcEntityId_;
}
/**
* <code>uint32 npc_entity_id = 6;</code>
* <code>uint32 npc_entity_id = 4;</code>
* @param value The npcEntityId to set.
* @return This builder for chaining.
*/
@@ -602,7 +639,7 @@ public final class NpcTalkRspOuterClass {
return this;
}
/**
* <code>uint32 npc_entity_id = 6;</code>
* <code>uint32 npc_entity_id = 4;</code>
* @return This builder for chaining.
*/
public Builder clearNpcEntityId() {
@@ -612,40 +649,9 @@ public final class NpcTalkRspOuterClass {
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 3;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 3;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 3;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private int entityId_ ;
/**
* <code>uint32 entity_id = 13;</code>
* <code>uint32 entity_id = 2;</code>
* @return The entityId.
*/
@java.lang.Override
@@ -653,7 +659,7 @@ public final class NpcTalkRspOuterClass {
return entityId_;
}
/**
* <code>uint32 entity_id = 13;</code>
* <code>uint32 entity_id = 2;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
@@ -664,7 +670,7 @@ public final class NpcTalkRspOuterClass {
return this;
}
/**
* <code>uint32 entity_id = 13;</code>
* <code>uint32 entity_id = 2;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
@@ -740,9 +746,9 @@ public final class NpcTalkRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\020NpcTalkRsp.proto\"\\\n\nNpcTalkRsp\022\023\n\013cur_" +
"talk_id\030\t \001(\r\022\025\n\rnpc_entity_id\030\006 \001(\r\022\017\n\007" +
"retcode\030\003 \001(\005\022\021\n\tentity_id\030\r \001(\rB\033\n\031emu." +
"\n\020NpcTalkRsp.proto\"\\\n\nNpcTalkRsp\022\017\n\007retc" +
"ode\030\013 \001(\005\022\023\n\013cur_talk_id\030\014 \001(\r\022\025\n\rnpc_en" +
"tity_id\030\004 \001(\r\022\021\n\tentity_id\030\002 \001(\rB\033\n\031emu." +
"grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -754,7 +760,7 @@ public final class NpcTalkRspOuterClass {
internal_static_NpcTalkRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_NpcTalkRsp_descriptor,
new java.lang.String[] { "CurTalkId", "NpcEntityId", "Retcode", "EntityId", });
new java.lang.String[] { "Retcode", "CurTalkId", "NpcEntityId", "EntityId", });
}
// @@protoc_insertion_point(outer_class_scope)