Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-21 21:09:54 +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/ActivityUpdateWatcherNotifyOuterClass.java
+108 -100
View File
@@ -19,32 +19,36 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.ActivityWatcherInfo watcher_info = 2;</code>
* <code>uint32 activity_id = 9;</code>
* @return The activityId.
*/
int getActivityId();
/**
* <code>.ActivityWatcherInfo watcher_info = 5;</code>
* @return Whether the watcherInfo field is set.
*/
boolean hasWatcherInfo();
/**
* <code>.ActivityWatcherInfo watcher_info = 2;</code>
* <code>.ActivityWatcherInfo watcher_info = 5;</code>
* @return The watcherInfo.
*/
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo getWatcherInfo();
/**
* <code>.ActivityWatcherInfo watcher_info = 2;</code>
* <code>.ActivityWatcherInfo watcher_info = 5;</code>
*/
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder getWatcherInfoOrBuilder();
/**
* <code>uint32 activity_id = 1;</code>
* @return The activityId.
*/
int getActivityId();
}
/**
* <pre>
* CmdId: 2156
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 2103;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code ActivityUpdateWatcherNotify}
@@ -91,12 +95,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
case 0:
done = true;
break;
case 8: {
activityId_ = input.readUInt32();
break;
}
case 18: {
case 42: {
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder subBuilder = null;
if (watcherInfo_ != null) {
subBuilder = watcherInfo_.toBuilder();
@@ -109,6 +108,11 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
break;
}
case 72: {
activityId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -141,10 +145,21 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify.class, emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify.Builder.class);
}
public static final int WATCHER_INFO_FIELD_NUMBER = 2;
public static final int ACTIVITY_ID_FIELD_NUMBER = 9;
private int activityId_;
/**
* <code>uint32 activity_id = 9;</code>
* @return The activityId.
*/
@java.lang.Override
public int getActivityId() {
return activityId_;
}
public static final int WATCHER_INFO_FIELD_NUMBER = 5;
private emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo watcherInfo_;
/**
* <code>.ActivityWatcherInfo watcher_info = 2;</code>
* <code>.ActivityWatcherInfo watcher_info = 5;</code>
* @return Whether the watcherInfo field is set.
*/
@java.lang.Override
@@ -152,7 +167,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return watcherInfo_ != null;
}
/**
* <code>.ActivityWatcherInfo watcher_info = 2;</code>
* <code>.ActivityWatcherInfo watcher_info = 5;</code>
* @return The watcherInfo.
*/
@java.lang.Override
@@ -160,24 +175,13 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return watcherInfo_ == null ? emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.getDefaultInstance() : watcherInfo_;
}
/**
* <code>.ActivityWatcherInfo watcher_info = 2;</code>
* <code>.ActivityWatcherInfo watcher_info = 5;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder getWatcherInfoOrBuilder() {
return getWatcherInfo();
}
public static final int ACTIVITY_ID_FIELD_NUMBER = 1;
private int activityId_;
/**
* <code>uint32 activity_id = 1;</code>
* @return The activityId.
*/
@java.lang.Override
public int getActivityId() {
return activityId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -192,11 +196,11 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (activityId_ != 0) {
output.writeUInt32(1, activityId_);
}
if (watcherInfo_ != null) {
output.writeMessage(2, getWatcherInfo());
output.writeMessage(5, getWatcherInfo());
}
if (activityId_ != 0) {
output.writeUInt32(9, activityId_);
}
unknownFields.writeTo(output);
}
@@ -207,13 +211,13 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (activityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, activityId_);
}
if (watcherInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(2, getWatcherInfo());
.computeMessageSize(5, getWatcherInfo());
}
if (activityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, activityId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -230,13 +234,13 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
}
emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify other = (emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify) obj;
if (getActivityId()
!= other.getActivityId()) return false;
if (hasWatcherInfo() != other.hasWatcherInfo()) return false;
if (hasWatcherInfo()) {
if (!getWatcherInfo()
.equals(other.getWatcherInfo())) return false;
}
if (getActivityId()
!= other.getActivityId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -248,12 +252,12 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getActivityId();
if (hasWatcherInfo()) {
hash = (37 * hash) + WATCHER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getWatcherInfo().hashCode();
}
hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getActivityId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -351,10 +355,14 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
}
/**
* <pre>
* CmdId: 2156
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 2103;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code ActivityUpdateWatcherNotify}
@@ -394,14 +402,14 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
activityId_ = 0;
if (watcherInfoBuilder_ == null) {
watcherInfo_ = null;
} else {
watcherInfo_ = null;
watcherInfoBuilder_ = null;
}
activityId_ = 0;
return this;
}
@@ -428,12 +436,12 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify buildPartial() {
emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify result = new emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify(this);
result.activityId_ = activityId_;
if (watcherInfoBuilder_ == null) {
result.watcherInfo_ = watcherInfo_;
} else {
result.watcherInfo_ = watcherInfoBuilder_.build();
}
result.activityId_ = activityId_;
onBuilt();
return result;
}
@@ -482,12 +490,12 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify other) {
if (other == emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify.getDefaultInstance()) return this;
if (other.hasWatcherInfo()) {
mergeWatcherInfo(other.getWatcherInfo());
}
if (other.getActivityId() != 0) {
setActivityId(other.getActivityId());
}
if (other.hasWatcherInfo()) {
mergeWatcherInfo(other.getWatcherInfo());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -517,18 +525,49 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return this;
}
private int activityId_ ;
/**
* <code>uint32 activity_id = 9;</code>
* @return The activityId.
*/
@java.lang.Override
public int getActivityId() {
return activityId_;
}
/**
* <code>uint32 activity_id = 9;</code>
* @param value The activityId to set.
* @return This builder for chaining.
*/
public Builder setActivityId(int value) {
activityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 activity_id = 9;</code>
* @return This builder for chaining.
*/
public Builder clearActivityId() {
activityId_ = 0;
onChanged();
return this;
}
private emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo watcherInfo_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder> watcherInfoBuilder_;
/**
* <code>.ActivityWatcherInfo watcher_info = 2;</code>
* <code>.ActivityWatcherInfo watcher_info = 5;</code>
* @return Whether the watcherInfo field is set.
*/
public boolean hasWatcherInfo() {
return watcherInfoBuilder_ != null || watcherInfo_ != null;
}
/**
* <code>.ActivityWatcherInfo watcher_info = 2;</code>
* <code>.ActivityWatcherInfo watcher_info = 5;</code>
* @return The watcherInfo.
*/
public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo getWatcherInfo() {
@@ -539,7 +578,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
}
}
/**
* <code>.ActivityWatcherInfo watcher_info = 2;</code>
* <code>.ActivityWatcherInfo watcher_info = 5;</code>
*/
public Builder setWatcherInfo(emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo value) {
if (watcherInfoBuilder_ == null) {
@@ -555,7 +594,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return this;
}
/**
* <code>.ActivityWatcherInfo watcher_info = 2;</code>
* <code>.ActivityWatcherInfo watcher_info = 5;</code>
*/
public Builder setWatcherInfo(
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder builderForValue) {
@@ -569,7 +608,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return this;
}
/**
* <code>.ActivityWatcherInfo watcher_info = 2;</code>
* <code>.ActivityWatcherInfo watcher_info = 5;</code>
*/
public Builder mergeWatcherInfo(emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo value) {
if (watcherInfoBuilder_ == null) {
@@ -587,7 +626,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return this;
}
/**
* <code>.ActivityWatcherInfo watcher_info = 2;</code>
* <code>.ActivityWatcherInfo watcher_info = 5;</code>
*/
public Builder clearWatcherInfo() {
if (watcherInfoBuilder_ == null) {
@@ -601,7 +640,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return this;
}
/**
* <code>.ActivityWatcherInfo watcher_info = 2;</code>
* <code>.ActivityWatcherInfo watcher_info = 5;</code>
*/
public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder getWatcherInfoBuilder() {
@@ -609,7 +648,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return getWatcherInfoFieldBuilder().getBuilder();
}
/**
* <code>.ActivityWatcherInfo watcher_info = 2;</code>
* <code>.ActivityWatcherInfo watcher_info = 5;</code>
*/
public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder getWatcherInfoOrBuilder() {
if (watcherInfoBuilder_ != null) {
@@ -620,7 +659,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
}
}
/**
* <code>.ActivityWatcherInfo watcher_info = 2;</code>
* <code>.ActivityWatcherInfo watcher_info = 5;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder>
@@ -635,37 +674,6 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
}
return watcherInfoBuilder_;
}
private int activityId_ ;
/**
* <code>uint32 activity_id = 1;</code>
* @return The activityId.
*/
@java.lang.Override
public int getActivityId() {
return activityId_;
}
/**
* <code>uint32 activity_id = 1;</code>
* @param value The activityId to set.
* @return This builder for chaining.
*/
public Builder setActivityId(int value) {
activityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 activity_id = 1;</code>
* @return This builder for chaining.
*/
public Builder clearActivityId() {
activityId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -735,8 +743,8 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
java.lang.String[] descriptorData = {
"\n!ActivityUpdateWatcherNotify.proto\032\031Act" +
"ivityWatcherInfo.proto\"^\n\033ActivityUpdate" +
"WatcherNotify\022*\n\014watcher_info\030\002 \001(\0132\024.Ac" +
"tivityWatcherInfo\022\023\n\013activity_id\030\001 \001(\rB\033" +
"WatcherNotify\022\023\n\013activity_id\030\t \001(\r\022*\n\014wa" +
"tcher_info\030\005 \001(\0132\024.ActivityWatcherInfoB\033" +
"\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -749,7 +757,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
internal_static_ActivityUpdateWatcherNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ActivityUpdateWatcherNotify_descriptor,
new java.lang.String[] { "WatcherInfo", "ActivityId", });
new java.lang.String[] { "ActivityId", "WatcherInfo", });
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.getDescriptor();
}