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

Add support for v3.5.0 (#2090)

Browse Source 
* 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
2023-03-31 19:13:32 +00:00
committed by GitHub
Unverified
parent 922f7bca51
commit 516e5975e1
1383 changed files with 167226 additions and 586936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/PSPlayerApplyEnterMpRspOuterClass.java
+154 -277
View File
@@ -19,30 +19,35 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 param = 14;</code>
* @return The param.
* <code>string target_psn_id = 1;</code>
* @return The targetPsnId.
*/
int getParam();
java.lang.String getTargetPsnId();
/**
* <code>string target_psn_id = 1;</code>
* @return The bytes for targetPsnId.
*/
com.google.protobuf.ByteString
getTargetPsnIdBytes();
/**
* <code>int32 retcode = 2;</code>
* <code>int32 retcode = 8;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>string targetPsnId = 3;</code>
* @return The targetPsnId.
* <code>uint32 param = 3;</code>
* @return The param.
*/
java.lang.String getTargetPsnId();
/**
* <code>string targetPsnId = 3;</code>
* @return The bytes for targetPsnId.
*/
com.google.protobuf.ByteString
getTargetPsnIdBytes();
int getParam();
}
/**
* <pre>
* Name: EKGBIBIKFPI
* CmdId: 1802
* </pre>
*
* Protobuf type {@code PSPlayerApplyEnterMpRsp}
*/
public static final class PSPlayerApplyEnterMpRsp extends
@@ -88,22 +93,22 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
case 0:
done = true;
break;
case 16: {
retcode_ = input.readInt32();
break;
}
case 26: {
case 10: {
java.lang.String s = input.readStringRequireUtf8();
targetPsnId_ = s;
break;
}
case 112: {
case 24: {
param_ = input.readUInt32();
break;
}
case 64: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -136,163 +141,10 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
emu.grasscutter.net.proto.PSPlayerApplyEnterMpRspOuterClass.PSPlayerApplyEnterMpRsp.class, emu.grasscutter.net.proto.PSPlayerApplyEnterMpRspOuterClass.PSPlayerApplyEnterMpRsp.Builder.class);
}
/**
* Protobuf enum {@code PSPlayerApplyEnterMpRsp.OPABIFINKIE}
*/
public enum OPABIFINKIE
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1814;</code>
*/
PEPPOHPHJOJ(1, 1814),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final OPABIFINKIE DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1814;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1814;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final int DCDNILFDFLB_VALUE = 0;
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
public static final int NNBKOLMPOEA_VALUE = 1;
public final int getNumber() {
if (index == -1) {
throw new java.lang.IllegalArgumentException(
"Can't get the number of an unknown enum value.");
}
return value;
}
/**
* @param value The numeric wire value of the corresponding enum entry.
* @return The enum associated with the given numeric wire value.
* @deprecated Use {@link #forNumber(int)} instead.
*/
@java.lang.Deprecated
public static OPABIFINKIE valueOf(int value) {
return forNumber(value);
}
/**
* @param value The numeric wire value of the corresponding enum entry.
* @return The enum associated with the given numeric wire value.
*/
public static OPABIFINKIE forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1814: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<OPABIFINKIE>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
OPABIFINKIE> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<OPABIFINKIE>() {
public OPABIFINKIE findValueByNumber(int number) {
return OPABIFINKIE.forNumber(number);
}
};
public final com.google.protobuf.Descriptors.EnumValueDescriptor
getValueDescriptor() {
if (index == -1) {
throw new java.lang.IllegalStateException(
"Can't get the descriptor of an unrecognized enum value.");
}
return getDescriptor().getValues().get(index);
}
public final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptorForType() {
return getDescriptor();
}
public static final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
return emu.grasscutter.net.proto.PSPlayerApplyEnterMpRspOuterClass.PSPlayerApplyEnterMpRsp.getDescriptor().getEnumTypes().get(0);
}
private static final OPABIFINKIE[] VALUES = getStaticValuesArray();
private static OPABIFINKIE[] getStaticValuesArray() {
return new OPABIFINKIE[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static OPABIFINKIE valueOf(
com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
throw new java.lang.IllegalArgumentException(
"EnumValueDescriptor is not for this type.");
}
if (desc.getIndex() == -1) {
return UNRECOGNIZED;
}
return VALUES[desc.getIndex()];
}
private final int index;
private final int value;
private OPABIFINKIE(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:PSPlayerApplyEnterMpRsp.OPABIFINKIE)
}
public static final int PARAM_FIELD_NUMBER = 14;
private int param_;
/**
* <code>uint32 param = 14;</code>
* @return The param.
*/
@java.lang.Override
public int getParam() {
return param_;
}
public static final int RETCODE_FIELD_NUMBER = 2;
private int retcode_;
/**
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int TARGETPSNID_FIELD_NUMBER = 3;
public static final int TARGET_PSN_ID_FIELD_NUMBER = 1;
private volatile java.lang.Object targetPsnId_;
/**
* <code>string targetPsnId = 3;</code>
* <code>string target_psn_id = 1;</code>
* @return The targetPsnId.
*/
@java.lang.Override
@@ -309,7 +161,7 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
}
}
/**
* <code>string targetPsnId = 3;</code>
* <code>string target_psn_id = 1;</code>
* @return The bytes for targetPsnId.
*/
@java.lang.Override
@@ -327,6 +179,28 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
}
}
public static final int RETCODE_FIELD_NUMBER = 8;
private int retcode_;
/**
* <code>int32 retcode = 8;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int PARAM_FIELD_NUMBER = 3;
private int param_;
/**
* <code>uint32 param = 3;</code>
* @return The param.
*/
@java.lang.Override
public int getParam() {
return param_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -341,14 +215,14 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(2, retcode_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(targetPsnId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, targetPsnId_);
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, targetPsnId_);
}
if (param_ != 0) {
output.writeUInt32(14, param_);
output.writeUInt32(3, param_);
}
if (retcode_ != 0) {
output.writeInt32(8, retcode_);
}
unknownFields.writeTo(output);
}
@@ -359,16 +233,16 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
if (size != -1) return size;
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(2, retcode_);
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(targetPsnId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, targetPsnId_);
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, targetPsnId_);
}
if (param_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, param_);
.computeUInt32Size(3, param_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(8, retcode_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -385,12 +259,12 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
}
emu.grasscutter.net.proto.PSPlayerApplyEnterMpRspOuterClass.PSPlayerApplyEnterMpRsp other = (emu.grasscutter.net.proto.PSPlayerApplyEnterMpRspOuterClass.PSPlayerApplyEnterMpRsp) obj;
if (getParam()
!= other.getParam()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (!getTargetPsnId()
.equals(other.getTargetPsnId())) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (getParam()
!= other.getParam()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -402,12 +276,12 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + PARAM_FIELD_NUMBER;
hash = (53 * hash) + getParam();
hash = (37 * hash) + TARGET_PSN_ID_FIELD_NUMBER;
hash = (53 * hash) + getTargetPsnId().hashCode();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + TARGETPSNID_FIELD_NUMBER;
hash = (53 * hash) + getTargetPsnId().hashCode();
hash = (37 * hash) + PARAM_FIELD_NUMBER;
hash = (53 * hash) + getParam();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -504,6 +378,11 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
return builder;
}
/**
* <pre>
* Name: EKGBIBIKFPI
* CmdId: 1802
* </pre>
*
* Protobuf type {@code PSPlayerApplyEnterMpRsp}
*/
public static final class Builder extends
@@ -541,11 +420,11 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
param_ = 0;
targetPsnId_ = "";
retcode_ = 0;
targetPsnId_ = "";
param_ = 0;
return this;
}
@@ -573,9 +452,9 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.PSPlayerApplyEnterMpRspOuterClass.PSPlayerApplyEnterMpRsp buildPartial() {
emu.grasscutter.net.proto.PSPlayerApplyEnterMpRspOuterClass.PSPlayerApplyEnterMpRsp result = new emu.grasscutter.net.proto.PSPlayerApplyEnterMpRspOuterClass.PSPlayerApplyEnterMpRsp(this);
result.param_ = param_;
result.retcode_ = retcode_;
result.targetPsnId_ = targetPsnId_;
result.retcode_ = retcode_;
result.param_ = param_;
onBuilt();
return result;
}
@@ -624,15 +503,15 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.PSPlayerApplyEnterMpRspOuterClass.PSPlayerApplyEnterMpRsp other) {
if (other == emu.grasscutter.net.proto.PSPlayerApplyEnterMpRspOuterClass.PSPlayerApplyEnterMpRsp.getDefaultInstance()) return this;
if (other.getParam() != 0) {
setParam(other.getParam());
if (!other.getTargetPsnId().isEmpty()) {
targetPsnId_ = other.targetPsnId_;
onChanged();
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (!other.getTargetPsnId().isEmpty()) {
targetPsnId_ = other.targetPsnId_;
onChanged();
if (other.getParam() != 0) {
setParam(other.getParam());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -663,71 +542,9 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
return this;
}
private int param_ ;
/**
* <code>uint32 param = 14;</code>
* @return The param.
*/
@java.lang.Override
public int getParam() {
return param_;
}
/**
* <code>uint32 param = 14;</code>
* @param value The param to set.
* @return This builder for chaining.
*/
public Builder setParam(int value) {
param_ = value;
onChanged();
return this;
}
/**
* <code>uint32 param = 14;</code>
* @return This builder for chaining.
*/
public Builder clearParam() {
param_ = 0;
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 2;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 2;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private java.lang.Object targetPsnId_ = "";
/**
* <code>string targetPsnId = 3;</code>
* <code>string target_psn_id = 1;</code>
* @return The targetPsnId.
*/
public java.lang.String getTargetPsnId() {
@@ -743,7 +560,7 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
}
}
/**
* <code>string targetPsnId = 3;</code>
* <code>string target_psn_id = 1;</code>
* @return The bytes for targetPsnId.
*/
public com.google.protobuf.ByteString
@@ -760,7 +577,7 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
}
}
/**
* <code>string targetPsnId = 3;</code>
* <code>string target_psn_id = 1;</code>
* @param value The targetPsnId to set.
* @return This builder for chaining.
*/
@@ -775,7 +592,7 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
return this;
}
/**
* <code>string targetPsnId = 3;</code>
* <code>string target_psn_id = 1;</code>
* @return This builder for chaining.
*/
public Builder clearTargetPsnId() {
@@ -785,7 +602,7 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
return this;
}
/**
* <code>string targetPsnId = 3;</code>
* <code>string target_psn_id = 1;</code>
* @param value The bytes for targetPsnId to set.
* @return This builder for chaining.
*/
@@ -800,6 +617,68 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 8;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 8;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 8;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private int param_ ;
/**
* <code>uint32 param = 3;</code>
* @return The param.
*/
@java.lang.Override
public int getParam() {
return param_;
}
/**
* <code>uint32 param = 3;</code>
* @param value The param to set.
* @return This builder for chaining.
*/
public Builder setParam(int value) {
param_ = value;
onChanged();
return this;
}
/**
* <code>uint32 param = 3;</code>
* @return This builder for chaining.
*/
public Builder clearParam() {
param_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -867,11 +746,9 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\035PSPlayerApplyEnterMpRsp.proto\"\237\001\n\027PSPl" +
"ayerApplyEnterMpRsp\022\r\n\005param\030\016 \001(\r\022\017\n\007re" +
"tcode\030\002 \001(\005\022\023\n\013targetPsnId\030\003 \001(\t\"O\n\013OPAB" +
"IFINKIE\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\226\016\022\017\n\013D" +
"CDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu" +
"\n\035PSPlayerApplyEnterMpRsp.proto\"P\n\027PSPla" +
"yerApplyEnterMpRsp\022\025\n\rtarget_psn_id\030\001 \001(" +
"\t\022\017\n\007retcode\030\010 \001(\005\022\r\n\005param\030\003 \001(\rB\033\n\031emu" +
".grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -883,7 +760,7 @@ public final class PSPlayerApplyEnterMpRspOuterClass {
internal_static_PSPlayerApplyEnterMpRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PSPlayerApplyEnterMpRsp_descriptor,
new java.lang.String[] { "Param", "Retcode", "TargetPsnId", });
new java.lang.String[] { "TargetPsnId", "Retcode", "Param", });
}
// @@protoc_insertion_point(outer_class_scope)