mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-24 12:59:50 +08:00
Add support for v3.5.0 (#2090)
* 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
committed by
GitHub
Unverified
GitHub
parent
922f7bca51
commit
516e5975e1
@@ -19,35 +19,39 @@ public final class AvatarTeamOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>string teamName = 11;</code>
|
||||
* <code>string team_name = 4;</code>
|
||||
* @return The teamName.
|
||||
*/
|
||||
java.lang.String getTeamName();
|
||||
/**
|
||||
* <code>string teamName = 11;</code>
|
||||
* <code>string team_name = 4;</code>
|
||||
* @return The bytes for teamName.
|
||||
*/
|
||||
com.google.protobuf.ByteString
|
||||
getTeamNameBytes();
|
||||
|
||||
/**
|
||||
* <code>repeated uint64 avatarGuidList = 5;</code>
|
||||
* <code>repeated uint64 avatar_guid_list = 14;</code>
|
||||
* @return A list containing the avatarGuidList.
|
||||
*/
|
||||
java.util.List<java.lang.Long> getAvatarGuidListList();
|
||||
/**
|
||||
* <code>repeated uint64 avatarGuidList = 5;</code>
|
||||
* <code>repeated uint64 avatar_guid_list = 14;</code>
|
||||
* @return The count of avatarGuidList.
|
||||
*/
|
||||
int getAvatarGuidListCount();
|
||||
/**
|
||||
* <code>repeated uint64 avatarGuidList = 5;</code>
|
||||
* <code>repeated uint64 avatar_guid_list = 14;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The avatarGuidList at the given index.
|
||||
*/
|
||||
long getAvatarGuidList(int index);
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: LBJMAKBIBJO
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code AvatarTeam}
|
||||
*/
|
||||
public static final class AvatarTeam extends
|
||||
@@ -95,7 +99,13 @@ public final class AvatarTeamOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 40: {
|
||||
case 34: {
|
||||
java.lang.String s = input.readStringRequireUtf8();
|
||||
|
||||
teamName_ = s;
|
||||
break;
|
||||
}
|
||||
case 112: {
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
|
||||
avatarGuidList_ = newLongList();
|
||||
mutable_bitField0_ |= 0x00000001;
|
||||
@@ -103,7 +113,7 @@ public final class AvatarTeamOuterClass {
|
||||
avatarGuidList_.addLong(input.readUInt64());
|
||||
break;
|
||||
}
|
||||
case 42: {
|
||||
case 114: {
|
||||
int length = input.readRawVarint32();
|
||||
int limit = input.pushLimit(length);
|
||||
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
|
||||
@@ -116,12 +126,6 @@ public final class AvatarTeamOuterClass {
|
||||
input.popLimit(limit);
|
||||
break;
|
||||
}
|
||||
case 90: {
|
||||
java.lang.String s = input.readStringRequireUtf8();
|
||||
|
||||
teamName_ = s;
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
if (!parseUnknownField(
|
||||
input, unknownFields, extensionRegistry, tag)) {
|
||||
@@ -157,10 +161,10 @@ public final class AvatarTeamOuterClass {
|
||||
emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam.class, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam.Builder.class);
|
||||
}
|
||||
|
||||
public static final int TEAMNAME_FIELD_NUMBER = 11;
|
||||
public static final int TEAM_NAME_FIELD_NUMBER = 4;
|
||||
private volatile java.lang.Object teamName_;
|
||||
/**
|
||||
* <code>string teamName = 11;</code>
|
||||
* <code>string team_name = 4;</code>
|
||||
* @return The teamName.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -177,7 +181,7 @@ public final class AvatarTeamOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>string teamName = 11;</code>
|
||||
* <code>string team_name = 4;</code>
|
||||
* @return The bytes for teamName.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -195,10 +199,10 @@ public final class AvatarTeamOuterClass {
|
||||
}
|
||||
}
|
||||
|
||||
public static final int AVATARGUIDLIST_FIELD_NUMBER = 5;
|
||||
public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 14;
|
||||
private com.google.protobuf.Internal.LongList avatarGuidList_;
|
||||
/**
|
||||
* <code>repeated uint64 avatarGuidList = 5;</code>
|
||||
* <code>repeated uint64 avatar_guid_list = 14;</code>
|
||||
* @return A list containing the avatarGuidList.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -207,14 +211,14 @@ public final class AvatarTeamOuterClass {
|
||||
return avatarGuidList_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint64 avatarGuidList = 5;</code>
|
||||
* <code>repeated uint64 avatar_guid_list = 14;</code>
|
||||
* @return The count of avatarGuidList.
|
||||
*/
|
||||
public int getAvatarGuidListCount() {
|
||||
return avatarGuidList_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint64 avatarGuidList = 5;</code>
|
||||
* <code>repeated uint64 avatar_guid_list = 14;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The avatarGuidList at the given index.
|
||||
*/
|
||||
@@ -238,16 +242,16 @@ public final class AvatarTeamOuterClass {
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
getSerializedSize();
|
||||
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(teamName_)) {
|
||||
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, teamName_);
|
||||
}
|
||||
if (getAvatarGuidListList().size() > 0) {
|
||||
output.writeUInt32NoTag(42);
|
||||
output.writeUInt32NoTag(114);
|
||||
output.writeUInt32NoTag(avatarGuidListMemoizedSerializedSize);
|
||||
}
|
||||
for (int i = 0; i < avatarGuidList_.size(); i++) {
|
||||
output.writeUInt64NoTag(avatarGuidList_.getLong(i));
|
||||
}
|
||||
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(teamName_)) {
|
||||
com.google.protobuf.GeneratedMessageV3.writeString(output, 11, teamName_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
|
||||
@@ -257,6 +261,9 @@ public final class AvatarTeamOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(teamName_)) {
|
||||
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, teamName_);
|
||||
}
|
||||
{
|
||||
int dataSize = 0;
|
||||
for (int i = 0; i < avatarGuidList_.size(); i++) {
|
||||
@@ -271,9 +278,6 @@ public final class AvatarTeamOuterClass {
|
||||
}
|
||||
avatarGuidListMemoizedSerializedSize = dataSize;
|
||||
}
|
||||
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(teamName_)) {
|
||||
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, teamName_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
return size;
|
||||
@@ -304,10 +308,10 @@ public final class AvatarTeamOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + TEAMNAME_FIELD_NUMBER;
|
||||
hash = (37 * hash) + TEAM_NAME_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getTeamName().hashCode();
|
||||
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();
|
||||
@@ -406,6 +410,10 @@ public final class AvatarTeamOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: LBJMAKBIBJO
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code AvatarTeam}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -574,7 +582,7 @@ public final class AvatarTeamOuterClass {
|
||||
|
||||
private java.lang.Object teamName_ = "";
|
||||
/**
|
||||
* <code>string teamName = 11;</code>
|
||||
* <code>string team_name = 4;</code>
|
||||
* @return The teamName.
|
||||
*/
|
||||
public java.lang.String getTeamName() {
|
||||
@@ -590,7 +598,7 @@ public final class AvatarTeamOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>string teamName = 11;</code>
|
||||
* <code>string team_name = 4;</code>
|
||||
* @return The bytes for teamName.
|
||||
*/
|
||||
public com.google.protobuf.ByteString
|
||||
@@ -607,7 +615,7 @@ public final class AvatarTeamOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>string teamName = 11;</code>
|
||||
* <code>string team_name = 4;</code>
|
||||
* @param value The teamName to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -622,7 +630,7 @@ public final class AvatarTeamOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>string teamName = 11;</code>
|
||||
* <code>string team_name = 4;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearTeamName() {
|
||||
@@ -632,7 +640,7 @@ public final class AvatarTeamOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>string teamName = 11;</code>
|
||||
* <code>string team_name = 4;</code>
|
||||
* @param value The bytes for teamName to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -656,7 +664,7 @@ public final class AvatarTeamOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint64 avatarGuidList = 5;</code>
|
||||
* <code>repeated uint64 avatar_guid_list = 14;</code>
|
||||
* @return A list containing the avatarGuidList.
|
||||
*/
|
||||
public java.util.List<java.lang.Long>
|
||||
@@ -665,14 +673,14 @@ public final class AvatarTeamOuterClass {
|
||||
java.util.Collections.unmodifiableList(avatarGuidList_) : avatarGuidList_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint64 avatarGuidList = 5;</code>
|
||||
* <code>repeated uint64 avatar_guid_list = 14;</code>
|
||||
* @return The count of avatarGuidList.
|
||||
*/
|
||||
public int getAvatarGuidListCount() {
|
||||
return avatarGuidList_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint64 avatarGuidList = 5;</code>
|
||||
* <code>repeated uint64 avatar_guid_list = 14;</code>
|
||||
* @param index The index of the element to return.
|
||||
* @return The avatarGuidList at the given index.
|
||||
*/
|
||||
@@ -680,7 +688,7 @@ public final class AvatarTeamOuterClass {
|
||||
return avatarGuidList_.getLong(index);
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint64 avatarGuidList = 5;</code>
|
||||
* <code>repeated uint64 avatar_guid_list = 14;</code>
|
||||
* @param index The index to set the value at.
|
||||
* @param value The avatarGuidList to set.
|
||||
* @return This builder for chaining.
|
||||
@@ -693,7 +701,7 @@ public final class AvatarTeamOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint64 avatarGuidList = 5;</code>
|
||||
* <code>repeated uint64 avatar_guid_list = 14;</code>
|
||||
* @param value The avatarGuidList to add.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -704,7 +712,7 @@ public final class AvatarTeamOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint64 avatarGuidList = 5;</code>
|
||||
* <code>repeated uint64 avatar_guid_list = 14;</code>
|
||||
* @param values The avatarGuidList to add.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -717,7 +725,7 @@ public final class AvatarTeamOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated uint64 avatarGuidList = 5;</code>
|
||||
* <code>repeated uint64 avatar_guid_list = 14;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearAvatarGuidList() {
|
||||
@@ -793,9 +801,9 @@ public final class AvatarTeamOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\020AvatarTeam.proto\"6\n\nAvatarTeam\022\020\n\010team" +
|
||||
"Name\030\013 \001(\t\022\026\n\016avatarGuidList\030\005 \003(\004B\033\n\031em" +
|
||||
"u.grasscutter.net.protob\006proto3"
|
||||
"\n\020AvatarTeam.proto\"9\n\nAvatarTeam\022\021\n\tteam" +
|
||||
"_name\030\004 \001(\t\022\030\n\020avatar_guid_list\030\016 \003(\004B\033\n" +
|
||||
"\031emu.grasscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
||||
Reference in New Issue
Block a user