Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-09 00:33:39 +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/AvatarUpgradeReqOuterClass.java
+139 -131
View File
@@ -19,29 +19,33 @@ public final class AvatarUpgradeReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 avatar_guid = 6;</code>
* @return The avatarGuid.
* <code>uint32 item_id = 12;</code>
* @return The itemId.
*/
long getAvatarGuid();
int getItemId();
/**
* <code>uint32 count = 2;</code>
* <code>uint32 count = 7;</code>
* @return The count.
*/
int getCount();
/**
* <code>uint32 item_id = 5;</code>
* @return The itemId.
* <code>uint64 avatar_guid = 1;</code>
* @return The avatarGuid.
*/
int getItemId();
long getAvatarGuid();
}
/**
* <pre>
* CmdId: 1770
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1653;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarUpgradeReq}
@@ -88,21 +92,21 @@ public final class AvatarUpgradeReqOuterClass {
case 0:
done = true;
break;
case 16: {
case 8: {
avatarGuid_ = input.readUInt64();
break;
}
case 56: {
count_ = input.readUInt32();
break;
}
case 40: {
case 96: {
itemId_ = input.readUInt32();
break;
}
case 48: {
avatarGuid_ = input.readUInt64();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -135,21 +139,21 @@ public final class AvatarUpgradeReqOuterClass {
emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq.class, emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq.Builder.class);
}
public static final int AVATAR_GUID_FIELD_NUMBER = 6;
private long avatarGuid_;
public static final int ITEM_ID_FIELD_NUMBER = 12;
private int itemId_;
/**
* <code>uint64 avatar_guid = 6;</code>
* @return The avatarGuid.
* <code>uint32 item_id = 12;</code>
* @return The itemId.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
public int getItemId() {
return itemId_;
}
public static final int COUNT_FIELD_NUMBER = 2;
public static final int COUNT_FIELD_NUMBER = 7;
private int count_;
/**
* <code>uint32 count = 2;</code>
* <code>uint32 count = 7;</code>
* @return The count.
*/
@java.lang.Override
@@ -157,15 +161,15 @@ public final class AvatarUpgradeReqOuterClass {
return count_;
}
public static final int ITEM_ID_FIELD_NUMBER = 5;
private int itemId_;
public static final int AVATAR_GUID_FIELD_NUMBER = 1;
private long avatarGuid_;
/**
* <code>uint32 item_id = 5;</code>
* @return The itemId.
* <code>uint64 avatar_guid = 1;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public int getItemId() {
return itemId_;
public long getAvatarGuid() {
return avatarGuid_;
}
private byte memoizedIsInitialized = -1;
@@ -182,14 +186,14 @@ public final class AvatarUpgradeReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (avatarGuid_ != 0L) {
output.writeUInt64(1, avatarGuid_);
}
if (count_ != 0) {
output.writeUInt32(2, count_);
output.writeUInt32(7, count_);
}
if (itemId_ != 0) {
output.writeUInt32(5, itemId_);
}
if (avatarGuid_ != 0L) {
output.writeUInt64(6, avatarGuid_);
output.writeUInt32(12, itemId_);
}
unknownFields.writeTo(output);
}
@@ -200,17 +204,17 @@ public final class AvatarUpgradeReqOuterClass {
if (size != -1) return size;
size = 0;
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(1, avatarGuid_);
}
if (count_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, count_);
.computeUInt32Size(7, count_);
}
if (itemId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, itemId_);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(6, avatarGuid_);
.computeUInt32Size(12, itemId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -227,12 +231,12 @@ public final class AvatarUpgradeReqOuterClass {
}
emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq other = (emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq) obj;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (getCount()
!= other.getCount()) return false;
if (getItemId()
!= other.getItemId()) return false;
if (getCount()
!= other.getCount()) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -244,13 +248,13 @@ public final class AvatarUpgradeReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ITEM_ID_FIELD_NUMBER;
hash = (53 * hash) + getItemId();
hash = (37 * hash) + COUNT_FIELD_NUMBER;
hash = (53 * hash) + getCount();
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (37 * hash) + COUNT_FIELD_NUMBER;
hash = (53 * hash) + getCount();
hash = (37 * hash) + ITEM_ID_FIELD_NUMBER;
hash = (53 * hash) + getItemId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -348,10 +352,14 @@ public final class AvatarUpgradeReqOuterClass {
}
/**
* <pre>
* CmdId: 1770
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 1653;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code AvatarUpgradeReq}
@@ -391,11 +399,11 @@ public final class AvatarUpgradeReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
avatarGuid_ = 0L;
itemId_ = 0;
count_ = 0;
itemId_ = 0;
avatarGuid_ = 0L;
return this;
}
@@ -423,9 +431,9 @@ public final class AvatarUpgradeReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq buildPartial() {
emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq result = new emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq(this);
result.avatarGuid_ = avatarGuid_;
result.count_ = count_;
result.itemId_ = itemId_;
result.count_ = count_;
result.avatarGuid_ = avatarGuid_;
onBuilt();
return result;
}
@@ -474,14 +482,14 @@ public final class AvatarUpgradeReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq other) {
if (other == emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq.getDefaultInstance()) return this;
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
if (other.getItemId() != 0) {
setItemId(other.getItemId());
}
if (other.getCount() != 0) {
setCount(other.getCount());
}
if (other.getItemId() != 0) {
setItemId(other.getItemId());
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -512,71 +520,9 @@ public final class AvatarUpgradeReqOuterClass {
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 6;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 6;</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 = 6;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
private int count_ ;
/**
* <code>uint32 count = 2;</code>
* @return The count.
*/
@java.lang.Override
public int getCount() {
return count_;
}
/**
* <code>uint32 count = 2;</code>
* @param value The count to set.
* @return This builder for chaining.
*/
public Builder setCount(int value) {
count_ = value;
onChanged();
return this;
}
/**
* <code>uint32 count = 2;</code>
* @return This builder for chaining.
*/
public Builder clearCount() {
count_ = 0;
onChanged();
return this;
}
private int itemId_ ;
/**
* <code>uint32 item_id = 5;</code>
* <code>uint32 item_id = 12;</code>
* @return The itemId.
*/
@java.lang.Override
@@ -584,7 +530,7 @@ public final class AvatarUpgradeReqOuterClass {
return itemId_;
}
/**
* <code>uint32 item_id = 5;</code>
* <code>uint32 item_id = 12;</code>
* @param value The itemId to set.
* @return This builder for chaining.
*/
@@ -595,7 +541,7 @@ public final class AvatarUpgradeReqOuterClass {
return this;
}
/**
* <code>uint32 item_id = 5;</code>
* <code>uint32 item_id = 12;</code>
* @return This builder for chaining.
*/
public Builder clearItemId() {
@@ -604,6 +550,68 @@ public final class AvatarUpgradeReqOuterClass {
onChanged();
return this;
}
private int count_ ;
/**
* <code>uint32 count = 7;</code>
* @return The count.
*/
@java.lang.Override
public int getCount() {
return count_;
}
/**
* <code>uint32 count = 7;</code>
* @param value The count to set.
* @return This builder for chaining.
*/
public Builder setCount(int value) {
count_ = value;
onChanged();
return this;
}
/**
* <code>uint32 count = 7;</code>
* @return This builder for chaining.
*/
public Builder clearCount() {
count_ = 0;
onChanged();
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 1;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 1;</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 = 1;</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,8 +680,8 @@ public final class AvatarUpgradeReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\026AvatarUpgradeReq.proto\"G\n\020AvatarUpgrad" +
"eReq\022\023\n\013avatar_guid\030\006 \001(\004\022\r\n\005count\030\002 \001(\r" +
"\022\017\n\007item_id\030\005 \001(\rB\033\n\031emu.grasscutter.net" +
"eReq\022\017\n\007item_id\030\014 \001(\r\022\r\n\005count\030\007 \001(\r\022\023\n\013" +
"avatar_guid\030\001 \001(\004B\033\n\031emu.grasscutter.net" +
".protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -685,7 +693,7 @@ public final class AvatarUpgradeReqOuterClass {
internal_static_AvatarUpgradeReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarUpgradeReq_descriptor,
new java.lang.String[] { "AvatarGuid", "Count", "ItemId", });
new java.lang.String[] { "ItemId", "Count", "AvatarGuid", });
}
// @@protoc_insertion_point(outer_class_scope)