Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 18:39:54 +08:00
Code Issues Projects Releases Wiki Activity

update gc 3.4 (#2041)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/PotionAvatarInfoOuterClass.java
+85 -85
View File
@@ -19,16 +19,16 @@ public final class PotionAvatarInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>bool is_trial = 15;</code>
* @return The isTrial.
*/
boolean getIsTrial();
/**
* <code>uint64 avatar_id = 1;</code>
* <code>uint64 avatarId = 10;</code>
* @return The avatarId.
*/
long getAvatarId();
/**
* <code>bool isTrial = 3;</code>
* @return The isTrial.
*/
boolean getIsTrial();
}
/**
* Protobuf type {@code PotionAvatarInfo}
@@ -75,16 +75,16 @@ public final class PotionAvatarInfoOuterClass {
case 0:
done = true;
break;
case 8: {
avatarId_ = input.readUInt64();
break;
}
case 120: {
case 24: {
isTrial_ = input.readBool();
break;
}
case 80: {
avatarId_ = input.readUInt64();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -117,21 +117,10 @@ public final class PotionAvatarInfoOuterClass {
emu.grasscutter.net.proto.PotionAvatarInfoOuterClass.PotionAvatarInfo.class, emu.grasscutter.net.proto.PotionAvatarInfoOuterClass.PotionAvatarInfo.Builder.class);
}
public static final int IS_TRIAL_FIELD_NUMBER = 15;
private boolean isTrial_;
/**
* <code>bool is_trial = 15;</code>
* @return The isTrial.
*/
@java.lang.Override
public boolean getIsTrial() {
return isTrial_;
}
public static final int AVATAR_ID_FIELD_NUMBER = 1;
public static final int AVATARID_FIELD_NUMBER = 10;
private long avatarId_;
/**
* <code>uint64 avatar_id = 1;</code>
* <code>uint64 avatarId = 10;</code>
* @return The avatarId.
*/
@java.lang.Override
@@ -139,6 +128,17 @@ public final class PotionAvatarInfoOuterClass {
return avatarId_;
}
public static final int ISTRIAL_FIELD_NUMBER = 3;
private boolean isTrial_;
/**
* <code>bool isTrial = 3;</code>
* @return The isTrial.
*/
@java.lang.Override
public boolean getIsTrial() {
return isTrial_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -153,11 +153,11 @@ public final class PotionAvatarInfoOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (avatarId_ != 0L) {
output.writeUInt64(1, avatarId_);
}
if (isTrial_ != false) {
output.writeBool(15, isTrial_);
output.writeBool(3, isTrial_);
}
if (avatarId_ != 0L) {
output.writeUInt64(10, avatarId_);
}
unknownFields.writeTo(output);
}
@@ -168,13 +168,13 @@ public final class PotionAvatarInfoOuterClass {
if (size != -1) return size;
size = 0;
if (avatarId_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(1, avatarId_);
}
if (isTrial_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(15, isTrial_);
.computeBoolSize(3, isTrial_);
}
if (avatarId_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(10, avatarId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -191,10 +191,10 @@ public final class PotionAvatarInfoOuterClass {
}
emu.grasscutter.net.proto.PotionAvatarInfoOuterClass.PotionAvatarInfo other = (emu.grasscutter.net.proto.PotionAvatarInfoOuterClass.PotionAvatarInfo) obj;
if (getIsTrial()
!= other.getIsTrial()) return false;
if (getAvatarId()
!= other.getAvatarId()) return false;
if (getIsTrial()
!= other.getIsTrial()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -206,12 +206,12 @@ public final class PotionAvatarInfoOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + IS_TRIAL_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsTrial());
hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
hash = (37 * hash) + AVATARID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarId());
hash = (37 * hash) + ISTRIAL_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsTrial());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -345,10 +345,10 @@ public final class PotionAvatarInfoOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
isTrial_ = false;
avatarId_ = 0L;
isTrial_ = false;
return this;
}
@@ -375,8 +375,8 @@ public final class PotionAvatarInfoOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.PotionAvatarInfoOuterClass.PotionAvatarInfo buildPartial() {
emu.grasscutter.net.proto.PotionAvatarInfoOuterClass.PotionAvatarInfo result = new emu.grasscutter.net.proto.PotionAvatarInfoOuterClass.PotionAvatarInfo(this);
result.isTrial_ = isTrial_;
result.avatarId_ = avatarId_;
result.isTrial_ = isTrial_;
onBuilt();
return result;
}
@@ -425,12 +425,12 @@ public final class PotionAvatarInfoOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.PotionAvatarInfoOuterClass.PotionAvatarInfo other) {
if (other == emu.grasscutter.net.proto.PotionAvatarInfoOuterClass.PotionAvatarInfo.getDefaultInstance()) return this;
if (other.getIsTrial() != false) {
setIsTrial(other.getIsTrial());
}
if (other.getAvatarId() != 0L) {
setAvatarId(other.getAvatarId());
}
if (other.getIsTrial() != false) {
setIsTrial(other.getIsTrial());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -460,40 +460,9 @@ public final class PotionAvatarInfoOuterClass {
return this;
}
private boolean isTrial_ ;
/**
* <code>bool is_trial = 15;</code>
* @return The isTrial.
*/
@java.lang.Override
public boolean getIsTrial() {
return isTrial_;
}
/**
* <code>bool is_trial = 15;</code>
* @param value The isTrial to set.
* @return This builder for chaining.
*/
public Builder setIsTrial(boolean value) {
isTrial_ = value;
onChanged();
return this;
}
/**
* <code>bool is_trial = 15;</code>
* @return This builder for chaining.
*/
public Builder clearIsTrial() {
isTrial_ = false;
onChanged();
return this;
}
private long avatarId_ ;
/**
* <code>uint64 avatar_id = 1;</code>
* <code>uint64 avatarId = 10;</code>
* @return The avatarId.
*/
@java.lang.Override
@@ -501,7 +470,7 @@ public final class PotionAvatarInfoOuterClass {
return avatarId_;
}
/**
* <code>uint64 avatar_id = 1;</code>
* <code>uint64 avatarId = 10;</code>
* @param value The avatarId to set.
* @return This builder for chaining.
*/
@@ -512,7 +481,7 @@ public final class PotionAvatarInfoOuterClass {
return this;
}
/**
* <code>uint64 avatar_id = 1;</code>
* <code>uint64 avatarId = 10;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarId() {
@@ -521,6 +490,37 @@ public final class PotionAvatarInfoOuterClass {
onChanged();
return this;
}
private boolean isTrial_ ;
/**
* <code>bool isTrial = 3;</code>
* @return The isTrial.
*/
@java.lang.Override
public boolean getIsTrial() {
return isTrial_;
}
/**
* <code>bool isTrial = 3;</code>
* @param value The isTrial to set.
* @return This builder for chaining.
*/
public Builder setIsTrial(boolean value) {
isTrial_ = value;
onChanged();
return this;
}
/**
* <code>bool isTrial = 3;</code>
* @return This builder for chaining.
*/
public Builder clearIsTrial() {
isTrial_ = false;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -588,9 +588,9 @@ public final class PotionAvatarInfoOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\026PotionAvatarInfo.proto\"7\n\020PotionAvatar" +
"Info\022\020\n\010is_trial\030\017 \001(\010\022\021\n\tavatar_id\030\001 \001(" +
"\004B\033\n\031emu.grasscutter.net.protob\006proto3"
"\n\026PotionAvatarInfo.proto\"5\n\020PotionAvatar" +
"Info\022\020\n\010avatarId\030\n \001(\004\022\017\n\007isTrial\030\003 \001(\010B" +
"\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -601,7 +601,7 @@ public final class PotionAvatarInfoOuterClass {
internal_static_PotionAvatarInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PotionAvatarInfo_descriptor,
new java.lang.String[] { "IsTrial", "AvatarId", });
new java.lang.String[] { "AvatarId", "IsTrial", });
}
// @@protoc_insertion_point(outer_class_scope)