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:
yeyeye
2023-02-19 11:18:27 +08:00
committed by GitHub
Unverified
parent 39b4aa1387
commit 71a1e31d37
1191 changed files with 459994 additions and 172995 deletions
@@ -19,34 +19,34 @@ public final class PlayerWidgetInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 uid = 6;</code>
* @return The uid.
*/
int getUid();
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData>
getSlotListList();
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlotList(int index);
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
int getSlotListCount();
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder>
getSlotListOrBuilderList();
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotListOrBuilder(
int index);
/**
* <code>uint32 uid = 10;</code>
* @return The uid.
*/
int getUid();
}
/**
* Protobuf type {@code PlayerWidgetInfo}
@@ -95,7 +95,12 @@ public final class PlayerWidgetInfoOuterClass {
case 0:
done = true;
break;
case 34: {
case 80: {
uid_ = input.readUInt32();
break;
}
case 122: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
slotList_ = new java.util.ArrayList<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData>();
mutable_bitField0_ |= 0x00000001;
@@ -104,11 +109,6 @@ public final class PlayerWidgetInfoOuterClass {
input.readMessage(emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.parser(), extensionRegistry));
break;
}
case 48: {
uid_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -144,28 +144,17 @@ public final class PlayerWidgetInfoOuterClass {
emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.class, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder.class);
}
public static final int UID_FIELD_NUMBER = 6;
private int uid_;
/**
* <code>uint32 uid = 6;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
public static final int SLOT_LIST_FIELD_NUMBER = 4;
public static final int SLOTLIST_FIELD_NUMBER = 15;
private java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> slotList_;
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> getSlotListList() {
return slotList_;
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder>
@@ -173,21 +162,21 @@ public final class PlayerWidgetInfoOuterClass {
return slotList_;
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
@java.lang.Override
public int getSlotListCount() {
return slotList_.size();
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlotList(int index) {
return slotList_.get(index);
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotListOrBuilder(
@@ -195,6 +184,17 @@ public final class PlayerWidgetInfoOuterClass {
return slotList_.get(index);
}
public static final int UID_FIELD_NUMBER = 10;
private int uid_;
/**
* <code>uint32 uid = 10;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -209,11 +209,11 @@ public final class PlayerWidgetInfoOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
for (int i = 0; i < slotList_.size(); i++) {
output.writeMessage(4, slotList_.get(i));
}
if (uid_ != 0) {
output.writeUInt32(6, uid_);
output.writeUInt32(10, uid_);
}
for (int i = 0; i < slotList_.size(); i++) {
output.writeMessage(15, slotList_.get(i));
}
unknownFields.writeTo(output);
}
@@ -224,13 +224,13 @@ public final class PlayerWidgetInfoOuterClass {
if (size != -1) return size;
size = 0;
for (int i = 0; i < slotList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, slotList_.get(i));
}
if (uid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, uid_);
.computeUInt32Size(10, uid_);
}
for (int i = 0; i < slotList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(15, slotList_.get(i));
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -247,10 +247,10 @@ public final class PlayerWidgetInfoOuterClass {
}
emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo other = (emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo) obj;
if (getUid()
!= other.getUid()) return false;
if (!getSlotListList()
.equals(other.getSlotListList())) return false;
if (getUid()
!= other.getUid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -262,12 +262,12 @@ public final class PlayerWidgetInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + UID_FIELD_NUMBER;
hash = (53 * hash) + getUid();
if (getSlotListCount() > 0) {
hash = (37 * hash) + SLOT_LIST_FIELD_NUMBER;
hash = (37 * hash) + SLOTLIST_FIELD_NUMBER;
hash = (53 * hash) + getSlotListList().hashCode();
}
hash = (37 * hash) + UID_FIELD_NUMBER;
hash = (53 * hash) + getUid();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -402,14 +402,14 @@ public final class PlayerWidgetInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
uid_ = 0;
if (slotListBuilder_ == null) {
slotList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
} else {
slotListBuilder_.clear();
}
uid_ = 0;
return this;
}
@@ -437,7 +437,6 @@ public final class PlayerWidgetInfoOuterClass {
public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo buildPartial() {
emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo result = new emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo(this);
int from_bitField0_ = bitField0_;
result.uid_ = uid_;
if (slotListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
slotList_ = java.util.Collections.unmodifiableList(slotList_);
@@ -447,6 +446,7 @@ public final class PlayerWidgetInfoOuterClass {
} else {
result.slotList_ = slotListBuilder_.build();
}
result.uid_ = uid_;
onBuilt();
return result;
}
@@ -495,9 +495,6 @@ public final class PlayerWidgetInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo other) {
if (other == emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.getDefaultInstance()) return this;
if (other.getUid() != 0) {
setUid(other.getUid());
}
if (slotListBuilder_ == null) {
if (!other.slotList_.isEmpty()) {
if (slotList_.isEmpty()) {
@@ -524,6 +521,9 @@ public final class PlayerWidgetInfoOuterClass {
}
}
}
if (other.getUid() != 0) {
setUid(other.getUid());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -554,37 +554,6 @@ public final class PlayerWidgetInfoOuterClass {
}
private int bitField0_;
private int uid_ ;
/**
* <code>uint32 uid = 6;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
/**
* <code>uint32 uid = 6;</code>
* @param value The uid to set.
* @return This builder for chaining.
*/
public Builder setUid(int value) {
uid_ = value;
onChanged();
return this;
}
/**
* <code>uint32 uid = 6;</code>
* @return This builder for chaining.
*/
public Builder clearUid() {
uid_ = 0;
onChanged();
return this;
}
private java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> slotList_ =
java.util.Collections.emptyList();
private void ensureSlotListIsMutable() {
@@ -598,7 +567,7 @@ public final class PlayerWidgetInfoOuterClass {
emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder> slotListBuilder_;
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> getSlotListList() {
if (slotListBuilder_ == null) {
@@ -608,7 +577,7 @@ public final class PlayerWidgetInfoOuterClass {
}
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public int getSlotListCount() {
if (slotListBuilder_ == null) {
@@ -618,7 +587,7 @@ public final class PlayerWidgetInfoOuterClass {
}
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlotList(int index) {
if (slotListBuilder_ == null) {
@@ -628,7 +597,7 @@ public final class PlayerWidgetInfoOuterClass {
}
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public Builder setSlotList(
int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
@@ -645,7 +614,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public Builder setSlotList(
int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -659,7 +628,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public Builder addSlotList(emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
if (slotListBuilder_ == null) {
@@ -675,7 +644,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public Builder addSlotList(
int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
@@ -692,7 +661,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public Builder addSlotList(
emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -706,7 +675,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public Builder addSlotList(
int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -720,7 +689,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public Builder addAllSlotList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> values) {
@@ -735,7 +704,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public Builder clearSlotList() {
if (slotListBuilder_ == null) {
@@ -748,7 +717,7 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public Builder removeSlotList(int index) {
if (slotListBuilder_ == null) {
@@ -761,14 +730,14 @@ public final class PlayerWidgetInfoOuterClass {
return this;
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder getSlotListBuilder(
int index) {
return getSlotListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotListOrBuilder(
int index) {
@@ -778,7 +747,7 @@ public final class PlayerWidgetInfoOuterClass {
}
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder>
getSlotListOrBuilderList() {
@@ -789,14 +758,14 @@ public final class PlayerWidgetInfoOuterClass {
}
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder addSlotListBuilder() {
return getSlotListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.getDefaultInstance());
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder addSlotListBuilder(
int index) {
@@ -804,7 +773,7 @@ public final class PlayerWidgetInfoOuterClass {
index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.getDefaultInstance());
}
/**
* <code>repeated .WidgetSlotData slot_list = 4;</code>
* <code>repeated .WidgetSlotData slotList = 15;</code>
*/
public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder>
getSlotListBuilderList() {
@@ -824,6 +793,37 @@ public final class PlayerWidgetInfoOuterClass {
}
return slotListBuilder_;
}
private int uid_ ;
/**
* <code>uint32 uid = 10;</code>
* @return The uid.
*/
@java.lang.Override
public int getUid() {
return uid_;
}
/**
* <code>uint32 uid = 10;</code>
* @param value The uid to set.
* @return This builder for chaining.
*/
public Builder setUid(int value) {
uid_ = value;
onChanged();
return this;
}
/**
* <code>uint32 uid = 10;</code>
* @return This builder for chaining.
*/
public Builder clearUid() {
uid_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -892,9 +892,9 @@ public final class PlayerWidgetInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\026PlayerWidgetInfo.proto\032\024WidgetSlotData" +
".proto\"C\n\020PlayerWidgetInfo\022\013\n\003uid\030\006 \001(\r\022" +
"\"\n\tslot_list\030\004 \003(\0132\017.WidgetSlotDataB\033\n\031e" +
"mu.grasscutter.net.protob\006proto3"
".proto\"B\n\020PlayerWidgetInfo\022!\n\010slotList\030\017" +
" \003(\0132\017.WidgetSlotData\022\013\n\003uid\030\n \001(\rB\033\n\031em" +
"u.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -906,7 +906,7 @@ public final class PlayerWidgetInfoOuterClass {
internal_static_PlayerWidgetInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PlayerWidgetInfo_descriptor,
new java.lang.String[] { "Uid", "SlotList", });
new java.lang.String[] { "SlotList", "Uid", });
emu.grasscutter.net.proto.WidgetSlotDataOuterClass.getDescriptor();
}