Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-19 18:09: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/ActivityWatcherInfoOuterClass.java
+129 -129
View File
@@ -25,26 +25,26 @@ public final class ActivityWatcherInfoOuterClass {
int getWatcherId();
/**
* <code>uint32 cur_progress = 1;</code>
* @return The curProgress.
* <code>bool is_taken_reward = 4;</code>
* @return The isTakenReward.
*/
int getCurProgress();
boolean getIsTakenReward();
/**
* <code>uint32 total_progress = 13;</code>
* <code>uint32 total_progress = 15;</code>
* @return The totalProgress.
*/
int getTotalProgress();
/**
* <code>bool is_taken_reward = 12;</code>
* @return The isTakenReward.
* <code>uint32 cur_progress = 10;</code>
* @return The curProgress.
*/
boolean getIsTakenReward();
int getCurProgress();
}
/**
* <pre>
* Name: NACCPGOMNLE
* Name: MJANEPLMIEP
* </pre>
*
* Protobuf type {@code ActivityWatcherInfo}
@@ -91,19 +91,14 @@ public final class ActivityWatcherInfoOuterClass {
case 0:
done = true;
break;
case 8: {
curProgress_ = input.readUInt32();
break;
}
case 96: {
case 32: {
isTakenReward_ = input.readBool();
break;
}
case 104: {
case 80: {
totalProgress_ = input.readUInt32();
curProgress_ = input.readUInt32();
break;
}
case 112: {
@@ -111,6 +106,11 @@ public final class ActivityWatcherInfoOuterClass {
watcherId_ = input.readUInt32();
break;
}
case 120: {
totalProgress_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -154,21 +154,21 @@ public final class ActivityWatcherInfoOuterClass {
return watcherId_;
}
public static final int CUR_PROGRESS_FIELD_NUMBER = 1;
private int curProgress_;
public static final int IS_TAKEN_REWARD_FIELD_NUMBER = 4;
private boolean isTakenReward_;
/**
* <code>uint32 cur_progress = 1;</code>
* @return The curProgress.
* <code>bool is_taken_reward = 4;</code>
* @return The isTakenReward.
*/
@java.lang.Override
public int getCurProgress() {
return curProgress_;
public boolean getIsTakenReward() {
return isTakenReward_;
}
public static final int TOTAL_PROGRESS_FIELD_NUMBER = 13;
public static final int TOTAL_PROGRESS_FIELD_NUMBER = 15;
private int totalProgress_;
/**
* <code>uint32 total_progress = 13;</code>
* <code>uint32 total_progress = 15;</code>
* @return The totalProgress.
*/
@java.lang.Override
@@ -176,15 +176,15 @@ public final class ActivityWatcherInfoOuterClass {
return totalProgress_;
}
public static final int IS_TAKEN_REWARD_FIELD_NUMBER = 12;
private boolean isTakenReward_;
public static final int CUR_PROGRESS_FIELD_NUMBER = 10;
private int curProgress_;
/**
* <code>bool is_taken_reward = 12;</code>
* @return The isTakenReward.
* <code>uint32 cur_progress = 10;</code>
* @return The curProgress.
*/
@java.lang.Override
public boolean getIsTakenReward() {
return isTakenReward_;
public int getCurProgress() {
return curProgress_;
}
private byte memoizedIsInitialized = -1;
@@ -201,18 +201,18 @@ public final class ActivityWatcherInfoOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (curProgress_ != 0) {
output.writeUInt32(1, curProgress_);
}
if (isTakenReward_ != false) {
output.writeBool(12, isTakenReward_);
output.writeBool(4, isTakenReward_);
}
if (totalProgress_ != 0) {
output.writeUInt32(13, totalProgress_);
if (curProgress_ != 0) {
output.writeUInt32(10, curProgress_);
}
if (watcherId_ != 0) {
output.writeUInt32(14, watcherId_);
}
if (totalProgress_ != 0) {
output.writeUInt32(15, totalProgress_);
}
unknownFields.writeTo(output);
}
@@ -222,22 +222,22 @@ public final class ActivityWatcherInfoOuterClass {
if (size != -1) return size;
size = 0;
if (curProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, curProgress_);
}
if (isTakenReward_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(12, isTakenReward_);
.computeBoolSize(4, isTakenReward_);
}
if (totalProgress_ != 0) {
if (curProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(13, totalProgress_);
.computeUInt32Size(10, curProgress_);
}
if (watcherId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, watcherId_);
}
if (totalProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, totalProgress_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -255,12 +255,12 @@ public final class ActivityWatcherInfoOuterClass {
if (getWatcherId()
!= other.getWatcherId()) return false;
if (getCurProgress()
!= other.getCurProgress()) return false;
if (getTotalProgress()
!= other.getTotalProgress()) return false;
if (getIsTakenReward()
!= other.getIsTakenReward()) return false;
if (getTotalProgress()
!= other.getTotalProgress()) return false;
if (getCurProgress()
!= other.getCurProgress()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -274,13 +274,13 @@ public final class ActivityWatcherInfoOuterClass {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + WATCHER_ID_FIELD_NUMBER;
hash = (53 * hash) + getWatcherId();
hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getCurProgress();
hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getTotalProgress();
hash = (37 * hash) + IS_TAKEN_REWARD_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsTakenReward());
hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getTotalProgress();
hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getCurProgress();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -378,7 +378,7 @@ public final class ActivityWatcherInfoOuterClass {
}
/**
* <pre>
* Name: NACCPGOMNLE
* Name: MJANEPLMIEP
* </pre>
*
* Protobuf type {@code ActivityWatcherInfo}
@@ -420,11 +420,11 @@ public final class ActivityWatcherInfoOuterClass {
super.clear();
watcherId_ = 0;
curProgress_ = 0;
isTakenReward_ = false;
totalProgress_ = 0;
isTakenReward_ = false;
curProgress_ = 0;
return this;
}
@@ -453,9 +453,9 @@ public final class ActivityWatcherInfoOuterClass {
public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo buildPartial() {
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo result = new emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo(this);
result.watcherId_ = watcherId_;
result.curProgress_ = curProgress_;
result.totalProgress_ = totalProgress_;
result.isTakenReward_ = isTakenReward_;
result.totalProgress_ = totalProgress_;
result.curProgress_ = curProgress_;
onBuilt();
return result;
}
@@ -507,14 +507,14 @@ public final class ActivityWatcherInfoOuterClass {
if (other.getWatcherId() != 0) {
setWatcherId(other.getWatcherId());
}
if (other.getCurProgress() != 0) {
setCurProgress(other.getCurProgress());
if (other.getIsTakenReward() != false) {
setIsTakenReward(other.getIsTakenReward());
}
if (other.getTotalProgress() != 0) {
setTotalProgress(other.getTotalProgress());
}
if (other.getIsTakenReward() != false) {
setIsTakenReward(other.getIsTakenReward());
if (other.getCurProgress() != 0) {
setCurProgress(other.getCurProgress());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -576,71 +576,9 @@ public final class ActivityWatcherInfoOuterClass {
return this;
}
private int curProgress_ ;
/**
* <code>uint32 cur_progress = 1;</code>
* @return The curProgress.
*/
@java.lang.Override
public int getCurProgress() {
return curProgress_;
}
/**
* <code>uint32 cur_progress = 1;</code>
* @param value The curProgress to set.
* @return This builder for chaining.
*/
public Builder setCurProgress(int value) {
curProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 cur_progress = 1;</code>
* @return This builder for chaining.
*/
public Builder clearCurProgress() {
curProgress_ = 0;
onChanged();
return this;
}
private int totalProgress_ ;
/**
* <code>uint32 total_progress = 13;</code>
* @return The totalProgress.
*/
@java.lang.Override
public int getTotalProgress() {
return totalProgress_;
}
/**
* <code>uint32 total_progress = 13;</code>
* @param value The totalProgress to set.
* @return This builder for chaining.
*/
public Builder setTotalProgress(int value) {
totalProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 total_progress = 13;</code>
* @return This builder for chaining.
*/
public Builder clearTotalProgress() {
totalProgress_ = 0;
onChanged();
return this;
}
private boolean isTakenReward_ ;
/**
* <code>bool is_taken_reward = 12;</code>
* <code>bool is_taken_reward = 4;</code>
* @return The isTakenReward.
*/
@java.lang.Override
@@ -648,7 +586,7 @@ public final class ActivityWatcherInfoOuterClass {
return isTakenReward_;
}
/**
* <code>bool is_taken_reward = 12;</code>
* <code>bool is_taken_reward = 4;</code>
* @param value The isTakenReward to set.
* @return This builder for chaining.
*/
@@ -659,7 +597,7 @@ public final class ActivityWatcherInfoOuterClass {
return this;
}
/**
* <code>bool is_taken_reward = 12;</code>
* <code>bool is_taken_reward = 4;</code>
* @return This builder for chaining.
*/
public Builder clearIsTakenReward() {
@@ -668,6 +606,68 @@ public final class ActivityWatcherInfoOuterClass {
onChanged();
return this;
}
private int totalProgress_ ;
/**
* <code>uint32 total_progress = 15;</code>
* @return The totalProgress.
*/
@java.lang.Override
public int getTotalProgress() {
return totalProgress_;
}
/**
* <code>uint32 total_progress = 15;</code>
* @param value The totalProgress to set.
* @return This builder for chaining.
*/
public Builder setTotalProgress(int value) {
totalProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 total_progress = 15;</code>
* @return This builder for chaining.
*/
public Builder clearTotalProgress() {
totalProgress_ = 0;
onChanged();
return this;
}
private int curProgress_ ;
/**
* <code>uint32 cur_progress = 10;</code>
* @return The curProgress.
*/
@java.lang.Override
public int getCurProgress() {
return curProgress_;
}
/**
* <code>uint32 cur_progress = 10;</code>
* @param value The curProgress to set.
* @return This builder for chaining.
*/
public Builder setCurProgress(int value) {
curProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 cur_progress = 10;</code>
* @return This builder for chaining.
*/
public Builder clearCurProgress() {
curProgress_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -736,9 +736,9 @@ public final class ActivityWatcherInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\031ActivityWatcherInfo.proto\"p\n\023ActivityW" +
"atcherInfo\022\022\n\nwatcher_id\030\016 \001(\r\022\024\n\014cur_pr" +
"ogress\030\001 \001(\r\022\026\n\016total_progress\030\r \001(\r\022\027\n\017" +
"is_taken_reward\030\014 \001(\010B\033\n\031emu.grasscutter" +
"atcherInfo\022\022\n\nwatcher_id\030\016 \001(\r\022\027\n\017is_tak" +
"en_reward\030\004 \001(\010\022\026\n\016total_progress\030\017 \001(\r\022" +
"\024\n\014cur_progress\030\n \001(\rB\033\n\031emu.grasscutter" +
".net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -750,7 +750,7 @@ public final class ActivityWatcherInfoOuterClass {
internal_static_ActivityWatcherInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ActivityWatcherInfo_descriptor,
new java.lang.String[] { "WatcherId", "CurProgress", "TotalProgress", "IsTakenReward", });
new java.lang.String[] { "WatcherId", "IsTakenReward", "TotalProgress", "CurProgress", });
}
// @@protoc_insertion_point(outer_class_scope)