Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-25 21:00:00 +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/AvatarTeamOuterClass.java
+153 -153
View File
@@ -19,37 +19,37 @@ public final class AvatarTeamOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>string team_name = 4;</code>
* @return The teamName.
*/
java.lang.String getTeamName();
/**
* <code>string team_name = 4;</code>
* @return The bytes for teamName.
*/
com.google.protobuf.ByteString
getTeamNameBytes();
/**
* <code>repeated uint64 avatar_guid_list = 14;</code>
* <code>repeated uint64 avatar_guid_list = 15;</code>
* @return A list containing the avatarGuidList.
*/
java.util.List<java.lang.Long> getAvatarGuidListList();
/**
* <code>repeated uint64 avatar_guid_list = 14;</code>
* <code>repeated uint64 avatar_guid_list = 15;</code>
* @return The count of avatarGuidList.
*/
int getAvatarGuidListCount();
/**
* <code>repeated uint64 avatar_guid_list = 14;</code>
* <code>repeated uint64 avatar_guid_list = 15;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
long getAvatarGuidList(int index);
/**
* <code>string team_name = 2;</code>
* @return The teamName.
*/
java.lang.String getTeamName();
/**
* <code>string team_name = 2;</code>
* @return The bytes for teamName.
*/
com.google.protobuf.ByteString
getTeamNameBytes();
}
/**
* <pre>
* Name: LBJMAKBIBJO
* Name: MFJBPEPMJOH
* </pre>
*
* Protobuf type {@code AvatarTeam}
@@ -64,8 +64,8 @@ public final class AvatarTeamOuterClass {
super(builder);
}
private AvatarTeam() {
teamName_ = "";
avatarGuidList_ = emptyLongList();
teamName_ = "";
}
@java.lang.Override
@@ -99,13 +99,13 @@ public final class AvatarTeamOuterClass {
case 0:
done = true;
break;
case 34: {
case 18: {
java.lang.String s = input.readStringRequireUtf8();
teamName_ = s;
break;
}
case 112: {
case 120: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
avatarGuidList_ = newLongList();
mutable_bitField0_ |= 0x00000001;
@@ -113,7 +113,7 @@ public final class AvatarTeamOuterClass {
avatarGuidList_.addLong(input.readUInt64());
break;
}
case 114: {
case 122: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -161,10 +161,38 @@ public final class AvatarTeamOuterClass {
emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam.class, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam.Builder.class);
}
public static final int TEAM_NAME_FIELD_NUMBER = 4;
public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 15;
private com.google.protobuf.Internal.LongList avatarGuidList_;
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* @return A list containing the avatarGuidList.
*/
@java.lang.Override
public java.util.List<java.lang.Long>
getAvatarGuidListList() {
return avatarGuidList_;
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* @return The count of avatarGuidList.
*/
public int getAvatarGuidListCount() {
return avatarGuidList_.size();
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
public long getAvatarGuidList(int index) {
return avatarGuidList_.getLong(index);
}
private int avatarGuidListMemoizedSerializedSize = -1;
public static final int TEAM_NAME_FIELD_NUMBER = 2;
private volatile java.lang.Object teamName_;
/**
* <code>string team_name = 4;</code>
* <code>string team_name = 2;</code>
* @return The teamName.
*/
@java.lang.Override
@@ -181,7 +209,7 @@ public final class AvatarTeamOuterClass {
}
}
/**
* <code>string team_name = 4;</code>
* <code>string team_name = 2;</code>
* @return The bytes for teamName.
*/
@java.lang.Override
@@ -199,34 +227,6 @@ public final class AvatarTeamOuterClass {
}
}
public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 14;
private com.google.protobuf.Internal.LongList avatarGuidList_;
/**
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @return A list containing the avatarGuidList.
*/
@java.lang.Override
public java.util.List<java.lang.Long>
getAvatarGuidListList() {
return avatarGuidList_;
}
/**
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @return The count of avatarGuidList.
*/
public int getAvatarGuidListCount() {
return avatarGuidList_.size();
}
/**
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
public long getAvatarGuidList(int index) {
return avatarGuidList_.getLong(index);
}
private int avatarGuidListMemoizedSerializedSize = -1;
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -243,10 +243,10 @@ public final class AvatarTeamOuterClass {
throws java.io.IOException {
getSerializedSize();
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(teamName_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, teamName_);
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, teamName_);
}
if (getAvatarGuidListList().size() > 0) {
output.writeUInt32NoTag(114);
output.writeUInt32NoTag(122);
output.writeUInt32NoTag(avatarGuidListMemoizedSerializedSize);
}
for (int i = 0; i < avatarGuidList_.size(); i++) {
@@ -262,7 +262,7 @@ public final class AvatarTeamOuterClass {
size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(teamName_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, teamName_);
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, teamName_);
}
{
int dataSize = 0;
@@ -293,10 +293,10 @@ public final class AvatarTeamOuterClass {
}
emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam other = (emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam) obj;
if (!getTeamName()
.equals(other.getTeamName())) return false;
if (!getAvatarGuidListList()
.equals(other.getAvatarGuidListList())) return false;
if (!getTeamName()
.equals(other.getTeamName())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -308,12 +308,12 @@ public final class AvatarTeamOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TEAM_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTeamName().hashCode();
if (getAvatarGuidListCount() > 0) {
hash = (37 * hash) + AVATAR_GUID_LIST_FIELD_NUMBER;
hash = (53 * hash) + getAvatarGuidListList().hashCode();
}
hash = (37 * hash) + TEAM_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTeamName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -411,7 +411,7 @@ public final class AvatarTeamOuterClass {
}
/**
* <pre>
* Name: LBJMAKBIBJO
* Name: MFJBPEPMJOH
* </pre>
*
* Protobuf type {@code AvatarTeam}
@@ -451,10 +451,10 @@ public final class AvatarTeamOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
teamName_ = "";
avatarGuidList_ = emptyLongList();
bitField0_ = (bitField0_ & ~0x00000001);
teamName_ = "";
return this;
}
@@ -482,12 +482,12 @@ public final class AvatarTeamOuterClass {
public emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam buildPartial() {
emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam result = new emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam(this);
int from_bitField0_ = bitField0_;
result.teamName_ = teamName_;
if (((bitField0_ & 0x00000001) != 0)) {
avatarGuidList_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000001);
}
result.avatarGuidList_ = avatarGuidList_;
result.teamName_ = teamName_;
onBuilt();
return result;
}
@@ -536,10 +536,6 @@ public final class AvatarTeamOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam other) {
if (other == emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam.getDefaultInstance()) return this;
if (!other.getTeamName().isEmpty()) {
teamName_ = other.teamName_;
onChanged();
}
if (!other.avatarGuidList_.isEmpty()) {
if (avatarGuidList_.isEmpty()) {
avatarGuidList_ = other.avatarGuidList_;
@@ -550,6 +546,10 @@ public final class AvatarTeamOuterClass {
}
onChanged();
}
if (!other.getTeamName().isEmpty()) {
teamName_ = other.teamName_;
onChanged();
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -580,9 +580,88 @@ public final class AvatarTeamOuterClass {
}
private int bitField0_;
private com.google.protobuf.Internal.LongList avatarGuidList_ = emptyLongList();
private void ensureAvatarGuidListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
avatarGuidList_ = mutableCopy(avatarGuidList_);
bitField0_ |= 0x00000001;
}
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* @return A list containing the avatarGuidList.
*/
public java.util.List<java.lang.Long>
getAvatarGuidListList() {
return ((bitField0_ & 0x00000001) != 0) ?
java.util.Collections.unmodifiableList(avatarGuidList_) : avatarGuidList_;
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* @return The count of avatarGuidList.
*/
public int getAvatarGuidListCount() {
return avatarGuidList_.size();
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
public long getAvatarGuidList(int index) {
return avatarGuidList_.getLong(index);
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* @param index The index to set the value at.
* @param value The avatarGuidList to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuidList(
int index, long value) {
ensureAvatarGuidListIsMutable();
avatarGuidList_.setLong(index, value);
onChanged();
return this;
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* @param value The avatarGuidList to add.
* @return This builder for chaining.
*/
public Builder addAvatarGuidList(long value) {
ensureAvatarGuidListIsMutable();
avatarGuidList_.addLong(value);
onChanged();
return this;
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* @param values The avatarGuidList to add.
* @return This builder for chaining.
*/
public Builder addAllAvatarGuidList(
java.lang.Iterable<? extends java.lang.Long> values) {
ensureAvatarGuidListIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(
values, avatarGuidList_);
onChanged();
return this;
}
/**
* <code>repeated uint64 avatar_guid_list = 15;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuidList() {
avatarGuidList_ = emptyLongList();
bitField0_ = (bitField0_ & ~0x00000001);
onChanged();
return this;
}
private java.lang.Object teamName_ = "";
/**
* <code>string team_name = 4;</code>
* <code>string team_name = 2;</code>
* @return The teamName.
*/
public java.lang.String getTeamName() {
@@ -598,7 +677,7 @@ public final class AvatarTeamOuterClass {
}
}
/**
* <code>string team_name = 4;</code>
* <code>string team_name = 2;</code>
* @return The bytes for teamName.
*/
public com.google.protobuf.ByteString
@@ -615,7 +694,7 @@ public final class AvatarTeamOuterClass {
}
}
/**
* <code>string team_name = 4;</code>
* <code>string team_name = 2;</code>
* @param value The teamName to set.
* @return This builder for chaining.
*/
@@ -630,7 +709,7 @@ public final class AvatarTeamOuterClass {
return this;
}
/**
* <code>string team_name = 4;</code>
* <code>string team_name = 2;</code>
* @return This builder for chaining.
*/
public Builder clearTeamName() {
@@ -640,7 +719,7 @@ public final class AvatarTeamOuterClass {
return this;
}
/**
* <code>string team_name = 4;</code>
* <code>string team_name = 2;</code>
* @param value The bytes for teamName to set.
* @return This builder for chaining.
*/
@@ -655,85 +734,6 @@ public final class AvatarTeamOuterClass {
onChanged();
return this;
}
private com.google.protobuf.Internal.LongList avatarGuidList_ = emptyLongList();
private void ensureAvatarGuidListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
avatarGuidList_ = mutableCopy(avatarGuidList_);
bitField0_ |= 0x00000001;
}
}
/**
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @return A list containing the avatarGuidList.
*/
public java.util.List<java.lang.Long>
getAvatarGuidListList() {
return ((bitField0_ & 0x00000001) != 0) ?
java.util.Collections.unmodifiableList(avatarGuidList_) : avatarGuidList_;
}
/**
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @return The count of avatarGuidList.
*/
public int getAvatarGuidListCount() {
return avatarGuidList_.size();
}
/**
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @param index The index of the element to return.
* @return The avatarGuidList at the given index.
*/
public long getAvatarGuidList(int index) {
return avatarGuidList_.getLong(index);
}
/**
* <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.
*/
public Builder setAvatarGuidList(
int index, long value) {
ensureAvatarGuidListIsMutable();
avatarGuidList_.setLong(index, value);
onChanged();
return this;
}
/**
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @param value The avatarGuidList to add.
* @return This builder for chaining.
*/
public Builder addAvatarGuidList(long value) {
ensureAvatarGuidListIsMutable();
avatarGuidList_.addLong(value);
onChanged();
return this;
}
/**
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @param values The avatarGuidList to add.
* @return This builder for chaining.
*/
public Builder addAllAvatarGuidList(
java.lang.Iterable<? extends java.lang.Long> values) {
ensureAvatarGuidListIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(
values, avatarGuidList_);
onChanged();
return this;
}
/**
* <code>repeated uint64 avatar_guid_list = 14;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuidList() {
avatarGuidList_ = emptyLongList();
bitField0_ = (bitField0_ & ~0x00000001);
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -801,8 +801,8 @@ public final class AvatarTeamOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\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" +
"\n\020AvatarTeam.proto\"9\n\nAvatarTeam\022\030\n\020avat" +
"ar_guid_list\030\017 \003(\004\022\021\n\tteam_name\030\002 \001(\tB\033\n" +
"\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -814,7 +814,7 @@ public final class AvatarTeamOuterClass {
internal_static_AvatarTeam_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarTeam_descriptor,
new java.lang.String[] { "TeamName", "AvatarGuidList", });
new java.lang.String[] { "AvatarGuidList", "TeamName", });
}
// @@protoc_insertion_point(outer_class_scope)