mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-24 13:59:54 +08:00
Add support for v3.5.0 (#2090)
* Fix Dvalin battle See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25. This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence. Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com> * Update protos * 3.4 protos * Fix Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended. * Change from false to true Per what smileoflove has been told on Discord * 3.5 * Remove the Dvalin crap from this PR Git is so confusing * Update version * Apply README changes from `origin/development` * Remove unnecessary debugging information --------- Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com> Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
This commit is contained in:
Colleiflower
committed by
GitHub
Unverified
GitHub
parent
922f7bca51
commit
516e5975e1
@@ -19,35 +19,35 @@ public final class PrivateChatReqOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 targetUid = 11;</code>
|
||||
* <code>uint32 target_uid = 13;</code>
|
||||
* @return The targetUid.
|
||||
*/
|
||||
int getTargetUid();
|
||||
|
||||
/**
|
||||
* <code>string text = 15;</code>
|
||||
* <code>string text = 14;</code>
|
||||
* @return Whether the text field is set.
|
||||
*/
|
||||
boolean hasText();
|
||||
/**
|
||||
* <code>string text = 15;</code>
|
||||
* <code>string text = 14;</code>
|
||||
* @return The text.
|
||||
*/
|
||||
java.lang.String getText();
|
||||
/**
|
||||
* <code>string text = 15;</code>
|
||||
* <code>string text = 14;</code>
|
||||
* @return The bytes for text.
|
||||
*/
|
||||
com.google.protobuf.ByteString
|
||||
getTextBytes();
|
||||
|
||||
/**
|
||||
* <code>uint32 icon = 9;</code>
|
||||
* <code>uint32 icon = 8;</code>
|
||||
* @return Whether the icon field is set.
|
||||
*/
|
||||
boolean hasIcon();
|
||||
/**
|
||||
* <code>uint32 icon = 9;</code>
|
||||
* <code>uint32 icon = 8;</code>
|
||||
* @return The icon.
|
||||
*/
|
||||
int getIcon();
|
||||
@@ -56,14 +56,8 @@ public final class PrivateChatReqOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
*enum MFGNPEHDMAI {
|
||||
*option allow_alias = true;
|
||||
*NONE = 0;
|
||||
*PEPPOHPHJOJ = 4955;
|
||||
*DCDNILFDFLB = 0;
|
||||
*NNBKOLMPOEA = 1;
|
||||
*EAJIABGAOCI = 1;
|
||||
*}
|
||||
* Name: OJLJEEAEION
|
||||
* CmdId: 5017
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code PrivateChatReq}
|
||||
@@ -110,19 +104,19 @@ public final class PrivateChatReqOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 72: {
|
||||
contentCase_ = 9;
|
||||
case 64: {
|
||||
contentCase_ = 8;
|
||||
content_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 88: {
|
||||
case 104: {
|
||||
|
||||
targetUid_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 122: {
|
||||
case 114: {
|
||||
java.lang.String s = input.readStringRequireUtf8();
|
||||
contentCase_ = 15;
|
||||
contentCase_ = 14;
|
||||
content_ = s;
|
||||
break;
|
||||
}
|
||||
@@ -163,8 +157,8 @@ public final class PrivateChatReqOuterClass {
|
||||
public enum ContentCase
|
||||
implements com.google.protobuf.Internal.EnumLite,
|
||||
com.google.protobuf.AbstractMessage.InternalOneOfEnum {
|
||||
TEXT(15),
|
||||
ICON(9),
|
||||
TEXT(14),
|
||||
ICON(8),
|
||||
CONTENT_NOT_SET(0);
|
||||
private final int value;
|
||||
private ContentCase(int value) {
|
||||
@@ -182,8 +176,8 @@ public final class PrivateChatReqOuterClass {
|
||||
|
||||
public static ContentCase forNumber(int value) {
|
||||
switch (value) {
|
||||
case 15: return TEXT;
|
||||
case 9: return ICON;
|
||||
case 14: return TEXT;
|
||||
case 8: return ICON;
|
||||
case 0: return CONTENT_NOT_SET;
|
||||
default: return null;
|
||||
}
|
||||
@@ -199,10 +193,10 @@ public final class PrivateChatReqOuterClass {
|
||||
contentCase_);
|
||||
}
|
||||
|
||||
public static final int TARGETUID_FIELD_NUMBER = 11;
|
||||
public static final int TARGET_UID_FIELD_NUMBER = 13;
|
||||
private int targetUid_;
|
||||
/**
|
||||
* <code>uint32 targetUid = 11;</code>
|
||||
* <code>uint32 target_uid = 13;</code>
|
||||
* @return The targetUid.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -210,21 +204,21 @@ public final class PrivateChatReqOuterClass {
|
||||
return targetUid_;
|
||||
}
|
||||
|
||||
public static final int TEXT_FIELD_NUMBER = 15;
|
||||
public static final int TEXT_FIELD_NUMBER = 14;
|
||||
/**
|
||||
* <code>string text = 15;</code>
|
||||
* <code>string text = 14;</code>
|
||||
* @return Whether the text field is set.
|
||||
*/
|
||||
public boolean hasText() {
|
||||
return contentCase_ == 15;
|
||||
return contentCase_ == 14;
|
||||
}
|
||||
/**
|
||||
* <code>string text = 15;</code>
|
||||
* <code>string text = 14;</code>
|
||||
* @return The text.
|
||||
*/
|
||||
public java.lang.String getText() {
|
||||
java.lang.Object ref = "";
|
||||
if (contentCase_ == 15) {
|
||||
if (contentCase_ == 14) {
|
||||
ref = content_;
|
||||
}
|
||||
if (ref instanceof java.lang.String) {
|
||||
@@ -233,27 +227,27 @@ public final class PrivateChatReqOuterClass {
|
||||
com.google.protobuf.ByteString bs =
|
||||
(com.google.protobuf.ByteString) ref;
|
||||
java.lang.String s = bs.toStringUtf8();
|
||||
if (contentCase_ == 15) {
|
||||
if (contentCase_ == 14) {
|
||||
content_ = s;
|
||||
}
|
||||
return s;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>string text = 15;</code>
|
||||
* <code>string text = 14;</code>
|
||||
* @return The bytes for text.
|
||||
*/
|
||||
public com.google.protobuf.ByteString
|
||||
getTextBytes() {
|
||||
java.lang.Object ref = "";
|
||||
if (contentCase_ == 15) {
|
||||
if (contentCase_ == 14) {
|
||||
ref = content_;
|
||||
}
|
||||
if (ref instanceof java.lang.String) {
|
||||
com.google.protobuf.ByteString b =
|
||||
com.google.protobuf.ByteString.copyFromUtf8(
|
||||
(java.lang.String) ref);
|
||||
if (contentCase_ == 15) {
|
||||
if (contentCase_ == 14) {
|
||||
content_ = b;
|
||||
}
|
||||
return b;
|
||||
@@ -262,22 +256,22 @@ public final class PrivateChatReqOuterClass {
|
||||
}
|
||||
}
|
||||
|
||||
public static final int ICON_FIELD_NUMBER = 9;
|
||||
public static final int ICON_FIELD_NUMBER = 8;
|
||||
/**
|
||||
* <code>uint32 icon = 9;</code>
|
||||
* <code>uint32 icon = 8;</code>
|
||||
* @return Whether the icon field is set.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean hasIcon() {
|
||||
return contentCase_ == 9;
|
||||
return contentCase_ == 8;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 icon = 9;</code>
|
||||
* <code>uint32 icon = 8;</code>
|
||||
* @return The icon.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public int getIcon() {
|
||||
if (contentCase_ == 9) {
|
||||
if (contentCase_ == 8) {
|
||||
return (java.lang.Integer) content_;
|
||||
}
|
||||
return 0;
|
||||
@@ -297,15 +291,15 @@ public final class PrivateChatReqOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (contentCase_ == 9) {
|
||||
if (contentCase_ == 8) {
|
||||
output.writeUInt32(
|
||||
9, (int)((java.lang.Integer) content_));
|
||||
8, (int)((java.lang.Integer) content_));
|
||||
}
|
||||
if (targetUid_ != 0) {
|
||||
output.writeUInt32(11, targetUid_);
|
||||
output.writeUInt32(13, targetUid_);
|
||||
}
|
||||
if (contentCase_ == 15) {
|
||||
com.google.protobuf.GeneratedMessageV3.writeString(output, 15, content_);
|
||||
if (contentCase_ == 14) {
|
||||
com.google.protobuf.GeneratedMessageV3.writeString(output, 14, content_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -316,17 +310,17 @@ public final class PrivateChatReqOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (contentCase_ == 9) {
|
||||
if (contentCase_ == 8) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(
|
||||
9, (int)((java.lang.Integer) content_));
|
||||
8, (int)((java.lang.Integer) content_));
|
||||
}
|
||||
if (targetUid_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(11, targetUid_);
|
||||
.computeUInt32Size(13, targetUid_);
|
||||
}
|
||||
if (contentCase_ == 15) {
|
||||
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, content_);
|
||||
if (contentCase_ == 14) {
|
||||
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, content_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -347,11 +341,11 @@ public final class PrivateChatReqOuterClass {
|
||||
!= other.getTargetUid()) return false;
|
||||
if (!getContentCase().equals(other.getContentCase())) return false;
|
||||
switch (contentCase_) {
|
||||
case 15:
|
||||
case 14:
|
||||
if (!getText()
|
||||
.equals(other.getText())) return false;
|
||||
break;
|
||||
case 9:
|
||||
case 8:
|
||||
if (getIcon()
|
||||
!= other.getIcon()) return false;
|
||||
break;
|
||||
@@ -369,14 +363,14 @@ public final class PrivateChatReqOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + TARGETUID_FIELD_NUMBER;
|
||||
hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getTargetUid();
|
||||
switch (contentCase_) {
|
||||
case 15:
|
||||
case 14:
|
||||
hash = (37 * hash) + TEXT_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getText().hashCode();
|
||||
break;
|
||||
case 9:
|
||||
case 8:
|
||||
hash = (37 * hash) + ICON_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getIcon();
|
||||
break;
|
||||
@@ -480,14 +474,8 @@ public final class PrivateChatReqOuterClass {
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
*enum MFGNPEHDMAI {
|
||||
*option allow_alias = true;
|
||||
*NONE = 0;
|
||||
*PEPPOHPHJOJ = 4955;
|
||||
*DCDNILFDFLB = 0;
|
||||
*NNBKOLMPOEA = 1;
|
||||
*EAJIABGAOCI = 1;
|
||||
*}
|
||||
* Name: OJLJEEAEION
|
||||
* CmdId: 5017
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code PrivateChatReq}
|
||||
@@ -558,10 +546,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_ == 15) {
|
||||
if (contentCase_ == 14) {
|
||||
result.content_ = content_;
|
||||
}
|
||||
if (contentCase_ == 9) {
|
||||
if (contentCase_ == 8) {
|
||||
result.content_ = content_;
|
||||
}
|
||||
result.contentCase_ = contentCase_;
|
||||
@@ -618,7 +606,7 @@ public final class PrivateChatReqOuterClass {
|
||||
}
|
||||
switch (other.getContentCase()) {
|
||||
case TEXT: {
|
||||
contentCase_ = 15;
|
||||
contentCase_ = 14;
|
||||
content_ = other.content_;
|
||||
onChanged();
|
||||
break;
|
||||
@@ -677,7 +665,7 @@ public final class PrivateChatReqOuterClass {
|
||||
|
||||
private int targetUid_ ;
|
||||
/**
|
||||
* <code>uint32 targetUid = 11;</code>
|
||||
* <code>uint32 target_uid = 13;</code>
|
||||
* @return The targetUid.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -685,7 +673,7 @@ public final class PrivateChatReqOuterClass {
|
||||
return targetUid_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 targetUid = 11;</code>
|
||||
* <code>uint32 target_uid = 13;</code>
|
||||
* @param value The targetUid to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -696,7 +684,7 @@ public final class PrivateChatReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 targetUid = 11;</code>
|
||||
* <code>uint32 target_uid = 13;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearTargetUid() {
|
||||
@@ -707,28 +695,28 @@ public final class PrivateChatReqOuterClass {
|
||||
}
|
||||
|
||||
/**
|
||||
* <code>string text = 15;</code>
|
||||
* <code>string text = 14;</code>
|
||||
* @return Whether the text field is set.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public boolean hasText() {
|
||||
return contentCase_ == 15;
|
||||
return contentCase_ == 14;
|
||||
}
|
||||
/**
|
||||
* <code>string text = 15;</code>
|
||||
* <code>string text = 14;</code>
|
||||
* @return The text.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public java.lang.String getText() {
|
||||
java.lang.Object ref = "";
|
||||
if (contentCase_ == 15) {
|
||||
if (contentCase_ == 14) {
|
||||
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_ == 15) {
|
||||
if (contentCase_ == 14) {
|
||||
content_ = s;
|
||||
}
|
||||
return s;
|
||||
@@ -737,21 +725,21 @@ public final class PrivateChatReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>string text = 15;</code>
|
||||
* <code>string text = 14;</code>
|
||||
* @return The bytes for text.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public com.google.protobuf.ByteString
|
||||
getTextBytes() {
|
||||
java.lang.Object ref = "";
|
||||
if (contentCase_ == 15) {
|
||||
if (contentCase_ == 14) {
|
||||
ref = content_;
|
||||
}
|
||||
if (ref instanceof String) {
|
||||
com.google.protobuf.ByteString b =
|
||||
com.google.protobuf.ByteString.copyFromUtf8(
|
||||
(java.lang.String) ref);
|
||||
if (contentCase_ == 15) {
|
||||
if (contentCase_ == 14) {
|
||||
content_ = b;
|
||||
}
|
||||
return b;
|
||||
@@ -760,7 +748,7 @@ public final class PrivateChatReqOuterClass {
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>string text = 15;</code>
|
||||
* <code>string text = 14;</code>
|
||||
* @param value The text to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -769,17 +757,17 @@ public final class PrivateChatReqOuterClass {
|
||||
if (value == null) {
|
||||
throw new NullPointerException();
|
||||
}
|
||||
contentCase_ = 15;
|
||||
contentCase_ = 14;
|
||||
content_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>string text = 15;</code>
|
||||
* <code>string text = 14;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearText() {
|
||||
if (contentCase_ == 15) {
|
||||
if (contentCase_ == 14) {
|
||||
contentCase_ = 0;
|
||||
content_ = null;
|
||||
onChanged();
|
||||
@@ -787,7 +775,7 @@ public final class PrivateChatReqOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>string text = 15;</code>
|
||||
* <code>string text = 14;</code>
|
||||
* @param value The bytes for text to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -797,46 +785,46 @@ public final class PrivateChatReqOuterClass {
|
||||
throw new NullPointerException();
|
||||
}
|
||||
checkByteStringIsUtf8(value);
|
||||
contentCase_ = 15;
|
||||
contentCase_ = 14;
|
||||
content_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* <code>uint32 icon = 9;</code>
|
||||
* <code>uint32 icon = 8;</code>
|
||||
* @return Whether the icon field is set.
|
||||
*/
|
||||
public boolean hasIcon() {
|
||||
return contentCase_ == 9;
|
||||
return contentCase_ == 8;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 icon = 9;</code>
|
||||
* <code>uint32 icon = 8;</code>
|
||||
* @return The icon.
|
||||
*/
|
||||
public int getIcon() {
|
||||
if (contentCase_ == 9) {
|
||||
if (contentCase_ == 8) {
|
||||
return (java.lang.Integer) content_;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 icon = 9;</code>
|
||||
* <code>uint32 icon = 8;</code>
|
||||
* @param value The icon to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setIcon(int value) {
|
||||
contentCase_ = 9;
|
||||
contentCase_ = 8;
|
||||
content_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 icon = 9;</code>
|
||||
* <code>uint32 icon = 8;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearIcon() {
|
||||
if (contentCase_ == 9) {
|
||||
if (contentCase_ == 8) {
|
||||
contentCase_ = 0;
|
||||
content_ = null;
|
||||
onChanged();
|
||||
@@ -910,10 +898,10 @@ public final class PrivateChatReqOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\024PrivateChatReq.proto\"N\n\016PrivateChatReq" +
|
||||
"\022\021\n\ttargetUid\030\013 \001(\r\022\016\n\004text\030\017 \001(\tH\000\022\016\n\004i" +
|
||||
"con\030\t \001(\rH\000B\t\n\007contentB\033\n\031emu.grasscutte" +
|
||||
"r.net.protob\006proto3"
|
||||
"\n\024PrivateChatReq.proto\"O\n\016PrivateChatReq" +
|
||||
"\022\022\n\ntarget_uid\030\r \001(\r\022\016\n\004text\030\016 \001(\tH\000\022\016\n\004" +
|
||||
"icon\030\010 \001(\rH\000B\t\n\007contentB\033\n\031emu.grasscutt" +
|
||||
"er.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
||||
Reference in New Issue
Block a user