Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-25 10:59:50 +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/ChangeMpTeamAvatarReqOuterClass.java
+51 -182
View File
@@ -19,29 +19,34 @@ public final class ChangeMpTeamAvatarReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 curAvatarGuid = 8;</code>
* <code>uint64 cur_avatar_guid = 8;</code>
* @return The curAvatarGuid.
*/
long getCurAvatarGuid();
/**
* <code>repeated uint64 avatarGuidList = 2;</code>
* <code>repeated uint64 avatar_guid_list = 9;</code>
* @return A list containing the avatarGuidList.
*/
java.util.List<java.lang.Long> getAvatarGuidListList();
/**
* <code>repeated uint64 avatarGuidList = 2;</code>
* <code>repeated uint64 avatar_guid_list = 9;</code>
* @return The count of avatarGuidList.
*/
int getAvatarGuidListCount();
/**
* <code>repeated uint64 avatarGuidList = 2;</code>
* <code>repeated uint64 avatar_guid_list = 9;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
long getAvatarGuidList(int index);
}
/**
* <pre>
* Name: EAACBMFACOK
* CmdId: 1660
* </pre>
*
* Protobuf type {@code ChangeMpTeamAvatarReq}
*/
public static final class ChangeMpTeamAvatarReq extends
@@ -88,7 +93,12 @@ public final class ChangeMpTeamAvatarReqOuterClass {
case 0:
done = true;
break;
case 16: {
case 64: {
curAvatarGuid_ = input.readUInt64();
break;
}
case 72: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
avatarGuidList_ = newLongList();
mutable_bitField0_ |= 0x00000001;
@@ -96,7 +106,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
avatarGuidList_.addLong(input.readUInt64());
break;
}
case 18: {
case 74: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -109,11 +119,6 @@ public final class ChangeMpTeamAvatarReqOuterClass {
input.popLimit(limit);
break;
}
case 64: {
curAvatarGuid_ = input.readUInt64();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -149,149 +154,10 @@ public final class ChangeMpTeamAvatarReqOuterClass {
emu.grasscutter.net.proto.ChangeMpTeamAvatarReqOuterClass.ChangeMpTeamAvatarReq.class, emu.grasscutter.net.proto.ChangeMpTeamAvatarReqOuterClass.ChangeMpTeamAvatarReq.Builder.class);
}
/**
* Protobuf enum {@code ChangeMpTeamAvatarReq.AJMGCPCANMH}
*/
public enum AJMGCPCANMH
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1784;</code>
*/
PEPPOHPHJOJ(1, 1784),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final AJMGCPCANMH DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final AJMGCPCANMH EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1784;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1784;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final int DCDNILFDFLB_VALUE = 0;
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
public static final int NNBKOLMPOEA_VALUE = 1;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final int EAJIABGAOCI_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 AJMGCPCANMH 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 AJMGCPCANMH forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1784: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<AJMGCPCANMH>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
AJMGCPCANMH> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<AJMGCPCANMH>() {
public AJMGCPCANMH findValueByNumber(int number) {
return AJMGCPCANMH.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.ChangeMpTeamAvatarReqOuterClass.ChangeMpTeamAvatarReq.getDescriptor().getEnumTypes().get(0);
}
private static final AJMGCPCANMH[] VALUES = getStaticValuesArray();
private static AJMGCPCANMH[] getStaticValuesArray() {
return new AJMGCPCANMH[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static AJMGCPCANMH 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 AJMGCPCANMH(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:ChangeMpTeamAvatarReq.AJMGCPCANMH)
}
public static final int CURAVATARGUID_FIELD_NUMBER = 8;
public static final int CUR_AVATAR_GUID_FIELD_NUMBER = 8;
private long curAvatarGuid_;
/**
* <code>uint64 curAvatarGuid = 8;</code>
* <code>uint64 cur_avatar_guid = 8;</code>
* @return The curAvatarGuid.
*/
@java.lang.Override
@@ -299,10 +165,10 @@ public final class ChangeMpTeamAvatarReqOuterClass {
return curAvatarGuid_;
}
public static final int AVATARGUIDLIST_FIELD_NUMBER = 2;
public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 9;
private com.google.protobuf.Internal.LongList avatarGuidList_;
/**
* <code>repeated uint64 avatarGuidList = 2;</code>
* <code>repeated uint64 avatar_guid_list = 9;</code>
* @return A list containing the avatarGuidList.
*/
@java.lang.Override
@@ -311,14 +177,14 @@ public final class ChangeMpTeamAvatarReqOuterClass {
return avatarGuidList_;
}
/**
* <code>repeated uint64 avatarGuidList = 2;</code>
* <code>repeated uint64 avatar_guid_list = 9;</code>
* @return The count of avatarGuidList.
*/
public int getAvatarGuidListCount() {
return avatarGuidList_.size();
}
/**
* <code>repeated uint64 avatarGuidList = 2;</code>
* <code>repeated uint64 avatar_guid_list = 9;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
@@ -342,16 +208,16 @@ public final class ChangeMpTeamAvatarReqOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (curAvatarGuid_ != 0L) {
output.writeUInt64(8, curAvatarGuid_);
}
if (getAvatarGuidListList().size() > 0) {
output.writeUInt32NoTag(18);
output.writeUInt32NoTag(74);
output.writeUInt32NoTag(avatarGuidListMemoizedSerializedSize);
}
for (int i = 0; i < avatarGuidList_.size(); i++) {
output.writeUInt64NoTag(avatarGuidList_.getLong(i));
}
if (curAvatarGuid_ != 0L) {
output.writeUInt64(8, curAvatarGuid_);
}
unknownFields.writeTo(output);
}
@@ -361,6 +227,10 @@ public final class ChangeMpTeamAvatarReqOuterClass {
if (size != -1) return size;
size = 0;
if (curAvatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(8, curAvatarGuid_);
}
{
int dataSize = 0;
for (int i = 0; i < avatarGuidList_.size(); i++) {
@@ -375,10 +245,6 @@ public final class ChangeMpTeamAvatarReqOuterClass {
}
avatarGuidListMemoizedSerializedSize = dataSize;
}
if (curAvatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(8, curAvatarGuid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -409,11 +275,11 @@ public final class ChangeMpTeamAvatarReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CURAVATARGUID_FIELD_NUMBER;
hash = (37 * hash) + CUR_AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getCurAvatarGuid());
if (getAvatarGuidListCount() > 0) {
hash = (37 * hash) + AVATARGUIDLIST_FIELD_NUMBER;
hash = (37 * hash) + AVATAR_GUID_LIST_FIELD_NUMBER;
hash = (53 * hash) + getAvatarGuidListList().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
@@ -512,6 +378,11 @@ public final class ChangeMpTeamAvatarReqOuterClass {
return builder;
}
/**
* <pre>
* Name: EAACBMFACOK
* CmdId: 1660
* </pre>
*
* Protobuf type {@code ChangeMpTeamAvatarReq}
*/
public static final class Builder extends
@@ -679,7 +550,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
private long curAvatarGuid_ ;
/**
* <code>uint64 curAvatarGuid = 8;</code>
* <code>uint64 cur_avatar_guid = 8;</code>
* @return The curAvatarGuid.
*/
@java.lang.Override
@@ -687,7 +558,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
return curAvatarGuid_;
}
/**
* <code>uint64 curAvatarGuid = 8;</code>
* <code>uint64 cur_avatar_guid = 8;</code>
* @param value The curAvatarGuid to set.
* @return This builder for chaining.
*/
@@ -698,7 +569,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
return this;
}
/**
* <code>uint64 curAvatarGuid = 8;</code>
* <code>uint64 cur_avatar_guid = 8;</code>
* @return This builder for chaining.
*/
public Builder clearCurAvatarGuid() {
@@ -716,7 +587,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
}
}
/**
* <code>repeated uint64 avatarGuidList = 2;</code>
* <code>repeated uint64 avatar_guid_list = 9;</code>
* @return A list containing the avatarGuidList.
*/
public java.util.List<java.lang.Long>
@@ -725,14 +596,14 @@ public final class ChangeMpTeamAvatarReqOuterClass {
java.util.Collections.unmodifiableList(avatarGuidList_) : avatarGuidList_;
}
/**
* <code>repeated uint64 avatarGuidList = 2;</code>
* <code>repeated uint64 avatar_guid_list = 9;</code>
* @return The count of avatarGuidList.
*/
public int getAvatarGuidListCount() {
return avatarGuidList_.size();
}
/**
* <code>repeated uint64 avatarGuidList = 2;</code>
* <code>repeated uint64 avatar_guid_list = 9;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
@@ -740,7 +611,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
return avatarGuidList_.getLong(index);
}
/**
* <code>repeated uint64 avatarGuidList = 2;</code>
* <code>repeated uint64 avatar_guid_list = 9;</code>
* @param index The index to set the value at.
* @param value The avatarGuidList to set.
* @return This builder for chaining.
@@ -753,7 +624,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
return this;
}
/**
* <code>repeated uint64 avatarGuidList = 2;</code>
* <code>repeated uint64 avatar_guid_list = 9;</code>
* @param value The avatarGuidList to add.
* @return This builder for chaining.
*/
@@ -764,7 +635,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
return this;
}
/**
* <code>repeated uint64 avatarGuidList = 2;</code>
* <code>repeated uint64 avatar_guid_list = 9;</code>
* @param values The avatarGuidList to add.
* @return This builder for chaining.
*/
@@ -777,7 +648,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
return this;
}
/**
* <code>repeated uint64 avatarGuidList = 2;</code>
* <code>repeated uint64 avatar_guid_list = 9;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuidList() {
@@ -853,12 +724,10 @@ public final class ChangeMpTeamAvatarReqOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\033ChangeMpTeamAvatarReq.proto\"\250\001\n\025Change" +
"MpTeamAvatarReq\022\025\n\rcurAvatarGuid\030\010 \001(\004\022\026" +
"\n\016avatarGuidList\030\002 \003(\004\"`\n\013AJMGCPCANMH\022\010\n" +
"\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\370\r\022\017\n\013DCDNILFDFLB" +
"\020\000\022\017\n\013NNBKOLMPOEA\020\001\022\017\n\013EAJIABGAOCI\020\001\032\002\020\001" +
"B\033\n\031emu.grasscutter.net.protob\006proto3"
"\n\033ChangeMpTeamAvatarReq.proto\"J\n\025ChangeM" +
"pTeamAvatarReq\022\027\n\017cur_avatar_guid\030\010 \001(\004\022" +
"\030\n\020avatar_guid_list\030\t \003(\004B\033\n\031emu.grasscu" +
"tter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,