Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-09 01:04:00 +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/ProudSkillChangeNotifyOuterClass.java
+187 -181
View File
@@ -19,46 +19,49 @@ public final class ProudSkillChangeNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 avatar_guid = 11;</code>
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>uint32 entity_id = 4;</code>
* @return The entityId.
* <code>repeated uint32 proud_skill_list = 5;</code>
* @return A list containing the proudSkillList.
*/
int getEntityId();
java.util.List<java.lang.Integer> getProudSkillListList();
/**
* <code>repeated uint32 proud_skill_list = 5;</code>
* @return The count of proudSkillList.
*/
int getProudSkillListCount();
/**
* <code>repeated uint32 proud_skill_list = 5;</code>
* @param index The index of the element to return.
* @return The proudSkillList at the given index.
*/
int getProudSkillList(int index);
/**
* <code>uint32 skill_depot_id = 8;</code>
* <code>uint32 skill_depot_id = 12;</code>
* @return The skillDepotId.
*/
int getSkillDepotId();
/**
* <code>repeated uint32 proud_skill_list = 12;</code>
* @return A list containing the proudSkillList.
* <code>uint32 entity_id = 3;</code>
* @return The entityId.
*/
java.util.List<java.lang.Integer> getProudSkillListList();
/**
* <code>repeated uint32 proud_skill_list = 12;</code>
* @return The count of proudSkillList.
*/
int getProudSkillListCount();
/**
* <code>repeated uint32 proud_skill_list = 12;</code>
* @param index The index of the element to return.
* @return The proudSkillList at the given index.
*/
int getProudSkillList(int index);
int getEntityId();
}
/**
* <pre>
* CmdId: 1031
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1027;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code ProudSkillChangeNotify}
@@ -107,22 +110,12 @@ public final class ProudSkillChangeNotifyOuterClass {
case 0:
done = true;
break;
case 32: {
case 24: {
entityId_ = input.readUInt32();
break;
}
case 64: {
skillDepotId_ = input.readUInt32();
break;
}
case 88: {
avatarGuid_ = input.readUInt64();
break;
}
case 96: {
case 40: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
proudSkillList_ = newIntList();
mutable_bitField0_ |= 0x00000001;
@@ -130,7 +123,7 @@ public final class ProudSkillChangeNotifyOuterClass {
proudSkillList_.addInt(input.readUInt32());
break;
}
case 98: {
case 42: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -143,6 +136,16 @@ public final class ProudSkillChangeNotifyOuterClass {
input.popLimit(limit);
break;
}
case 96: {
skillDepotId_ = input.readUInt32();
break;
}
case 104: {
avatarGuid_ = input.readUInt64();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -178,10 +181,10 @@ public final class ProudSkillChangeNotifyOuterClass {
emu.grasscutter.net.proto.ProudSkillChangeNotifyOuterClass.ProudSkillChangeNotify.class, emu.grasscutter.net.proto.ProudSkillChangeNotifyOuterClass.ProudSkillChangeNotify.Builder.class);
}
public static final int AVATAR_GUID_FIELD_NUMBER = 11;
public static final int AVATAR_GUID_FIELD_NUMBER = 13;
private long avatarGuid_;
/**
* <code>uint64 avatar_guid = 11;</code>
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -189,32 +192,10 @@ public final class ProudSkillChangeNotifyOuterClass {
return avatarGuid_;
}
public static final int ENTITY_ID_FIELD_NUMBER = 4;
private int entityId_;
/**
* <code>uint32 entity_id = 4;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
public static final int SKILL_DEPOT_ID_FIELD_NUMBER = 8;
private int skillDepotId_;
/**
* <code>uint32 skill_depot_id = 8;</code>
* @return The skillDepotId.
*/
@java.lang.Override
public int getSkillDepotId() {
return skillDepotId_;
}
public static final int PROUD_SKILL_LIST_FIELD_NUMBER = 12;
public static final int PROUD_SKILL_LIST_FIELD_NUMBER = 5;
private com.google.protobuf.Internal.IntList proudSkillList_;
/**
* <code>repeated uint32 proud_skill_list = 12;</code>
* <code>repeated uint32 proud_skill_list = 5;</code>
* @return A list containing the proudSkillList.
*/
@java.lang.Override
@@ -223,14 +204,14 @@ public final class ProudSkillChangeNotifyOuterClass {
return proudSkillList_;
}
/**
* <code>repeated uint32 proud_skill_list = 12;</code>
* <code>repeated uint32 proud_skill_list = 5;</code>
* @return The count of proudSkillList.
*/
public int getProudSkillListCount() {
return proudSkillList_.size();
}
/**
* <code>repeated uint32 proud_skill_list = 12;</code>
* <code>repeated uint32 proud_skill_list = 5;</code>
* @param index The index of the element to return.
* @return The proudSkillList at the given index.
*/
@@ -239,6 +220,28 @@ public final class ProudSkillChangeNotifyOuterClass {
}
private int proudSkillListMemoizedSerializedSize = -1;
public static final int SKILL_DEPOT_ID_FIELD_NUMBER = 12;
private int skillDepotId_;
/**
* <code>uint32 skill_depot_id = 12;</code>
* @return The skillDepotId.
*/
@java.lang.Override
public int getSkillDepotId() {
return skillDepotId_;
}
public static final int ENTITY_ID_FIELD_NUMBER = 3;
private int entityId_;
/**
* <code>uint32 entity_id = 3;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -255,21 +258,21 @@ public final class ProudSkillChangeNotifyOuterClass {
throws java.io.IOException {
getSerializedSize();
if (entityId_ != 0) {
output.writeUInt32(4, entityId_);
}
if (skillDepotId_ != 0) {
output.writeUInt32(8, skillDepotId_);
}
if (avatarGuid_ != 0L) {
output.writeUInt64(11, avatarGuid_);
output.writeUInt32(3, entityId_);
}
if (getProudSkillListList().size() > 0) {
output.writeUInt32NoTag(98);
output.writeUInt32NoTag(42);
output.writeUInt32NoTag(proudSkillListMemoizedSerializedSize);
}
for (int i = 0; i < proudSkillList_.size(); i++) {
output.writeUInt32NoTag(proudSkillList_.getInt(i));
}
if (skillDepotId_ != 0) {
output.writeUInt32(12, skillDepotId_);
}
if (avatarGuid_ != 0L) {
output.writeUInt64(13, avatarGuid_);
}
unknownFields.writeTo(output);
}
@@ -281,15 +284,7 @@ public final class ProudSkillChangeNotifyOuterClass {
size = 0;
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, entityId_);
}
if (skillDepotId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, skillDepotId_);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(11, avatarGuid_);
.computeUInt32Size(3, entityId_);
}
{
int dataSize = 0;
@@ -305,6 +300,14 @@ public final class ProudSkillChangeNotifyOuterClass {
}
proudSkillListMemoizedSerializedSize = dataSize;
}
if (skillDepotId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, skillDepotId_);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(13, avatarGuid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -322,12 +325,12 @@ public final class ProudSkillChangeNotifyOuterClass {
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (getEntityId()
!= other.getEntityId()) return false;
if (getSkillDepotId()
!= other.getSkillDepotId()) return false;
if (!getProudSkillListList()
.equals(other.getProudSkillListList())) return false;
if (getSkillDepotId()
!= other.getSkillDepotId()) return false;
if (getEntityId()
!= other.getEntityId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -342,14 +345,14 @@ public final class ProudSkillChangeNotifyOuterClass {
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getEntityId();
hash = (37 * hash) + SKILL_DEPOT_ID_FIELD_NUMBER;
hash = (53 * hash) + getSkillDepotId();
if (getProudSkillListCount() > 0) {
hash = (37 * hash) + PROUD_SKILL_LIST_FIELD_NUMBER;
hash = (53 * hash) + getProudSkillListList().hashCode();
}
hash = (37 * hash) + SKILL_DEPOT_ID_FIELD_NUMBER;
hash = (53 * hash) + getSkillDepotId();
hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getEntityId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -447,10 +450,13 @@ public final class ProudSkillChangeNotifyOuterClass {
}
/**
* <pre>
* CmdId: 1031
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1027;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code ProudSkillChangeNotify}
@@ -492,12 +498,12 @@ public final class ProudSkillChangeNotifyOuterClass {
super.clear();
avatarGuid_ = 0L;
entityId_ = 0;
skillDepotId_ = 0;
proudSkillList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
skillDepotId_ = 0;
entityId_ = 0;
return this;
}
@@ -526,13 +532,13 @@ public final class ProudSkillChangeNotifyOuterClass {
emu.grasscutter.net.proto.ProudSkillChangeNotifyOuterClass.ProudSkillChangeNotify result = new emu.grasscutter.net.proto.ProudSkillChangeNotifyOuterClass.ProudSkillChangeNotify(this);
int from_bitField0_ = bitField0_;
result.avatarGuid_ = avatarGuid_;
result.entityId_ = entityId_;
result.skillDepotId_ = skillDepotId_;
if (((bitField0_ & 0x00000001) != 0)) {
proudSkillList_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000001);
}
result.proudSkillList_ = proudSkillList_;
result.skillDepotId_ = skillDepotId_;
result.entityId_ = entityId_;
onBuilt();
return result;
}
@@ -584,12 +590,6 @@ public final class ProudSkillChangeNotifyOuterClass {
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
if (other.getEntityId() != 0) {
setEntityId(other.getEntityId());
}
if (other.getSkillDepotId() != 0) {
setSkillDepotId(other.getSkillDepotId());
}
if (!other.proudSkillList_.isEmpty()) {
if (proudSkillList_.isEmpty()) {
proudSkillList_ = other.proudSkillList_;
@@ -600,6 +600,12 @@ public final class ProudSkillChangeNotifyOuterClass {
}
onChanged();
}
if (other.getSkillDepotId() != 0) {
setSkillDepotId(other.getSkillDepotId());
}
if (other.getEntityId() != 0) {
setEntityId(other.getEntityId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -632,7 +638,7 @@ public final class ProudSkillChangeNotifyOuterClass {
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 11;</code>
* <code>uint64 avatar_guid = 13;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -640,7 +646,7 @@ public final class ProudSkillChangeNotifyOuterClass {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 11;</code>
* <code>uint64 avatar_guid = 13;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
@@ -651,7 +657,7 @@ public final class ProudSkillChangeNotifyOuterClass {
return this;
}
/**
* <code>uint64 avatar_guid = 11;</code>
* <code>uint64 avatar_guid = 13;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
@@ -661,68 +667,6 @@ public final class ProudSkillChangeNotifyOuterClass {
return this;
}
private int entityId_ ;
/**
* <code>uint32 entity_id = 4;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
/**
* <code>uint32 entity_id = 4;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
public Builder setEntityId(int value) {
entityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 entity_id = 4;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
entityId_ = 0;
onChanged();
return this;
}
private int skillDepotId_ ;
/**
* <code>uint32 skill_depot_id = 8;</code>
* @return The skillDepotId.
*/
@java.lang.Override
public int getSkillDepotId() {
return skillDepotId_;
}
/**
* <code>uint32 skill_depot_id = 8;</code>
* @param value The skillDepotId to set.
* @return This builder for chaining.
*/
public Builder setSkillDepotId(int value) {
skillDepotId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 skill_depot_id = 8;</code>
* @return This builder for chaining.
*/
public Builder clearSkillDepotId() {
skillDepotId_ = 0;
onChanged();
return this;
}
private com.google.protobuf.Internal.IntList proudSkillList_ = emptyIntList();
private void ensureProudSkillListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
@@ -731,7 +675,7 @@ public final class ProudSkillChangeNotifyOuterClass {
}
}
/**
* <code>repeated uint32 proud_skill_list = 12;</code>
* <code>repeated uint32 proud_skill_list = 5;</code>
* @return A list containing the proudSkillList.
*/
public java.util.List<java.lang.Integer>
@@ -740,14 +684,14 @@ public final class ProudSkillChangeNotifyOuterClass {
java.util.Collections.unmodifiableList(proudSkillList_) : proudSkillList_;
}
/**
* <code>repeated uint32 proud_skill_list = 12;</code>
* <code>repeated uint32 proud_skill_list = 5;</code>
* @return The count of proudSkillList.
*/
public int getProudSkillListCount() {
return proudSkillList_.size();
}
/**
* <code>repeated uint32 proud_skill_list = 12;</code>
* <code>repeated uint32 proud_skill_list = 5;</code>
* @param index The index of the element to return.
* @return The proudSkillList at the given index.
*/
@@ -755,7 +699,7 @@ public final class ProudSkillChangeNotifyOuterClass {
return proudSkillList_.getInt(index);
}
/**
* <code>repeated uint32 proud_skill_list = 12;</code>
* <code>repeated uint32 proud_skill_list = 5;</code>
* @param index The index to set the value at.
* @param value The proudSkillList to set.
* @return This builder for chaining.
@@ -768,7 +712,7 @@ public final class ProudSkillChangeNotifyOuterClass {
return this;
}
/**
* <code>repeated uint32 proud_skill_list = 12;</code>
* <code>repeated uint32 proud_skill_list = 5;</code>
* @param value The proudSkillList to add.
* @return This builder for chaining.
*/
@@ -779,7 +723,7 @@ public final class ProudSkillChangeNotifyOuterClass {
return this;
}
/**
* <code>repeated uint32 proud_skill_list = 12;</code>
* <code>repeated uint32 proud_skill_list = 5;</code>
* @param values The proudSkillList to add.
* @return This builder for chaining.
*/
@@ -792,7 +736,7 @@ public final class ProudSkillChangeNotifyOuterClass {
return this;
}
/**
* <code>repeated uint32 proud_skill_list = 12;</code>
* <code>repeated uint32 proud_skill_list = 5;</code>
* @return This builder for chaining.
*/
public Builder clearProudSkillList() {
@@ -801,6 +745,68 @@ public final class ProudSkillChangeNotifyOuterClass {
onChanged();
return this;
}
private int skillDepotId_ ;
/**
* <code>uint32 skill_depot_id = 12;</code>
* @return The skillDepotId.
*/
@java.lang.Override
public int getSkillDepotId() {
return skillDepotId_;
}
/**
* <code>uint32 skill_depot_id = 12;</code>
* @param value The skillDepotId to set.
* @return This builder for chaining.
*/
public Builder setSkillDepotId(int value) {
skillDepotId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 skill_depot_id = 12;</code>
* @return This builder for chaining.
*/
public Builder clearSkillDepotId() {
skillDepotId_ = 0;
onChanged();
return this;
}
private int entityId_ ;
/**
* <code>uint32 entity_id = 3;</code>
* @return The entityId.
*/
@java.lang.Override
public int getEntityId() {
return entityId_;
}
/**
* <code>uint32 entity_id = 3;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
public Builder setEntityId(int value) {
entityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 entity_id = 3;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
entityId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -869,9 +875,9 @@ public final class ProudSkillChangeNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\034ProudSkillChangeNotify.proto\"r\n\026ProudS" +
"killChangeNotify\022\023\n\013avatar_guid\030\013 \001(\004\022\021\n" +
"\tentity_id\030\004 \001(\r\022\026\n\016skill_depot_id\030\010 \001(\r" +
"\022\030\n\020proud_skill_list\030\014 \003(\rB\033\n\031emu.grassc" +
"killChangeNotify\022\023\n\013avatar_guid\030\r \001(\004\022\030\n" +
"\020proud_skill_list\030\005 \003(\r\022\026\n\016skill_depot_i" +
"d\030\014 \001(\r\022\021\n\tentity_id\030\003 \001(\rB\033\n\031emu.grassc" +
"utter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -883,7 +889,7 @@ public final class ProudSkillChangeNotifyOuterClass {
internal_static_ProudSkillChangeNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ProudSkillChangeNotify_descriptor,
new java.lang.String[] { "AvatarGuid", "EntityId", "SkillDepotId", "ProudSkillList", });
new java.lang.String[] { "AvatarGuid", "ProudSkillList", "SkillDepotId", "EntityId", });
}
// @@protoc_insertion_point(outer_class_scope)