Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-24 05:09: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/PrivateChatReqOuterClass.java
+99 -91
View File
@@ -19,35 +19,35 @@ public final class PrivateChatReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 target_uid = 7;</code>
* <code>uint32 target_uid = 5;</code>
* @return The targetUid.
*/
int getTargetUid();
/**
* <code>string text = 3;</code>
* <code>string text = 1;</code>
* @return Whether the text field is set.
*/
boolean hasText();
/**
* <code>string text = 3;</code>
* <code>string text = 1;</code>
* @return The text.
*/
java.lang.String getText();
/**
* <code>string text = 3;</code>
* <code>string text = 1;</code>
* @return The bytes for text.
*/
com.google.protobuf.ByteString
getTextBytes();
/**
* <code>uint32 icon = 4;</code>
* <code>uint32 icon = 13;</code>
* @return Whether the icon field is set.
*/
boolean hasIcon();
/**
* <code>uint32 icon = 4;</code>
* <code>uint32 icon = 13;</code>
* @return The icon.
*/
int getIcon();
@@ -56,10 +56,14 @@ public final class PrivateChatReqOuterClass {
}
/**
* <pre>
* CmdId: 5022
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 5029;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code PrivateChatReq}
@@ -106,22 +110,22 @@ public final class PrivateChatReqOuterClass {
case 0:
done = true;
break;
case 26: {
case 10: {
java.lang.String s = input.readStringRequireUtf8();
contentCase_ = 3;
contentCase_ = 1;
content_ = s;
break;
}
case 32: {
contentCase_ = 4;
content_ = input.readUInt32();
break;
}
case 56: {
case 40: {
targetUid_ = input.readUInt32();
break;
}
case 104: {
contentCase_ = 13;
content_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -159,8 +163,8 @@ public final class PrivateChatReqOuterClass {
public enum ContentCase
implements com.google.protobuf.Internal.EnumLite,
com.google.protobuf.AbstractMessage.InternalOneOfEnum {
TEXT(3),
ICON(4),
TEXT(1),
ICON(13),
CONTENT_NOT_SET(0);
private final int value;
private ContentCase(int value) {
@@ -178,8 +182,8 @@ public final class PrivateChatReqOuterClass {
public static ContentCase forNumber(int value) {
switch (value) {
case 3: return TEXT;
case 4: return ICON;
case 1: return TEXT;
case 13: return ICON;
case 0: return CONTENT_NOT_SET;
default: return null;
}
@@ -195,10 +199,10 @@ public final class PrivateChatReqOuterClass {
contentCase_);
}
public static final int TARGET_UID_FIELD_NUMBER = 7;
public static final int TARGET_UID_FIELD_NUMBER = 5;
private int targetUid_;
/**
* <code>uint32 target_uid = 7;</code>
* <code>uint32 target_uid = 5;</code>
* @return The targetUid.
*/
@java.lang.Override
@@ -206,21 +210,21 @@ public final class PrivateChatReqOuterClass {
return targetUid_;
}
public static final int TEXT_FIELD_NUMBER = 3;
public static final int TEXT_FIELD_NUMBER = 1;
/**
* <code>string text = 3;</code>
* <code>string text = 1;</code>
* @return Whether the text field is set.
*/
public boolean hasText() {
return contentCase_ == 3;
return contentCase_ == 1;
}
/**
* <code>string text = 3;</code>
* <code>string text = 1;</code>
* @return The text.
*/
public java.lang.String getText() {
java.lang.Object ref = "";
if (contentCase_ == 3) {
if (contentCase_ == 1) {
ref = content_;
}
if (ref instanceof java.lang.String) {
@@ -229,27 +233,27 @@ public final class PrivateChatReqOuterClass {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (contentCase_ == 3) {
if (contentCase_ == 1) {
content_ = s;
}
return s;
}
}
/**
* <code>string text = 3;</code>
* <code>string text = 1;</code>
* @return The bytes for text.
*/
public com.google.protobuf.ByteString
getTextBytes() {
java.lang.Object ref = "";
if (contentCase_ == 3) {
if (contentCase_ == 1) {
ref = content_;
}
if (ref instanceof java.lang.String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
if (contentCase_ == 3) {
if (contentCase_ == 1) {
content_ = b;
}
return b;
@@ -258,22 +262,22 @@ public final class PrivateChatReqOuterClass {
}
}
public static final int ICON_FIELD_NUMBER = 4;
public static final int ICON_FIELD_NUMBER = 13;
/**
* <code>uint32 icon = 4;</code>
* <code>uint32 icon = 13;</code>
* @return Whether the icon field is set.
*/
@java.lang.Override
public boolean hasIcon() {
return contentCase_ == 4;
return contentCase_ == 13;
}
/**
* <code>uint32 icon = 4;</code>
* <code>uint32 icon = 13;</code>
* @return The icon.
*/
@java.lang.Override
public int getIcon() {
if (contentCase_ == 4) {
if (contentCase_ == 13) {
return (java.lang.Integer) content_;
}
return 0;
@@ -293,15 +297,15 @@ public final class PrivateChatReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (contentCase_ == 3) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, content_);
}
if (contentCase_ == 4) {
output.writeUInt32(
4, (int)((java.lang.Integer) content_));
if (contentCase_ == 1) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, content_);
}
if (targetUid_ != 0) {
output.writeUInt32(7, targetUid_);
output.writeUInt32(5, targetUid_);
}
if (contentCase_ == 13) {
output.writeUInt32(
13, (int)((java.lang.Integer) content_));
}
unknownFields.writeTo(output);
}
@@ -312,17 +316,17 @@ public final class PrivateChatReqOuterClass {
if (size != -1) return size;
size = 0;
if (contentCase_ == 3) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, content_);
}
if (contentCase_ == 4) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(
4, (int)((java.lang.Integer) content_));
if (contentCase_ == 1) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, content_);
}
if (targetUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(7, targetUid_);
.computeUInt32Size(5, targetUid_);
}
if (contentCase_ == 13) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(
13, (int)((java.lang.Integer) content_));
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -343,11 +347,11 @@ public final class PrivateChatReqOuterClass {
!= other.getTargetUid()) return false;
if (!getContentCase().equals(other.getContentCase())) return false;
switch (contentCase_) {
case 3:
case 1:
if (!getText()
.equals(other.getText())) return false;
break;
case 4:
case 13:
if (getIcon()
!= other.getIcon()) return false;
break;
@@ -368,11 +372,11 @@ public final class PrivateChatReqOuterClass {
hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
hash = (53 * hash) + getTargetUid();
switch (contentCase_) {
case 3:
case 1:
hash = (37 * hash) + TEXT_FIELD_NUMBER;
hash = (53 * hash) + getText().hashCode();
break;
case 4:
case 13:
hash = (37 * hash) + ICON_FIELD_NUMBER;
hash = (53 * hash) + getIcon();
break;
@@ -476,10 +480,14 @@ public final class PrivateChatReqOuterClass {
}
/**
* <pre>
* CmdId: 5022
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 5029;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code PrivateChatReq}
@@ -550,10 +558,10 @@ public final class PrivateChatReqOuterClass {
public emu.grasscutter.net.proto.PrivateChatReqOuterClass.PrivateChatReq buildPartial() {
emu.grasscutter.net.proto.PrivateChatReqOuterClass.PrivateChatReq result = new emu.grasscutter.net.proto.PrivateChatReqOuterClass.PrivateChatReq(this);
result.targetUid_ = targetUid_;
if (contentCase_ == 3) {
if (contentCase_ == 1) {
result.content_ = content_;
}
if (contentCase_ == 4) {
if (contentCase_ == 13) {
result.content_ = content_;
}
result.contentCase_ = contentCase_;
@@ -610,7 +618,7 @@ public final class PrivateChatReqOuterClass {
}
switch (other.getContentCase()) {
case TEXT: {
contentCase_ = 3;
contentCase_ = 1;
content_ = other.content_;
onChanged();
break;
@@ -669,7 +677,7 @@ public final class PrivateChatReqOuterClass {
private int targetUid_ ;
/**
* <code>uint32 target_uid = 7;</code>
* <code>uint32 target_uid = 5;</code>
* @return The targetUid.
*/
@java.lang.Override
@@ -677,7 +685,7 @@ public final class PrivateChatReqOuterClass {
return targetUid_;
}
/**
* <code>uint32 target_uid = 7;</code>
* <code>uint32 target_uid = 5;</code>
* @param value The targetUid to set.
* @return This builder for chaining.
*/
@@ -688,7 +696,7 @@ public final class PrivateChatReqOuterClass {
return this;
}
/**
* <code>uint32 target_uid = 7;</code>
* <code>uint32 target_uid = 5;</code>
* @return This builder for chaining.
*/
public Builder clearTargetUid() {
@@ -699,28 +707,28 @@ public final class PrivateChatReqOuterClass {
}
/**
* <code>string text = 3;</code>
* <code>string text = 1;</code>
* @return Whether the text field is set.
*/
@java.lang.Override
public boolean hasText() {
return contentCase_ == 3;
return contentCase_ == 1;
}
/**
* <code>string text = 3;</code>
* <code>string text = 1;</code>
* @return The text.
*/
@java.lang.Override
public java.lang.String getText() {
java.lang.Object ref = "";
if (contentCase_ == 3) {
if (contentCase_ == 1) {
ref = content_;
}
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (contentCase_ == 3) {
if (contentCase_ == 1) {
content_ = s;
}
return s;
@@ -729,21 +737,21 @@ public final class PrivateChatReqOuterClass {
}
}
/**
* <code>string text = 3;</code>
* <code>string text = 1;</code>
* @return The bytes for text.
*/
@java.lang.Override
public com.google.protobuf.ByteString
getTextBytes() {
java.lang.Object ref = "";
if (contentCase_ == 3) {
if (contentCase_ == 1) {
ref = content_;
}
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
if (contentCase_ == 3) {
if (contentCase_ == 1) {
content_ = b;
}
return b;
@@ -752,7 +760,7 @@ public final class PrivateChatReqOuterClass {
}
}
/**
* <code>string text = 3;</code>
* <code>string text = 1;</code>
* @param value The text to set.
* @return This builder for chaining.
*/
@@ -761,17 +769,17 @@ public final class PrivateChatReqOuterClass {
if (value == null) {
throw new NullPointerException();
}
contentCase_ = 3;
contentCase_ = 1;
content_ = value;
onChanged();
return this;
}
/**
* <code>string text = 3;</code>
* <code>string text = 1;</code>
* @return This builder for chaining.
*/
public Builder clearText() {
if (contentCase_ == 3) {
if (contentCase_ == 1) {
contentCase_ = 0;
content_ = null;
onChanged();
@@ -779,7 +787,7 @@ public final class PrivateChatReqOuterClass {
return this;
}
/**
* <code>string text = 3;</code>
* <code>string text = 1;</code>
* @param value The bytes for text to set.
* @return This builder for chaining.
*/
@@ -789,46 +797,46 @@ public final class PrivateChatReqOuterClass {
throw new NullPointerException();
}
checkByteStringIsUtf8(value);
contentCase_ = 3;
contentCase_ = 1;
content_ = value;
onChanged();
return this;
}
/**
* <code>uint32 icon = 4;</code>
* <code>uint32 icon = 13;</code>
* @return Whether the icon field is set.
*/
public boolean hasIcon() {
return contentCase_ == 4;
return contentCase_ == 13;
}
/**
* <code>uint32 icon = 4;</code>
* <code>uint32 icon = 13;</code>
* @return The icon.
*/
public int getIcon() {
if (contentCase_ == 4) {
if (contentCase_ == 13) {
return (java.lang.Integer) content_;
}
return 0;
}
/**
* <code>uint32 icon = 4;</code>
* <code>uint32 icon = 13;</code>
* @param value The icon to set.
* @return This builder for chaining.
*/
public Builder setIcon(int value) {
contentCase_ = 4;
contentCase_ = 13;
content_ = value;
onChanged();
return this;
}
/**
* <code>uint32 icon = 4;</code>
* <code>uint32 icon = 13;</code>
* @return This builder for chaining.
*/
public Builder clearIcon() {
if (contentCase_ == 4) {
if (contentCase_ == 13) {
contentCase_ = 0;
content_ = null;
onChanged();
@@ -903,8 +911,8 @@ public final class PrivateChatReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\024PrivateChatReq.proto\"O\n\016PrivateChatReq" +
"\022\022\n\ntarget_uid\030\007 \001(\r\022\016\n\004text\030\003 \001(\tH\000\022\016\n\004" +
"icon\030\004 \001(\rH\000B\t\n\007contentB\033\n\031emu.grasscutt" +
"\022\022\n\ntarget_uid\030\005 \001(\r\022\016\n\004text\030\001 \001(\tH\000\022\016\n\004" +
"icon\030\r \001(\rH\000B\t\n\007contentB\033\n\031emu.grasscutt" +
"er.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor