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

Update gc to 3.3 (#1981)

Browse Source 
* replace the deprecated api

* update proto

* delete music game

* fixed codes

* fix costume switch

* fix mail bug

* Bump version number.

* Re-add max boss chest number

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
This commit is contained in:
Simplxs
2022-12-24 05:12:02 +08:00
committed by GitHub
Unverified
parent 8b83dbf58c
commit 92fbaa8670
1142 changed files with 474411 additions and 169883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/ActivityWatcherInfoOuterClass.java
+107 -107
View File
@@ -19,25 +19,25 @@ public final class ActivityWatcherInfoOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>bool is_taken_reward = 8;</code>
* <code>bool is_taken_reward = 2;</code>
* @return The isTakenReward.
*/
boolean getIsTakenReward();
/**
* <code>uint32 cur_progress = 2;</code>
* @return The curProgress.
*/
int getCurProgress();
/**
* <code>uint32 total_progress = 4;</code>
* <code>uint32 total_progress = 1;</code>
* @return The totalProgress.
*/
int getTotalProgress();
/**
* <code>uint32 watcher_id = 5;</code>
* <code>uint32 cur_progress = 8;</code>
* @return The curProgress.
*/
int getCurProgress();
/**
* <code>uint32 watcher_id = 14;</code>
* @return The watcherId.
*/
int getWatcherId();
@@ -87,24 +87,24 @@ public final class ActivityWatcherInfoOuterClass {
case 0:
done = true;
break;
case 16: {
curProgress_ = input.readUInt32();
break;
}
case 32: {
case 8: {
totalProgress_ = input.readUInt32();
break;
}
case 40: {
case 16: {
watcherId_ = input.readUInt32();
isTakenReward_ = input.readBool();
break;
}
case 64: {
isTakenReward_ = input.readBool();
curProgress_ = input.readUInt32();
break;
}
case 112: {
watcherId_ = input.readUInt32();
break;
}
default: {
@@ -139,10 +139,10 @@ public final class ActivityWatcherInfoOuterClass {
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.class, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder.class);
}
public static final int IS_TAKEN_REWARD_FIELD_NUMBER = 8;
public static final int IS_TAKEN_REWARD_FIELD_NUMBER = 2;
private boolean isTakenReward_;
/**
* <code>bool is_taken_reward = 8;</code>
* <code>bool is_taken_reward = 2;</code>
* @return The isTakenReward.
*/
@java.lang.Override
@@ -150,21 +150,10 @@ public final class ActivityWatcherInfoOuterClass {
return isTakenReward_;
}
public static final int CUR_PROGRESS_FIELD_NUMBER = 2;
private int curProgress_;
/**
* <code>uint32 cur_progress = 2;</code>
* @return The curProgress.
*/
@java.lang.Override
public int getCurProgress() {
return curProgress_;
}
public static final int TOTAL_PROGRESS_FIELD_NUMBER = 4;
public static final int TOTAL_PROGRESS_FIELD_NUMBER = 1;
private int totalProgress_;
/**
* <code>uint32 total_progress = 4;</code>
* <code>uint32 total_progress = 1;</code>
* @return The totalProgress.
*/
@java.lang.Override
@@ -172,10 +161,21 @@ public final class ActivityWatcherInfoOuterClass {
return totalProgress_;
}
public static final int WATCHER_ID_FIELD_NUMBER = 5;
public static final int CUR_PROGRESS_FIELD_NUMBER = 8;
private int curProgress_;
/**
* <code>uint32 cur_progress = 8;</code>
* @return The curProgress.
*/
@java.lang.Override
public int getCurProgress() {
return curProgress_;
}
public static final int WATCHER_ID_FIELD_NUMBER = 14;
private int watcherId_;
/**
* <code>uint32 watcher_id = 5;</code>
* <code>uint32 watcher_id = 14;</code>
* @return The watcherId.
*/
@java.lang.Override
@@ -197,17 +197,17 @@ public final class ActivityWatcherInfoOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (curProgress_ != 0) {
output.writeUInt32(2, curProgress_);
}
if (totalProgress_ != 0) {
output.writeUInt32(4, totalProgress_);
}
if (watcherId_ != 0) {
output.writeUInt32(5, watcherId_);
output.writeUInt32(1, totalProgress_);
}
if (isTakenReward_ != false) {
output.writeBool(8, isTakenReward_);
output.writeBool(2, isTakenReward_);
}
if (curProgress_ != 0) {
output.writeUInt32(8, curProgress_);
}
if (watcherId_ != 0) {
output.writeUInt32(14, watcherId_);
}
unknownFields.writeTo(output);
}
@@ -218,21 +218,21 @@ public final class ActivityWatcherInfoOuterClass {
if (size != -1) return size;
size = 0;
if (curProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, curProgress_);
}
if (totalProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, totalProgress_);
}
if (watcherId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, watcherId_);
.computeUInt32Size(1, totalProgress_);
}
if (isTakenReward_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(8, isTakenReward_);
.computeBoolSize(2, isTakenReward_);
}
if (curProgress_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, curProgress_);
}
if (watcherId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, watcherId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -251,10 +251,10 @@ public final class ActivityWatcherInfoOuterClass {
if (getIsTakenReward()
!= other.getIsTakenReward()) return false;
if (getCurProgress()
!= other.getCurProgress()) return false;
if (getTotalProgress()
!= other.getTotalProgress()) return false;
if (getCurProgress()
!= other.getCurProgress()) return false;
if (getWatcherId()
!= other.getWatcherId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -271,10 +271,10 @@ public final class ActivityWatcherInfoOuterClass {
hash = (37 * hash) + IS_TAKEN_REWARD_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsTakenReward());
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) + CUR_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getCurProgress();
hash = (37 * hash) + WATCHER_ID_FIELD_NUMBER;
hash = (53 * hash) + getWatcherId();
hash = (29 * hash) + unknownFields.hashCode();
@@ -412,10 +412,10 @@ public final class ActivityWatcherInfoOuterClass {
super.clear();
isTakenReward_ = false;
curProgress_ = 0;
totalProgress_ = 0;
curProgress_ = 0;
watcherId_ = 0;
return this;
@@ -445,8 +445,8 @@ 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.isTakenReward_ = isTakenReward_;
result.curProgress_ = curProgress_;
result.totalProgress_ = totalProgress_;
result.curProgress_ = curProgress_;
result.watcherId_ = watcherId_;
onBuilt();
return result;
@@ -499,12 +499,12 @@ public final class ActivityWatcherInfoOuterClass {
if (other.getIsTakenReward() != false) {
setIsTakenReward(other.getIsTakenReward());
}
if (other.getCurProgress() != 0) {
setCurProgress(other.getCurProgress());
}
if (other.getTotalProgress() != 0) {
setTotalProgress(other.getTotalProgress());
}
if (other.getCurProgress() != 0) {
setCurProgress(other.getCurProgress());
}
if (other.getWatcherId() != 0) {
setWatcherId(other.getWatcherId());
}
@@ -539,7 +539,7 @@ public final class ActivityWatcherInfoOuterClass {
private boolean isTakenReward_ ;
/**
* <code>bool is_taken_reward = 8;</code>
* <code>bool is_taken_reward = 2;</code>
* @return The isTakenReward.
*/
@java.lang.Override
@@ -547,7 +547,7 @@ public final class ActivityWatcherInfoOuterClass {
return isTakenReward_;
}
/**
* <code>bool is_taken_reward = 8;</code>
* <code>bool is_taken_reward = 2;</code>
* @param value The isTakenReward to set.
* @return This builder for chaining.
*/
@@ -558,7 +558,7 @@ public final class ActivityWatcherInfoOuterClass {
return this;
}
/**
* <code>bool is_taken_reward = 8;</code>
* <code>bool is_taken_reward = 2;</code>
* @return This builder for chaining.
*/
public Builder clearIsTakenReward() {
@@ -568,40 +568,9 @@ public final class ActivityWatcherInfoOuterClass {
return this;
}
private int curProgress_ ;
/**
* <code>uint32 cur_progress = 2;</code>
* @return The curProgress.
*/
@java.lang.Override
public int getCurProgress() {
return curProgress_;
}
/**
* <code>uint32 cur_progress = 2;</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 = 2;</code>
* @return This builder for chaining.
*/
public Builder clearCurProgress() {
curProgress_ = 0;
onChanged();
return this;
}
private int totalProgress_ ;
/**
* <code>uint32 total_progress = 4;</code>
* <code>uint32 total_progress = 1;</code>
* @return The totalProgress.
*/
@java.lang.Override
@@ -609,7 +578,7 @@ public final class ActivityWatcherInfoOuterClass {
return totalProgress_;
}
/**
* <code>uint32 total_progress = 4;</code>
* <code>uint32 total_progress = 1;</code>
* @param value The totalProgress to set.
* @return This builder for chaining.
*/
@@ -620,7 +589,7 @@ public final class ActivityWatcherInfoOuterClass {
return this;
}
/**
* <code>uint32 total_progress = 4;</code>
* <code>uint32 total_progress = 1;</code>
* @return This builder for chaining.
*/
public Builder clearTotalProgress() {
@@ -630,9 +599,40 @@ public final class ActivityWatcherInfoOuterClass {
return this;
}
private int curProgress_ ;
/**
* <code>uint32 cur_progress = 8;</code>
* @return The curProgress.
*/
@java.lang.Override
public int getCurProgress() {
return curProgress_;
}
/**
* <code>uint32 cur_progress = 8;</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 = 8;</code>
* @return This builder for chaining.
*/
public Builder clearCurProgress() {
curProgress_ = 0;
onChanged();
return this;
}
private int watcherId_ ;
/**
* <code>uint32 watcher_id = 5;</code>
* <code>uint32 watcher_id = 14;</code>
* @return The watcherId.
*/
@java.lang.Override
@@ -640,7 +640,7 @@ public final class ActivityWatcherInfoOuterClass {
return watcherId_;
}
/**
* <code>uint32 watcher_id = 5;</code>
* <code>uint32 watcher_id = 14;</code>
* @param value The watcherId to set.
* @return This builder for chaining.
*/
@@ -651,7 +651,7 @@ public final class ActivityWatcherInfoOuterClass {
return this;
}
/**
* <code>uint32 watcher_id = 5;</code>
* <code>uint32 watcher_id = 14;</code>
* @return This builder for chaining.
*/
public Builder clearWatcherId() {
@@ -728,9 +728,9 @@ public final class ActivityWatcherInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\031ActivityWatcherInfo.proto\"p\n\023ActivityW" +
"atcherInfo\022\027\n\017is_taken_reward\030\010 \001(\010\022\024\n\014c" +
"ur_progress\030\002 \001(\r\022\026\n\016total_progress\030\004 \001(" +
"\r\022\022\n\nwatcher_id\030\005 \001(\rB\033\n\031emu.grasscutter" +
"atcherInfo\022\027\n\017is_taken_reward\030\002 \001(\010\022\026\n\016t" +
"otal_progress\030\001 \001(\r\022\024\n\014cur_progress\030\010 \001(" +
"\r\022\022\n\nwatcher_id\030\016 \001(\rB\033\n\031emu.grasscutter" +
".net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -742,7 +742,7 @@ public final class ActivityWatcherInfoOuterClass {
internal_static_ActivityWatcherInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ActivityWatcherInfo_descriptor,
new java.lang.String[] { "IsTakenReward", "CurProgress", "TotalProgress", "WatcherId", });
new java.lang.String[] { "IsTakenReward", "TotalProgress", "CurProgress", "WatcherId", });
}
// @@protoc_insertion_point(outer_class_scope)