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

Add support for v3.5.0 (#2090)

Browse Source 
* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
This commit is contained in:
Colleiflower
2023-03-31 19:13:32 +00:00
committed by GitHub
Unverified
parent 922f7bca51
commit 516e5975e1
1383 changed files with 167226 additions and 586936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/NpcTalkRspOuterClass.java
+162 -285
View File
@@ -19,30 +19,35 @@ public final class NpcTalkRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 npcEntityId = 11;</code>
* @return The npcEntityId.
*/
int getNpcEntityId();
/**
* <code>uint32 curTalkId = 1;</code>
* <code>uint32 cur_talk_id = 5;</code>
* @return The curTalkId.
*/
int getCurTalkId();
/**
* <code>uint32 entityId = 9;</code>
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 entity_id = 4;</code>
* @return The entityId.
*/
int getEntityId();
/**
* <code>uint32 npc_entity_id = 11;</code>
* @return The npcEntityId.
*/
int getNpcEntityId();
}
/**
* <pre>
* Name: GHMPDOBCADL
* CmdId: 575
* </pre>
*
* Protobuf type {@code NpcTalkRsp}
*/
public static final class NpcTalkRsp extends
@@ -87,21 +92,21 @@ public final class NpcTalkRspOuterClass {
case 0:
done = true;
break;
case 8: {
curTalkId_ = input.readUInt32();
break;
}
case 40: {
case 16: {
retcode_ = input.readInt32();
break;
}
case 72: {
case 32: {
entityId_ = input.readUInt32();
break;
}
case 40: {
curTalkId_ = input.readUInt32();
break;
}
case 88: {
npcEntityId_ = input.readUInt32();
@@ -139,163 +144,10 @@ public final class NpcTalkRspOuterClass {
emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp.class, emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp.Builder.class);
}
/**
* Protobuf enum {@code NpcTalkRsp.MELLEOKPJBM}
*/
public enum MELLEOKPJBM
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 555;</code>
*/
PEPPOHPHJOJ(1, 555),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final MELLEOKPJBM DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 555;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 555;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final int DCDNILFDFLB_VALUE = 0;
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
public static final int NNBKOLMPOEA_VALUE = 1;
public final int getNumber() {
if (index == -1) {
throw new java.lang.IllegalArgumentException(
"Can't get the number of an unknown enum value.");
}
return value;
}
/**
* @param value The numeric wire value of the corresponding enum entry.
* @return The enum associated with the given numeric wire value.
* @deprecated Use {@link #forNumber(int)} instead.
*/
@java.lang.Deprecated
public static MELLEOKPJBM valueOf(int value) {
return forNumber(value);
}
/**
* @param value The numeric wire value of the corresponding enum entry.
* @return The enum associated with the given numeric wire value.
*/
public static MELLEOKPJBM forNumber(int value) {
switch (value) {
case 0: return NONE;
case 555: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<MELLEOKPJBM>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
MELLEOKPJBM> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<MELLEOKPJBM>() {
public MELLEOKPJBM findValueByNumber(int number) {
return MELLEOKPJBM.forNumber(number);
}
};
public final com.google.protobuf.Descriptors.EnumValueDescriptor
getValueDescriptor() {
if (index == -1) {
throw new java.lang.IllegalStateException(
"Can't get the descriptor of an unrecognized enum value.");
}
return getDescriptor().getValues().get(index);
}
public final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptorForType() {
return getDescriptor();
}
public static final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
return emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp.getDescriptor().getEnumTypes().get(0);
}
private static final MELLEOKPJBM[] VALUES = getStaticValuesArray();
private static MELLEOKPJBM[] getStaticValuesArray() {
return new MELLEOKPJBM[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static MELLEOKPJBM valueOf(
com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
throw new java.lang.IllegalArgumentException(
"EnumValueDescriptor is not for this type.");
}
if (desc.getIndex() == -1) {
return UNRECOGNIZED;
}
return VALUES[desc.getIndex()];
}
private final int index;
private final int value;
private MELLEOKPJBM(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:NpcTalkRsp.MELLEOKPJBM)
}
public static final int RETCODE_FIELD_NUMBER = 5;
private int retcode_;
/**
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int NPCENTITYID_FIELD_NUMBER = 11;
private int npcEntityId_;
/**
* <code>uint32 npcEntityId = 11;</code>
* @return The npcEntityId.
*/
@java.lang.Override
public int getNpcEntityId() {
return npcEntityId_;
}
public static final int CURTALKID_FIELD_NUMBER = 1;
public static final int CUR_TALK_ID_FIELD_NUMBER = 5;
private int curTalkId_;
/**
* <code>uint32 curTalkId = 1;</code>
* <code>uint32 cur_talk_id = 5;</code>
* @return The curTalkId.
*/
@java.lang.Override
@@ -303,10 +155,21 @@ public final class NpcTalkRspOuterClass {
return curTalkId_;
}
public static final int ENTITYID_FIELD_NUMBER = 9;
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;
private int entityId_;
/**
* <code>uint32 entityId = 9;</code>
* <code>uint32 entity_id = 4;</code>
* @return The entityId.
*/
@java.lang.Override
@@ -314,6 +177,17 @@ public final class NpcTalkRspOuterClass {
return entityId_;
}
public static final int NPC_ENTITY_ID_FIELD_NUMBER = 11;
private int npcEntityId_;
/**
* <code>uint32 npc_entity_id = 11;</code>
* @return The npcEntityId.
*/
@java.lang.Override
public int getNpcEntityId() {
return npcEntityId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -328,14 +202,14 @@ public final class NpcTalkRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (curTalkId_ != 0) {
output.writeUInt32(1, curTalkId_);
}
if (retcode_ != 0) {
output.writeInt32(5, retcode_);
output.writeInt32(2, retcode_);
}
if (entityId_ != 0) {
output.writeUInt32(9, entityId_);
output.writeUInt32(4, entityId_);
}
if (curTalkId_ != 0) {
output.writeUInt32(5, curTalkId_);
}
if (npcEntityId_ != 0) {
output.writeUInt32(11, npcEntityId_);
@@ -349,17 +223,17 @@ public final class NpcTalkRspOuterClass {
if (size != -1) return size;
size = 0;
if (curTalkId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, curTalkId_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(5, retcode_);
.computeInt32Size(2, retcode_);
}
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, entityId_);
.computeUInt32Size(4, entityId_);
}
if (curTalkId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, curTalkId_);
}
if (npcEntityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
@@ -380,14 +254,14 @@ 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 (getNpcEntityId()
!= other.getNpcEntityId()) 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;
return true;
}
@@ -399,14 +273,14 @@ public final class NpcTalkRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
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) + NPCENTITYID_FIELD_NUMBER;
hash = (53 * hash) + getNpcEntityId();
hash = (37 * hash) + CURTALKID_FIELD_NUMBER;
hash = (53 * hash) + getCurTalkId();
hash = (37 * hash) + ENTITYID_FIELD_NUMBER;
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();
memoizedHashCode = hash;
return hash;
@@ -503,6 +377,11 @@ public final class NpcTalkRspOuterClass {
return builder;
}
/**
* <pre>
* Name: GHMPDOBCADL
* CmdId: 575
* </pre>
*
* Protobuf type {@code NpcTalkRsp}
*/
public static final class Builder extends
@@ -540,14 +419,14 @@ public final class NpcTalkRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
retcode_ = 0;
npcEntityId_ = 0;
curTalkId_ = 0;
retcode_ = 0;
entityId_ = 0;
npcEntityId_ = 0;
return this;
}
@@ -574,10 +453,10 @@ 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.npcEntityId_ = npcEntityId_;
result.curTalkId_ = curTalkId_;
result.retcode_ = retcode_;
result.entityId_ = entityId_;
result.npcEntityId_ = npcEntityId_;
onBuilt();
return result;
}
@@ -626,18 +505,18 @@ 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.getNpcEntityId() != 0) {
setNpcEntityId(other.getNpcEntityId());
}
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());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -667,71 +546,9 @@ public final class NpcTalkRspOuterClass {
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 5;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 5;</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 = 5;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private int npcEntityId_ ;
/**
* <code>uint32 npcEntityId = 11;</code>
* @return The npcEntityId.
*/
@java.lang.Override
public int getNpcEntityId() {
return npcEntityId_;
}
/**
* <code>uint32 npcEntityId = 11;</code>
* @param value The npcEntityId to set.
* @return This builder for chaining.
*/
public Builder setNpcEntityId(int value) {
npcEntityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 npcEntityId = 11;</code>
* @return This builder for chaining.
*/
public Builder clearNpcEntityId() {
npcEntityId_ = 0;
onChanged();
return this;
}
private int curTalkId_ ;
/**
* <code>uint32 curTalkId = 1;</code>
* <code>uint32 cur_talk_id = 5;</code>
* @return The curTalkId.
*/
@java.lang.Override
@@ -739,7 +556,7 @@ public final class NpcTalkRspOuterClass {
return curTalkId_;
}
/**
* <code>uint32 curTalkId = 1;</code>
* <code>uint32 cur_talk_id = 5;</code>
* @param value The curTalkId to set.
* @return This builder for chaining.
*/
@@ -750,7 +567,7 @@ public final class NpcTalkRspOuterClass {
return this;
}
/**
* <code>uint32 curTalkId = 1;</code>
* <code>uint32 cur_talk_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearCurTalkId() {
@@ -760,9 +577,40 @@ public final class NpcTalkRspOuterClass {
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 2;</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 = 2;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private int entityId_ ;
/**
* <code>uint32 entityId = 9;</code>
* <code>uint32 entity_id = 4;</code>
* @return The entityId.
*/
@java.lang.Override
@@ -770,7 +618,7 @@ public final class NpcTalkRspOuterClass {
return entityId_;
}
/**
* <code>uint32 entityId = 9;</code>
* <code>uint32 entity_id = 4;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
@@ -781,7 +629,7 @@ public final class NpcTalkRspOuterClass {
return this;
}
/**
* <code>uint32 entityId = 9;</code>
* <code>uint32 entity_id = 4;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
@@ -790,6 +638,37 @@ public final class NpcTalkRspOuterClass {
onChanged();
return this;
}
private int npcEntityId_ ;
/**
* <code>uint32 npc_entity_id = 11;</code>
* @return The npcEntityId.
*/
@java.lang.Override
public int getNpcEntityId() {
return npcEntityId_;
}
/**
* <code>uint32 npc_entity_id = 11;</code>
* @param value The npcEntityId to set.
* @return This builder for chaining.
*/
public Builder setNpcEntityId(int value) {
npcEntityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 npc_entity_id = 11;</code>
* @return This builder for chaining.
*/
public Builder clearNpcEntityId() {
npcEntityId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -857,12 +736,10 @@ public final class NpcTalkRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\020NpcTalkRsp.proto\"\250\001\n\nNpcTalkRsp\022\017\n\007ret" +
"code\030\005 \001(\005\022\023\n\013npcEntityId\030\013 \001(\r\022\021\n\tcurTa" +
"lkId\030\001 \001(\r\022\020\n\010entityId\030\t \001(\r\"O\n\013MELLEOKP" +
"JBM\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\253\004\022\017\n\013DCDNI" +
"LFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.gra" +
"sscutter.net.protob\006proto3"
"\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." +
"grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -873,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[] { "Retcode", "NpcEntityId", "CurTalkId", "EntityId", });
new java.lang.String[] { "CurTalkId", "Retcode", "EntityId", "NpcEntityId", });
}
// @@protoc_insertion_point(outer_class_scope)