Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-18 08:49:50 +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/AvatarSkillMaxChargeCountNotifyOuterClass.java
+140 -134
View File
@@ -19,29 +19,32 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 skill_id = 6;</code>
* @return The skillId.
* <code>uint64 avatar_guid = 4;</code>
* @return The avatarGuid.
*/
int getSkillId();
long getAvatarGuid();
/**
* <code>uint32 max_charge_count = 11;</code>
* <code>uint32 max_charge_count = 9;</code>
* @return The maxChargeCount.
*/
int getMaxChargeCount();
/**
* <code>uint64 avatar_guid = 7;</code>
* @return The avatarGuid.
* <code>uint32 skill_id = 6;</code>
* @return The skillId.
*/
long getAvatarGuid();
int getSkillId();
}
/**
* <pre>
* CmdId: 1003
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1061;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarSkillMaxChargeCountNotify}
@@ -88,17 +91,17 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
case 0:
done = true;
break;
case 32: {
avatarGuid_ = input.readUInt64();
break;
}
case 48: {
skillId_ = input.readUInt32();
break;
}
case 56: {
avatarGuid_ = input.readUInt64();
break;
}
case 88: {
case 72: {
maxChargeCount_ = input.readUInt32();
break;
@@ -135,6 +138,28 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify.class, emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify.Builder.class);
}
public static final int AVATAR_GUID_FIELD_NUMBER = 4;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 4;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
public static final int MAX_CHARGE_COUNT_FIELD_NUMBER = 9;
private int maxChargeCount_;
/**
* <code>uint32 max_charge_count = 9;</code>
* @return The maxChargeCount.
*/
@java.lang.Override
public int getMaxChargeCount() {
return maxChargeCount_;
}
public static final int SKILL_ID_FIELD_NUMBER = 6;
private int skillId_;
/**
@@ -146,28 +171,6 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
return skillId_;
}
public static final int MAX_CHARGE_COUNT_FIELD_NUMBER = 11;
private int maxChargeCount_;
/**
* <code>uint32 max_charge_count = 11;</code>
* @return The maxChargeCount.
*/
@java.lang.Override
public int getMaxChargeCount() {
return maxChargeCount_;
}
public static final int AVATAR_GUID_FIELD_NUMBER = 7;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 7;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -182,14 +185,14 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (avatarGuid_ != 0L) {
output.writeUInt64(4, avatarGuid_);
}
if (skillId_ != 0) {
output.writeUInt32(6, skillId_);
}
if (avatarGuid_ != 0L) {
output.writeUInt64(7, avatarGuid_);
}
if (maxChargeCount_ != 0) {
output.writeUInt32(11, maxChargeCount_);
output.writeUInt32(9, maxChargeCount_);
}
unknownFields.writeTo(output);
}
@@ -200,17 +203,17 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(4, avatarGuid_);
}
if (skillId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, skillId_);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(7, avatarGuid_);
}
if (maxChargeCount_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, maxChargeCount_);
.computeUInt32Size(9, maxChargeCount_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -227,12 +230,12 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
}
emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify other = (emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify) obj;
if (getSkillId()
!= other.getSkillId()) return false;
if (getMaxChargeCount()
!= other.getMaxChargeCount()) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (getMaxChargeCount()
!= other.getMaxChargeCount()) return false;
if (getSkillId()
!= other.getSkillId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -244,13 +247,13 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
hash = (53 * hash) + getSkillId();
hash = (37 * hash) + MAX_CHARGE_COUNT_FIELD_NUMBER;
hash = (53 * hash) + getMaxChargeCount();
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (37 * hash) + MAX_CHARGE_COUNT_FIELD_NUMBER;
hash = (53 * hash) + getMaxChargeCount();
hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
hash = (53 * hash) + getSkillId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -348,10 +351,13 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1003
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1061;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarSkillMaxChargeCountNotify}
@@ -391,11 +397,11 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
skillId_ = 0;
avatarGuid_ = 0L;
maxChargeCount_ = 0;
avatarGuid_ = 0L;
skillId_ = 0;
return this;
}
@@ -423,9 +429,9 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify buildPartial() {
emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify result = new emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify(this);
result.skillId_ = skillId_;
result.maxChargeCount_ = maxChargeCount_;
result.avatarGuid_ = avatarGuid_;
result.maxChargeCount_ = maxChargeCount_;
result.skillId_ = skillId_;
onBuilt();
return result;
}
@@ -474,14 +480,14 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify other) {
if (other == emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify.getDefaultInstance()) return this;
if (other.getSkillId() != 0) {
setSkillId(other.getSkillId());
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
if (other.getMaxChargeCount() != 0) {
setMaxChargeCount(other.getMaxChargeCount());
}
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
if (other.getSkillId() != 0) {
setSkillId(other.getSkillId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -512,6 +518,68 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 4;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 4;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuid(long value) {
avatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 avatar_guid = 4;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
private int maxChargeCount_ ;
/**
* <code>uint32 max_charge_count = 9;</code>
* @return The maxChargeCount.
*/
@java.lang.Override
public int getMaxChargeCount() {
return maxChargeCount_;
}
/**
* <code>uint32 max_charge_count = 9;</code>
* @param value The maxChargeCount to set.
* @return This builder for chaining.
*/
public Builder setMaxChargeCount(int value) {
maxChargeCount_ = value;
onChanged();
return this;
}
/**
* <code>uint32 max_charge_count = 9;</code>
* @return This builder for chaining.
*/
public Builder clearMaxChargeCount() {
maxChargeCount_ = 0;
onChanged();
return this;
}
private int skillId_ ;
/**
* <code>uint32 skill_id = 6;</code>
@@ -542,68 +610,6 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
onChanged();
return this;
}
private int maxChargeCount_ ;
/**
* <code>uint32 max_charge_count = 11;</code>
* @return The maxChargeCount.
*/
@java.lang.Override
public int getMaxChargeCount() {
return maxChargeCount_;
}
/**
* <code>uint32 max_charge_count = 11;</code>
* @param value The maxChargeCount to set.
* @return This builder for chaining.
*/
public Builder setMaxChargeCount(int value) {
maxChargeCount_ = value;
onChanged();
return this;
}
/**
* <code>uint32 max_charge_count = 11;</code>
* @return This builder for chaining.
*/
public Builder clearMaxChargeCount() {
maxChargeCount_ = 0;
onChanged();
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 7;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 7;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuid(long value) {
avatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 avatar_guid = 7;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -672,9 +678,9 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n%AvatarSkillMaxChargeCountNotify.proto\"" +
"b\n\037AvatarSkillMaxChargeCountNotify\022\020\n\010sk" +
"ill_id\030\006 \001(\r\022\030\n\020max_charge_count\030\013 \001(\r\022\023" +
"\n\013avatar_guid\030\007 \001(\004B\033\n\031emu.grasscutter.n" +
"b\n\037AvatarSkillMaxChargeCountNotify\022\023\n\013av" +
"atar_guid\030\004 \001(\004\022\030\n\020max_charge_count\030\t \001(" +
"\r\022\020\n\010skill_id\030\006 \001(\rB\033\n\031emu.grasscutter.n" +
"et.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -686,7 +692,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
internal_static_AvatarSkillMaxChargeCountNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarSkillMaxChargeCountNotify_descriptor,
new java.lang.String[] { "SkillId", "MaxChargeCount", "AvatarGuid", });
new java.lang.String[] { "AvatarGuid", "MaxChargeCount", "SkillId", });
}
// @@protoc_insertion_point(outer_class_scope)