mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-28 08:59:50 +08:00
update gc 3.4 (#2041)
* update 3.4 * update3.4 * update 3.4 * update 3.4 * Add files via upload * Delete SetPropCommand.java * update 3.4 area id * update version * exchange cmdid * exchange cmdid * exchange cmdid * my fault * update AiSyncInfo
This commit is contained in:
committed by
GitHub
Unverified
parent
39b4aa1387
commit
71a1e31d37
@@ -19,22 +19,22 @@ public final class AvatarRenameInfoOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>string avatar_name = 3;</code>
|
||||
* <code>uint32 avatarId = 1;</code>
|
||||
* @return The avatarId.
|
||||
*/
|
||||
int getAvatarId();
|
||||
|
||||
/**
|
||||
* <code>string avatarName = 8;</code>
|
||||
* @return The avatarName.
|
||||
*/
|
||||
java.lang.String getAvatarName();
|
||||
/**
|
||||
* <code>string avatar_name = 3;</code>
|
||||
* <code>string avatarName = 8;</code>
|
||||
* @return The bytes for avatarName.
|
||||
*/
|
||||
com.google.protobuf.ByteString
|
||||
getAvatarNameBytes();
|
||||
|
||||
/**
|
||||
* <code>uint32 avatar_id = 7;</code>
|
||||
* @return The avatarId.
|
||||
*/
|
||||
int getAvatarId();
|
||||
}
|
||||
/**
|
||||
* Protobuf type {@code AvatarRenameInfo}
|
||||
@@ -82,17 +82,17 @@ public final class AvatarRenameInfoOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 26: {
|
||||
case 8: {
|
||||
|
||||
avatarId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 66: {
|
||||
java.lang.String s = input.readStringRequireUtf8();
|
||||
|
||||
avatarName_ = s;
|
||||
break;
|
||||
}
|
||||
case 56: {
|
||||
|
||||
avatarId_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
if (!parseUnknownField(
|
||||
input, unknownFields, extensionRegistry, tag)) {
|
||||
@@ -125,10 +125,21 @@ public final class AvatarRenameInfoOuterClass {
|
||||
emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.class, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder.class);
|
||||
}
|
||||
|
||||
public static final int AVATAR_NAME_FIELD_NUMBER = 3;
|
||||
public static final int AVATARID_FIELD_NUMBER = 1;
|
||||
private int avatarId_;
|
||||
/**
|
||||
* <code>uint32 avatarId = 1;</code>
|
||||
* @return The avatarId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getAvatarId() {
|
||||
return avatarId_;
|
||||
}
|
||||
|
||||
public static final int AVATARNAME_FIELD_NUMBER = 8;
|
||||
private volatile java.lang.Object avatarName_;
|
||||
/**
|
||||
* <code>string avatar_name = 3;</code>
|
||||
* <code>string avatarName = 8;</code>
|
||||
* @return The avatarName.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -145,7 +156,7 @@ public final class AvatarRenameInfoOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>string avatar_name = 3;</code>
|
||||
* <code>string avatarName = 8;</code>
|
||||
* @return The bytes for avatarName.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -163,17 +174,6 @@ public final class AvatarRenameInfoOuterClass {
|
||||
}
|
||||
}
|
||||
|
||||
public static final int AVATAR_ID_FIELD_NUMBER = 7;
|
||||
private int avatarId_;
|
||||
/**
|
||||
* <code>uint32 avatar_id = 7;</code>
|
||||
* @return The avatarId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getAvatarId() {
|
||||
return avatarId_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -188,11 +188,11 @@ public final class AvatarRenameInfoOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
|
||||
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, avatarName_);
|
||||
}
|
||||
if (avatarId_ != 0) {
|
||||
output.writeUInt32(7, avatarId_);
|
||||
output.writeUInt32(1, avatarId_);
|
||||
}
|
||||
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
|
||||
com.google.protobuf.GeneratedMessageV3.writeString(output, 8, avatarName_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -203,12 +203,12 @@ public final class AvatarRenameInfoOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
|
||||
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, avatarName_);
|
||||
}
|
||||
if (avatarId_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(7, avatarId_);
|
||||
.computeUInt32Size(1, avatarId_);
|
||||
}
|
||||
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
|
||||
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, avatarName_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -225,10 +225,10 @@ public final class AvatarRenameInfoOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo other = (emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo) obj;
|
||||
|
||||
if (!getAvatarName()
|
||||
.equals(other.getAvatarName())) return false;
|
||||
if (getAvatarId()
|
||||
!= other.getAvatarId()) return false;
|
||||
if (!getAvatarName()
|
||||
.equals(other.getAvatarName())) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -240,10 +240,10 @@ public final class AvatarRenameInfoOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + AVATAR_NAME_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getAvatarName().hashCode();
|
||||
hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
|
||||
hash = (37 * hash) + AVATARID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getAvatarId();
|
||||
hash = (37 * hash) + AVATARNAME_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getAvatarName().hashCode();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -377,10 +377,10 @@ public final class AvatarRenameInfoOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
avatarName_ = "";
|
||||
|
||||
avatarId_ = 0;
|
||||
|
||||
avatarName_ = "";
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -407,8 +407,8 @@ public final class AvatarRenameInfoOuterClass {
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo buildPartial() {
|
||||
emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo result = new emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo(this);
|
||||
result.avatarName_ = avatarName_;
|
||||
result.avatarId_ = avatarId_;
|
||||
result.avatarName_ = avatarName_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -457,13 +457,13 @@ public final class AvatarRenameInfoOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo other) {
|
||||
if (other == emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.getDefaultInstance()) return this;
|
||||
if (other.getAvatarId() != 0) {
|
||||
setAvatarId(other.getAvatarId());
|
||||
}
|
||||
if (!other.getAvatarName().isEmpty()) {
|
||||
avatarName_ = other.avatarName_;
|
||||
onChanged();
|
||||
}
|
||||
if (other.getAvatarId() != 0) {
|
||||
setAvatarId(other.getAvatarId());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -493,9 +493,40 @@ public final class AvatarRenameInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int avatarId_ ;
|
||||
/**
|
||||
* <code>uint32 avatarId = 1;</code>
|
||||
* @return The avatarId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getAvatarId() {
|
||||
return avatarId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 avatarId = 1;</code>
|
||||
* @param value The avatarId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setAvatarId(int value) {
|
||||
|
||||
avatarId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 avatarId = 1;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearAvatarId() {
|
||||
|
||||
avatarId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private java.lang.Object avatarName_ = "";
|
||||
/**
|
||||
* <code>string avatar_name = 3;</code>
|
||||
* <code>string avatarName = 8;</code>
|
||||
* @return The avatarName.
|
||||
*/
|
||||
public java.lang.String getAvatarName() {
|
||||
@@ -511,7 +542,7 @@ public final class AvatarRenameInfoOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>string avatar_name = 3;</code>
|
||||
* <code>string avatarName = 8;</code>
|
||||
* @return The bytes for avatarName.
|
||||
*/
|
||||
public com.google.protobuf.ByteString
|
||||
@@ -528,7 +559,7 @@ public final class AvatarRenameInfoOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>string avatar_name = 3;</code>
|
||||
* <code>string avatarName = 8;</code>
|
||||
* @param value The avatarName to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -543,7 +574,7 @@ public final class AvatarRenameInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>string avatar_name = 3;</code>
|
||||
* <code>string avatarName = 8;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearAvatarName() {
|
||||
@@ -553,7 +584,7 @@ public final class AvatarRenameInfoOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>string avatar_name = 3;</code>
|
||||
* <code>string avatarName = 8;</code>
|
||||
* @param value The bytes for avatarName to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -568,37 +599,6 @@ public final class AvatarRenameInfoOuterClass {
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int avatarId_ ;
|
||||
/**
|
||||
* <code>uint32 avatar_id = 7;</code>
|
||||
* @return The avatarId.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getAvatarId() {
|
||||
return avatarId_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 avatar_id = 7;</code>
|
||||
* @param value The avatarId to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setAvatarId(int value) {
|
||||
|
||||
avatarId_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 avatar_id = 7;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearAvatarId() {
|
||||
|
||||
avatarId_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -666,10 +666,9 @@ public final class AvatarRenameInfoOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\026AvatarRenameInfo.proto\":\n\020AvatarRename" +
|
||||
"Info\022\023\n\013avatar_name\030\003 \001(\t\022\021\n\tavatar_id\030\007" +
|
||||
" \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
|
||||
"3"
|
||||
"\n\026AvatarRenameInfo.proto\"8\n\020AvatarRename" +
|
||||
"Info\022\020\n\010avatarId\030\001 \001(\r\022\022\n\navatarName\030\010 \001" +
|
||||
"(\tB\033\n\031emu.grasscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
@@ -680,7 +679,7 @@ public final class AvatarRenameInfoOuterClass {
|
||||
internal_static_AvatarRenameInfo_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_AvatarRenameInfo_descriptor,
|
||||
new java.lang.String[] { "AvatarName", "AvatarId", });
|
||||
new java.lang.String[] { "AvatarId", "AvatarName", });
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user