Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-24 02:19:50 +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/WidgetCoolDownDataOuterClass.java
+126 -126
View File
@@ -19,26 +19,26 @@ public final class WidgetCoolDownDataOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 cool_down_time = 2;</code>
* @return The coolDownTime.
* <code>bool is_success = 8;</code>
* @return The isSuccess.
*/
long getCoolDownTime();
boolean getIsSuccess();
/**
* <code>uint32 id = 3;</code>
* <code>uint32 id = 6;</code>
* @return The id.
*/
int getId();
/**
* <code>bool is_success = 10;</code>
* @return The isSuccess.
* <code>uint64 cool_down_time = 7;</code>
* @return The coolDownTime.
*/
boolean getIsSuccess();
long getCoolDownTime();
}
/**
* <pre>
* Name: JPEDGKIPECE
* Name: MJLCBFDOPBF
* </pre>
*
* Protobuf type {@code WidgetCoolDownData}
@@ -85,17 +85,17 @@ public final class WidgetCoolDownDataOuterClass {
case 0:
done = true;
break;
case 16: {
coolDownTime_ = input.readUInt64();
break;
}
case 24: {
case 48: {
id_ = input.readUInt32();
break;
}
case 80: {
case 56: {
coolDownTime_ = input.readUInt64();
break;
}
case 64: {
isSuccess_ = input.readBool();
break;
@@ -132,21 +132,21 @@ public final class WidgetCoolDownDataOuterClass {
emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.class, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder.class);
}
public static final int COOL_DOWN_TIME_FIELD_NUMBER = 2;
private long coolDownTime_;
public static final int IS_SUCCESS_FIELD_NUMBER = 8;
private boolean isSuccess_;
/**
* <code>uint64 cool_down_time = 2;</code>
* @return The coolDownTime.
* <code>bool is_success = 8;</code>
* @return The isSuccess.
*/
@java.lang.Override
public long getCoolDownTime() {
return coolDownTime_;
public boolean getIsSuccess() {
return isSuccess_;
}
public static final int ID_FIELD_NUMBER = 3;
public static final int ID_FIELD_NUMBER = 6;
private int id_;
/**
* <code>uint32 id = 3;</code>
* <code>uint32 id = 6;</code>
* @return The id.
*/
@java.lang.Override
@@ -154,15 +154,15 @@ public final class WidgetCoolDownDataOuterClass {
return id_;
}
public static final int IS_SUCCESS_FIELD_NUMBER = 10;
private boolean isSuccess_;
public static final int COOL_DOWN_TIME_FIELD_NUMBER = 7;
private long coolDownTime_;
/**
* <code>bool is_success = 10;</code>
* @return The isSuccess.
* <code>uint64 cool_down_time = 7;</code>
* @return The coolDownTime.
*/
@java.lang.Override
public boolean getIsSuccess() {
return isSuccess_;
public long getCoolDownTime() {
return coolDownTime_;
}
private byte memoizedIsInitialized = -1;
@@ -179,14 +179,14 @@ public final class WidgetCoolDownDataOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (coolDownTime_ != 0L) {
output.writeUInt64(2, coolDownTime_);
}
if (id_ != 0) {
output.writeUInt32(3, id_);
output.writeUInt32(6, id_);
}
if (coolDownTime_ != 0L) {
output.writeUInt64(7, coolDownTime_);
}
if (isSuccess_ != false) {
output.writeBool(10, isSuccess_);
output.writeBool(8, isSuccess_);
}
unknownFields.writeTo(output);
}
@@ -197,17 +197,17 @@ public final class WidgetCoolDownDataOuterClass {
if (size != -1) return size;
size = 0;
if (coolDownTime_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(2, coolDownTime_);
}
if (id_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, id_);
.computeUInt32Size(6, id_);
}
if (coolDownTime_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(7, coolDownTime_);
}
if (isSuccess_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(10, isSuccess_);
.computeBoolSize(8, isSuccess_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -224,12 +224,12 @@ public final class WidgetCoolDownDataOuterClass {
}
emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData other = (emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData) obj;
if (getCoolDownTime()
!= other.getCoolDownTime()) return false;
if (getId()
!= other.getId()) return false;
if (getIsSuccess()
!= other.getIsSuccess()) return false;
if (getId()
!= other.getId()) return false;
if (getCoolDownTime()
!= other.getCoolDownTime()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -241,14 +241,14 @@ public final class WidgetCoolDownDataOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + COOL_DOWN_TIME_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getCoolDownTime());
hash = (37 * hash) + ID_FIELD_NUMBER;
hash = (53 * hash) + getId();
hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsSuccess());
hash = (37 * hash) + ID_FIELD_NUMBER;
hash = (53 * hash) + getId();
hash = (37 * hash) + COOL_DOWN_TIME_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getCoolDownTime());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -346,7 +346,7 @@ public final class WidgetCoolDownDataOuterClass {
}
/**
* <pre>
* Name: JPEDGKIPECE
* Name: MJLCBFDOPBF
* </pre>
*
* Protobuf type {@code WidgetCoolDownData}
@@ -386,11 +386,11 @@ public final class WidgetCoolDownDataOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
coolDownTime_ = 0L;
isSuccess_ = false;
id_ = 0;
isSuccess_ = false;
coolDownTime_ = 0L;
return this;
}
@@ -418,9 +418,9 @@ public final class WidgetCoolDownDataOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData buildPartial() {
emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData result = new emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData(this);
result.coolDownTime_ = coolDownTime_;
result.id_ = id_;
result.isSuccess_ = isSuccess_;
result.id_ = id_;
result.coolDownTime_ = coolDownTime_;
onBuilt();
return result;
}
@@ -469,14 +469,14 @@ public final class WidgetCoolDownDataOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData other) {
if (other == emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance()) return this;
if (other.getCoolDownTime() != 0L) {
setCoolDownTime(other.getCoolDownTime());
if (other.getIsSuccess() != false) {
setIsSuccess(other.getIsSuccess());
}
if (other.getId() != 0) {
setId(other.getId());
}
if (other.getIsSuccess() != false) {
setIsSuccess(other.getIsSuccess());
if (other.getCoolDownTime() != 0L) {
setCoolDownTime(other.getCoolDownTime());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -507,71 +507,9 @@ public final class WidgetCoolDownDataOuterClass {
return this;
}
private long coolDownTime_ ;
/**
* <code>uint64 cool_down_time = 2;</code>
* @return The coolDownTime.
*/
@java.lang.Override
public long getCoolDownTime() {
return coolDownTime_;
}
/**
* <code>uint64 cool_down_time = 2;</code>
* @param value The coolDownTime to set.
* @return This builder for chaining.
*/
public Builder setCoolDownTime(long value) {
coolDownTime_ = value;
onChanged();
return this;
}
/**
* <code>uint64 cool_down_time = 2;</code>
* @return This builder for chaining.
*/
public Builder clearCoolDownTime() {
coolDownTime_ = 0L;
onChanged();
return this;
}
private int id_ ;
/**
* <code>uint32 id = 3;</code>
* @return The id.
*/
@java.lang.Override
public int getId() {
return id_;
}
/**
* <code>uint32 id = 3;</code>
* @param value The id to set.
* @return This builder for chaining.
*/
public Builder setId(int value) {
id_ = value;
onChanged();
return this;
}
/**
* <code>uint32 id = 3;</code>
* @return This builder for chaining.
*/
public Builder clearId() {
id_ = 0;
onChanged();
return this;
}
private boolean isSuccess_ ;
/**
* <code>bool is_success = 10;</code>
* <code>bool is_success = 8;</code>
* @return The isSuccess.
*/
@java.lang.Override
@@ -579,7 +517,7 @@ public final class WidgetCoolDownDataOuterClass {
return isSuccess_;
}
/**
* <code>bool is_success = 10;</code>
* <code>bool is_success = 8;</code>
* @param value The isSuccess to set.
* @return This builder for chaining.
*/
@@ -590,7 +528,7 @@ public final class WidgetCoolDownDataOuterClass {
return this;
}
/**
* <code>bool is_success = 10;</code>
* <code>bool is_success = 8;</code>
* @return This builder for chaining.
*/
public Builder clearIsSuccess() {
@@ -599,6 +537,68 @@ public final class WidgetCoolDownDataOuterClass {
onChanged();
return this;
}
private int id_ ;
/**
* <code>uint32 id = 6;</code>
* @return The id.
*/
@java.lang.Override
public int getId() {
return id_;
}
/**
* <code>uint32 id = 6;</code>
* @param value The id to set.
* @return This builder for chaining.
*/
public Builder setId(int value) {
id_ = value;
onChanged();
return this;
}
/**
* <code>uint32 id = 6;</code>
* @return This builder for chaining.
*/
public Builder clearId() {
id_ = 0;
onChanged();
return this;
}
private long coolDownTime_ ;
/**
* <code>uint64 cool_down_time = 7;</code>
* @return The coolDownTime.
*/
@java.lang.Override
public long getCoolDownTime() {
return coolDownTime_;
}
/**
* <code>uint64 cool_down_time = 7;</code>
* @param value The coolDownTime to set.
* @return This builder for chaining.
*/
public Builder setCoolDownTime(long value) {
coolDownTime_ = value;
onChanged();
return this;
}
/**
* <code>uint64 cool_down_time = 7;</code>
* @return This builder for chaining.
*/
public Builder clearCoolDownTime() {
coolDownTime_ = 0L;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +667,8 @@ public final class WidgetCoolDownDataOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\030WidgetCoolDownData.proto\"L\n\022WidgetCool" +
"DownData\022\026\n\016cool_down_time\030\002 \001(\004\022\n\n\002id\030\003" +
" \001(\r\022\022\n\nis_success\030\n \001(\010B\033\n\031emu.grasscut" +
"DownData\022\022\n\nis_success\030\010 \001(\010\022\n\n\002id\030\006 \001(\r" +
"\022\026\n\016cool_down_time\030\007 \001(\004B\033\n\031emu.grasscut" +
"ter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +680,7 @@ public final class WidgetCoolDownDataOuterClass {
internal_static_WidgetCoolDownData_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_WidgetCoolDownData_descriptor,
new java.lang.String[] { "CoolDownTime", "Id", "IsSuccess", });
new java.lang.String[] { "IsSuccess", "Id", "CoolDownTime", });
}
// @@protoc_insertion_point(outer_class_scope)