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
@@ -18,27 +18,6 @@ public final class DigMarkPointOuterClass {
// @@protoc_insertion_point(interface_extends:DigMarkPoint)
com.google.protobuf.MessageOrBuilder {
/**
* <code>.Vector pos = 11;</code>
* @return Whether the pos field is set.
*/
boolean hasPos();
/**
* <code>.Vector pos = 11;</code>
* @return The pos.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
/**
* <code>.Vector pos = 11;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
/**
* <code>uint32 bundle_id = 3;</code>
* @return The bundleId.
*/
int getBundleId();
/**
* <code>.Vector rot = 14;</code>
* @return Whether the rot field is set.
@@ -53,6 +32,27 @@ public final class DigMarkPointOuterClass {
* <code>.Vector rot = 14;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
/**
* <code>.Vector pos = 2;</code>
* @return Whether the pos field is set.
*/
boolean hasPos();
/**
* <code>.Vector pos = 2;</code>
* @return The pos.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
/**
* <code>.Vector pos = 2;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
/**
* <code>uint32 bundleId = 3;</code>
* @return The bundleId.
*/
int getBundleId();
}
/**
* Protobuf type {@code DigMarkPoint}
@@ -99,12 +99,7 @@ public final class DigMarkPointOuterClass {
case 0:
done = true;
break;
case 24: {
bundleId_ = input.readUInt32();
break;
}
case 90: {
case 18: {
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
if (pos_ != null) {
subBuilder = pos_.toBuilder();
@@ -117,6 +112,11 @@ public final class DigMarkPointOuterClass {
break;
}
case 24: {
bundleId_ = input.readUInt32();
break;
}
case 114: {
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
if (rot_ != null) {
@@ -162,43 +162,6 @@ public final class DigMarkPointOuterClass {
emu.grasscutter.net.proto.DigMarkPointOuterClass.DigMarkPoint.class, emu.grasscutter.net.proto.DigMarkPointOuterClass.DigMarkPoint.Builder.class);
}
public static final int POS_FIELD_NUMBER = 11;
private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
/**
* <code>.Vector pos = 11;</code>
* @return Whether the pos field is set.
*/
@java.lang.Override
public boolean hasPos() {
return pos_ != null;
}
/**
* <code>.Vector pos = 11;</code>
* @return The pos.
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
}
/**
* <code>.Vector pos = 11;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
return getPos();
}
public static final int BUNDLE_ID_FIELD_NUMBER = 3;
private int bundleId_;
/**
* <code>uint32 bundle_id = 3;</code>
* @return The bundleId.
*/
@java.lang.Override
public int getBundleId() {
return bundleId_;
}
public static final int ROT_FIELD_NUMBER = 14;
private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
/**
@@ -225,6 +188,43 @@ public final class DigMarkPointOuterClass {
return getRot();
}
public static final int POS_FIELD_NUMBER = 2;
private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
/**
* <code>.Vector pos = 2;</code>
* @return Whether the pos field is set.
*/
@java.lang.Override
public boolean hasPos() {
return pos_ != null;
}
/**
* <code>.Vector pos = 2;</code>
* @return The pos.
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
}
/**
* <code>.Vector pos = 2;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
return getPos();
}
public static final int BUNDLEID_FIELD_NUMBER = 3;
private int bundleId_;
/**
* <code>uint32 bundleId = 3;</code>
* @return The bundleId.
*/
@java.lang.Override
public int getBundleId() {
return bundleId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -239,12 +239,12 @@ public final class DigMarkPointOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (pos_ != null) {
output.writeMessage(2, getPos());
}
if (bundleId_ != 0) {
output.writeUInt32(3, bundleId_);
}
if (pos_ != null) {
output.writeMessage(11, getPos());
}
if (rot_ != null) {
output.writeMessage(14, getRot());
}
@@ -257,14 +257,14 @@ public final class DigMarkPointOuterClass {
if (size != -1) return size;
size = 0;
if (pos_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(2, getPos());
}
if (bundleId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, bundleId_);
}
if (pos_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(11, getPos());
}
if (rot_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(14, getRot());
@@ -284,6 +284,11 @@ public final class DigMarkPointOuterClass {
}
emu.grasscutter.net.proto.DigMarkPointOuterClass.DigMarkPoint other = (emu.grasscutter.net.proto.DigMarkPointOuterClass.DigMarkPoint) obj;
if (hasRot() != other.hasRot()) return false;
if (hasRot()) {
if (!getRot()
.equals(other.getRot())) return false;
}
if (hasPos() != other.hasPos()) return false;
if (hasPos()) {
if (!getPos()
@@ -291,11 +296,6 @@ public final class DigMarkPointOuterClass {
}
if (getBundleId()
!= other.getBundleId()) return false;
if (hasRot() != other.hasRot()) return false;
if (hasRot()) {
if (!getRot()
.equals(other.getRot())) return false;
}
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -307,16 +307,16 @@ public final class DigMarkPointOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (hasPos()) {
hash = (37 * hash) + POS_FIELD_NUMBER;
hash = (53 * hash) + getPos().hashCode();
}
hash = (37 * hash) + BUNDLE_ID_FIELD_NUMBER;
hash = (53 * hash) + getBundleId();
if (hasRot()) {
hash = (37 * hash) + ROT_FIELD_NUMBER;
hash = (53 * hash) + getRot().hashCode();
}
if (hasPos()) {
hash = (37 * hash) + POS_FIELD_NUMBER;
hash = (53 * hash) + getPos().hashCode();
}
hash = (37 * hash) + BUNDLEID_FIELD_NUMBER;
hash = (53 * hash) + getBundleId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -450,6 +450,12 @@ public final class DigMarkPointOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
if (rotBuilder_ == null) {
rot_ = null;
} else {
rot_ = null;
rotBuilder_ = null;
}
if (posBuilder_ == null) {
pos_ = null;
} else {
@@ -458,12 +464,6 @@ public final class DigMarkPointOuterClass {
}
bundleId_ = 0;
if (rotBuilder_ == null) {
rot_ = null;
} else {
rot_ = null;
rotBuilder_ = null;
}
return this;
}
@@ -490,17 +490,17 @@ public final class DigMarkPointOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.DigMarkPointOuterClass.DigMarkPoint buildPartial() {
emu.grasscutter.net.proto.DigMarkPointOuterClass.DigMarkPoint result = new emu.grasscutter.net.proto.DigMarkPointOuterClass.DigMarkPoint(this);
if (rotBuilder_ == null) {
result.rot_ = rot_;
} else {
result.rot_ = rotBuilder_.build();
}
if (posBuilder_ == null) {
result.pos_ = pos_;
} else {
result.pos_ = posBuilder_.build();
}
result.bundleId_ = bundleId_;
if (rotBuilder_ == null) {
result.rot_ = rot_;
} else {
result.rot_ = rotBuilder_.build();
}
onBuilt();
return result;
}
@@ -549,15 +549,15 @@ public final class DigMarkPointOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.DigMarkPointOuterClass.DigMarkPoint other) {
if (other == emu.grasscutter.net.proto.DigMarkPointOuterClass.DigMarkPoint.getDefaultInstance()) return this;
if (other.hasRot()) {
mergeRot(other.getRot());
}
if (other.hasPos()) {
mergePos(other.getPos());
}
if (other.getBundleId() != 0) {
setBundleId(other.getBundleId());
}
if (other.hasRot()) {
mergeRot(other.getRot());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -587,156 +587,6 @@ public final class DigMarkPointOuterClass {
return this;
}
private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_;
/**
* <code>.Vector pos = 11;</code>
* @return Whether the pos field is set.
*/
public boolean hasPos() {
return posBuilder_ != null || pos_ != null;
}
/**
* <code>.Vector pos = 11;</code>
* @return The pos.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
if (posBuilder_ == null) {
return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
} else {
return posBuilder_.getMessage();
}
}
/**
* <code>.Vector pos = 11;</code>
*/
public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (posBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
pos_ = value;
onChanged();
} else {
posBuilder_.setMessage(value);
}
return this;
}
/**
* <code>.Vector pos = 11;</code>
*/
public Builder setPos(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
if (posBuilder_ == null) {
pos_ = builderForValue.build();
onChanged();
} else {
posBuilder_.setMessage(builderForValue.build());
}
return this;
}
/**
* <code>.Vector pos = 11;</code>
*/
public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (posBuilder_ == null) {
if (pos_ != null) {
pos_ =
emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial();
} else {
pos_ = value;
}
onChanged();
} else {
posBuilder_.mergeFrom(value);
}
return this;
}
/**
* <code>.Vector pos = 11;</code>
*/
public Builder clearPos() {
if (posBuilder_ == null) {
pos_ = null;
onChanged();
} else {
pos_ = null;
posBuilder_ = null;
}
return this;
}
/**
* <code>.Vector pos = 11;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
onChanged();
return getPosFieldBuilder().getBuilder();
}
/**
* <code>.Vector pos = 11;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
if (posBuilder_ != null) {
return posBuilder_.getMessageOrBuilder();
} else {
return pos_ == null ?
emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
}
}
/**
* <code>.Vector pos = 11;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>
getPosFieldBuilder() {
if (posBuilder_ == null) {
posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
getPos(),
getParentForChildren(),
isClean());
pos_ = null;
}
return posBuilder_;
}
private int bundleId_ ;
/**
* <code>uint32 bundle_id = 3;</code>
* @return The bundleId.
*/
@java.lang.Override
public int getBundleId() {
return bundleId_;
}
/**
* <code>uint32 bundle_id = 3;</code>
* @param value The bundleId to set.
* @return This builder for chaining.
*/
public Builder setBundleId(int value) {
bundleId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 bundle_id = 3;</code>
* @return This builder for chaining.
*/
public Builder clearBundleId() {
bundleId_ = 0;
onChanged();
return this;
}
private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_;
@@ -855,6 +705,156 @@ public final class DigMarkPointOuterClass {
}
return rotBuilder_;
}
private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_;
/**
* <code>.Vector pos = 2;</code>
* @return Whether the pos field is set.
*/
public boolean hasPos() {
return posBuilder_ != null || pos_ != null;
}
/**
* <code>.Vector pos = 2;</code>
* @return The pos.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
if (posBuilder_ == null) {
return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
} else {
return posBuilder_.getMessage();
}
}
/**
* <code>.Vector pos = 2;</code>
*/
public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (posBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
pos_ = value;
onChanged();
} else {
posBuilder_.setMessage(value);
}
return this;
}
/**
* <code>.Vector pos = 2;</code>
*/
public Builder setPos(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
if (posBuilder_ == null) {
pos_ = builderForValue.build();
onChanged();
} else {
posBuilder_.setMessage(builderForValue.build());
}
return this;
}
/**
* <code>.Vector pos = 2;</code>
*/
public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (posBuilder_ == null) {
if (pos_ != null) {
pos_ =
emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial();
} else {
pos_ = value;
}
onChanged();
} else {
posBuilder_.mergeFrom(value);
}
return this;
}
/**
* <code>.Vector pos = 2;</code>
*/
public Builder clearPos() {
if (posBuilder_ == null) {
pos_ = null;
onChanged();
} else {
pos_ = null;
posBuilder_ = null;
}
return this;
}
/**
* <code>.Vector pos = 2;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
onChanged();
return getPosFieldBuilder().getBuilder();
}
/**
* <code>.Vector pos = 2;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
if (posBuilder_ != null) {
return posBuilder_.getMessageOrBuilder();
} else {
return pos_ == null ?
emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
}
}
/**
* <code>.Vector pos = 2;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>
getPosFieldBuilder() {
if (posBuilder_ == null) {
posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
getPos(),
getParentForChildren(),
isClean());
pos_ = null;
}
return posBuilder_;
}
private int bundleId_ ;
/**
* <code>uint32 bundleId = 3;</code>
* @return The bundleId.
*/
@java.lang.Override
public int getBundleId() {
return bundleId_;
}
/**
* <code>uint32 bundleId = 3;</code>
* @param value The bundleId to set.
* @return This builder for chaining.
*/
public Builder setBundleId(int value) {
bundleId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 bundleId = 3;</code>
* @return This builder for chaining.
*/
public Builder clearBundleId() {
bundleId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -922,10 +922,10 @@ public final class DigMarkPointOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\022DigMarkPoint.proto\032\014Vector.proto\"M\n\014Di" +
"gMarkPoint\022\024\n\003pos\030\013 \001(\0132\007.Vector\022\021\n\tbund" +
"le_id\030\003 \001(\r\022\024\n\003rot\030\016 \001(\0132\007.VectorB\033\n\031emu" +
".grasscutter.net.protob\006proto3"
"\n\022DigMarkPoint.proto\032\014Vector.proto\"L\n\014Di" +
"gMarkPoint\022\024\n\003rot\030\016 \001(\0132\007.Vector\022\024\n\003pos\030" +
"\002 \001(\0132\007.Vector\022\020\n\010bundleId\030\003 \001(\rB\033\n\031emu." +
"grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -937,7 +937,7 @@ public final class DigMarkPointOuterClass {
internal_static_DigMarkPoint_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_DigMarkPoint_descriptor,
new java.lang.String[] { "Pos", "BundleId", "Rot", });
new java.lang.String[] { "Rot", "Pos", "BundleId", });
emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
}