mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-23 22:09:52 +08:00
Update gc to 3.3 (#1981)
* 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:
committed by
GitHub
Unverified
parent
8b83dbf58c
commit
92fbaa8670
+101
-95
@@ -19,34 +19,37 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 id = 8;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
int getId();
|
||||
|
||||
/**
|
||||
* <code>uint32 weapon_max_promote_level = 15;</code>
|
||||
* <code>uint32 weapon_max_promote_level = 10;</code>
|
||||
* @return The weaponMaxPromoteLevel.
|
||||
*/
|
||||
int getWeaponMaxPromoteLevel();
|
||||
|
||||
/**
|
||||
* <code>.CodexType type = 11;</code>
|
||||
* <code>.CodexType type = 5;</code>
|
||||
* @return The enum numeric value on the wire for type.
|
||||
*/
|
||||
int getTypeValue();
|
||||
/**
|
||||
* <code>.CodexType type = 11;</code>
|
||||
* <code>.CodexType type = 5;</code>
|
||||
* @return The type.
|
||||
*/
|
||||
emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType getType();
|
||||
|
||||
/**
|
||||
* <code>uint32 id = 3;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
int getId();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 4207
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 4203;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code CodexDataUpdateNotify}
|
||||
@@ -94,18 +97,18 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 64: {
|
||||
case 24: {
|
||||
|
||||
id_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 88: {
|
||||
case 40: {
|
||||
int rawValue = input.readEnum();
|
||||
|
||||
type_ = rawValue;
|
||||
break;
|
||||
}
|
||||
case 120: {
|
||||
case 80: {
|
||||
|
||||
weaponMaxPromoteLevel_ = input.readUInt32();
|
||||
break;
|
||||
@@ -142,21 +145,10 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify.class, emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify.Builder.class);
|
||||
}
|
||||
|
||||
public static final int ID_FIELD_NUMBER = 8;
|
||||
private int id_;
|
||||
/**
|
||||
* <code>uint32 id = 8;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getId() {
|
||||
return id_;
|
||||
}
|
||||
|
||||
public static final int WEAPON_MAX_PROMOTE_LEVEL_FIELD_NUMBER = 15;
|
||||
public static final int WEAPON_MAX_PROMOTE_LEVEL_FIELD_NUMBER = 10;
|
||||
private int weaponMaxPromoteLevel_;
|
||||
/**
|
||||
* <code>uint32 weapon_max_promote_level = 15;</code>
|
||||
* <code>uint32 weapon_max_promote_level = 10;</code>
|
||||
* @return The weaponMaxPromoteLevel.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -164,17 +156,17 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
return weaponMaxPromoteLevel_;
|
||||
}
|
||||
|
||||
public static final int TYPE_FIELD_NUMBER = 11;
|
||||
public static final int TYPE_FIELD_NUMBER = 5;
|
||||
private int type_;
|
||||
/**
|
||||
* <code>.CodexType type = 11;</code>
|
||||
* <code>.CodexType type = 5;</code>
|
||||
* @return The enum numeric value on the wire for type.
|
||||
*/
|
||||
@java.lang.Override public int getTypeValue() {
|
||||
return type_;
|
||||
}
|
||||
/**
|
||||
* <code>.CodexType type = 11;</code>
|
||||
* <code>.CodexType type = 5;</code>
|
||||
* @return The type.
|
||||
*/
|
||||
@java.lang.Override public emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType getType() {
|
||||
@@ -183,6 +175,17 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
return result == null ? emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.UNRECOGNIZED : result;
|
||||
}
|
||||
|
||||
public static final int ID_FIELD_NUMBER = 3;
|
||||
private int id_;
|
||||
/**
|
||||
* <code>uint32 id = 3;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getId() {
|
||||
return id_;
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
@java.lang.Override
|
||||
public final boolean isInitialized() {
|
||||
@@ -198,13 +201,13 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (id_ != 0) {
|
||||
output.writeUInt32(8, id_);
|
||||
output.writeUInt32(3, id_);
|
||||
}
|
||||
if (type_ != emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.CODEX_TYPE_NONE.getNumber()) {
|
||||
output.writeEnum(11, type_);
|
||||
output.writeEnum(5, type_);
|
||||
}
|
||||
if (weaponMaxPromoteLevel_ != 0) {
|
||||
output.writeUInt32(15, weaponMaxPromoteLevel_);
|
||||
output.writeUInt32(10, weaponMaxPromoteLevel_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -217,15 +220,15 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
size = 0;
|
||||
if (id_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(8, id_);
|
||||
.computeUInt32Size(3, id_);
|
||||
}
|
||||
if (type_ != emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.CODEX_TYPE_NONE.getNumber()) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeEnumSize(11, type_);
|
||||
.computeEnumSize(5, type_);
|
||||
}
|
||||
if (weaponMaxPromoteLevel_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(15, weaponMaxPromoteLevel_);
|
||||
.computeUInt32Size(10, weaponMaxPromoteLevel_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -242,11 +245,11 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
}
|
||||
emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify other = (emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify) obj;
|
||||
|
||||
if (getId()
|
||||
!= other.getId()) return false;
|
||||
if (getWeaponMaxPromoteLevel()
|
||||
!= other.getWeaponMaxPromoteLevel()) return false;
|
||||
if (type_ != other.type_) return false;
|
||||
if (getId()
|
||||
!= other.getId()) return false;
|
||||
if (!unknownFields.equals(other.unknownFields)) return false;
|
||||
return true;
|
||||
}
|
||||
@@ -258,12 +261,12 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getId();
|
||||
hash = (37 * hash) + WEAPON_MAX_PROMOTE_LEVEL_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getWeaponMaxPromoteLevel();
|
||||
hash = (37 * hash) + TYPE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + type_;
|
||||
hash = (37 * hash) + ID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getId();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -361,10 +364,13 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* CmdId: 4207
|
||||
* EnetChannelId: 0
|
||||
* EnetIsReliable: false
|
||||
* IsAllowClient: true
|
||||
* enum CmdId {
|
||||
* option allow_alias = true;
|
||||
* NONE = 0;
|
||||
* CMD_ID = 4203;
|
||||
* ENET_CHANNEL_ID = 0;
|
||||
* ENET_IS_RELIABLE = 1;
|
||||
* }
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code CodexDataUpdateNotify}
|
||||
@@ -404,12 +410,12 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
@java.lang.Override
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
id_ = 0;
|
||||
|
||||
weaponMaxPromoteLevel_ = 0;
|
||||
|
||||
type_ = 0;
|
||||
|
||||
id_ = 0;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -436,9 +442,9 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
@java.lang.Override
|
||||
public emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify buildPartial() {
|
||||
emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify result = new emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify(this);
|
||||
result.id_ = id_;
|
||||
result.weaponMaxPromoteLevel_ = weaponMaxPromoteLevel_;
|
||||
result.type_ = type_;
|
||||
result.id_ = id_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
@@ -487,15 +493,15 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
|
||||
public Builder mergeFrom(emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify other) {
|
||||
if (other == emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify.getDefaultInstance()) return this;
|
||||
if (other.getId() != 0) {
|
||||
setId(other.getId());
|
||||
}
|
||||
if (other.getWeaponMaxPromoteLevel() != 0) {
|
||||
setWeaponMaxPromoteLevel(other.getWeaponMaxPromoteLevel());
|
||||
}
|
||||
if (other.type_ != 0) {
|
||||
setTypeValue(other.getTypeValue());
|
||||
}
|
||||
if (other.getId() != 0) {
|
||||
setId(other.getId());
|
||||
}
|
||||
this.mergeUnknownFields(other.unknownFields);
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -525,40 +531,9 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
|
||||
private int id_ ;
|
||||
/**
|
||||
* <code>uint32 id = 8;</code>
|
||||
* @return The id.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getId() {
|
||||
return id_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 id = 8;</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 = 8;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearId() {
|
||||
|
||||
id_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
private int weaponMaxPromoteLevel_ ;
|
||||
/**
|
||||
* <code>uint32 weapon_max_promote_level = 15;</code>
|
||||
* <code>uint32 weapon_max_promote_level = 10;</code>
|
||||
* @return The weaponMaxPromoteLevel.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -566,7 +541,7 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
return weaponMaxPromoteLevel_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 weapon_max_promote_level = 15;</code>
|
||||
* <code>uint32 weapon_max_promote_level = 10;</code>
|
||||
* @param value The weaponMaxPromoteLevel to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -577,7 +552,7 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 weapon_max_promote_level = 15;</code>
|
||||
* <code>uint32 weapon_max_promote_level = 10;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearWeaponMaxPromoteLevel() {
|
||||
@@ -589,14 +564,14 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
|
||||
private int type_ = 0;
|
||||
/**
|
||||
* <code>.CodexType type = 11;</code>
|
||||
* <code>.CodexType type = 5;</code>
|
||||
* @return The enum numeric value on the wire for type.
|
||||
*/
|
||||
@java.lang.Override public int getTypeValue() {
|
||||
return type_;
|
||||
}
|
||||
/**
|
||||
* <code>.CodexType type = 11;</code>
|
||||
* <code>.CodexType type = 5;</code>
|
||||
* @param value The enum numeric value on the wire for type to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -607,7 +582,7 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.CodexType type = 11;</code>
|
||||
* <code>.CodexType type = 5;</code>
|
||||
* @return The type.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -617,7 +592,7 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
return result == null ? emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.UNRECOGNIZED : result;
|
||||
}
|
||||
/**
|
||||
* <code>.CodexType type = 11;</code>
|
||||
* <code>.CodexType type = 5;</code>
|
||||
* @param value The type to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -631,7 +606,7 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.CodexType type = 11;</code>
|
||||
* <code>.CodexType type = 5;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearType() {
|
||||
@@ -640,6 +615,37 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
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;
|
||||
}
|
||||
@java.lang.Override
|
||||
public final Builder setUnknownFields(
|
||||
final com.google.protobuf.UnknownFieldSet unknownFields) {
|
||||
@@ -708,9 +714,9 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\033CodexDataUpdateNotify.proto\032\017CodexType" +
|
||||
".proto\"_\n\025CodexDataUpdateNotify\022\n\n\002id\030\010 " +
|
||||
"\001(\r\022 \n\030weapon_max_promote_level\030\017 \001(\r\022\030\n" +
|
||||
"\004type\030\013 \001(\0162\n.CodexTypeB\033\n\031emu.grasscutt" +
|
||||
".proto\"_\n\025CodexDataUpdateNotify\022 \n\030weapo" +
|
||||
"n_max_promote_level\030\n \001(\r\022\030\n\004type\030\005 \001(\0162" +
|
||||
"\n.CodexType\022\n\n\002id\030\003 \001(\rB\033\n\031emu.grasscutt" +
|
||||
"er.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
@@ -723,7 +729,7 @@ public final class CodexDataUpdateNotifyOuterClass {
|
||||
internal_static_CodexDataUpdateNotify_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_CodexDataUpdateNotify_descriptor,
|
||||
new java.lang.String[] { "Id", "WeaponMaxPromoteLevel", "Type", });
|
||||
new java.lang.String[] { "WeaponMaxPromoteLevel", "Type", "Id", });
|
||||
emu.grasscutter.net.proto.CodexTypeOuterClass.getDescriptor();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user