Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 22:30:02 +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/SetUpLunchBoxWidgetRspOuterClass.java
+101 -224
View File
@@ -19,27 +19,32 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.LunchBoxData lunchBoxData = 15;</code>
* <code>int32 retcode = 13;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>.LunchBoxData lunch_box_data = 7;</code>
* @return Whether the lunchBoxData field is set.
*/
boolean hasLunchBoxData();
/**
* <code>.LunchBoxData lunchBoxData = 15;</code>
* <code>.LunchBoxData lunch_box_data = 7;</code>
* @return The lunchBoxData.
*/
emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData getLunchBoxData();
/**
* <code>.LunchBoxData lunchBoxData = 15;</code>
* <code>.LunchBoxData lunch_box_data = 7;</code>
*/
emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxDataOrBuilder getLunchBoxDataOrBuilder();
/**
* <code>int32 retcode = 3;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* Name: BHEMFHAADAI
* CmdId: 4289
* </pre>
*
* Protobuf type {@code SetUpLunchBoxWidgetRsp}
*/
public static final class SetUpLunchBoxWidgetRsp extends
@@ -84,12 +89,7 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
case 0:
done = true;
break;
case 24: {
retcode_ = input.readInt32();
break;
}
case 122: {
case 58: {
emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData.Builder subBuilder = null;
if (lunchBoxData_ != null) {
subBuilder = lunchBoxData_.toBuilder();
@@ -102,6 +102,11 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
break;
}
case 104: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -134,141 +139,21 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
emu.grasscutter.net.proto.SetUpLunchBoxWidgetRspOuterClass.SetUpLunchBoxWidgetRsp.class, emu.grasscutter.net.proto.SetUpLunchBoxWidgetRspOuterClass.SetUpLunchBoxWidgetRsp.Builder.class);
}
public static final int RETCODE_FIELD_NUMBER = 13;
private int retcode_;
/**
* Protobuf enum {@code SetUpLunchBoxWidgetRsp.MEJCKKOKEFL}
* <code>int32 retcode = 13;</code>
* @return The retcode.
*/
public enum MEJCKKOKEFL
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 4266;</code>
*/
PEPPOHPHJOJ(1, 4266),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final MEJCKKOKEFL DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 4266;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 4266;
/**
* <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 MEJCKKOKEFL 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 MEJCKKOKEFL forNumber(int value) {
switch (value) {
case 0: return NONE;
case 4266: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<MEJCKKOKEFL>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
MEJCKKOKEFL> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<MEJCKKOKEFL>() {
public MEJCKKOKEFL findValueByNumber(int number) {
return MEJCKKOKEFL.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.SetUpLunchBoxWidgetRspOuterClass.SetUpLunchBoxWidgetRsp.getDescriptor().getEnumTypes().get(0);
}
private static final MEJCKKOKEFL[] VALUES = getStaticValuesArray();
private static MEJCKKOKEFL[] getStaticValuesArray() {
return new MEJCKKOKEFL[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static MEJCKKOKEFL 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 MEJCKKOKEFL(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:SetUpLunchBoxWidgetRsp.MEJCKKOKEFL)
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int LUNCHBOXDATA_FIELD_NUMBER = 15;
public static final int LUNCH_BOX_DATA_FIELD_NUMBER = 7;
private emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData lunchBoxData_;
/**
* <code>.LunchBoxData lunchBoxData = 15;</code>
* <code>.LunchBoxData lunch_box_data = 7;</code>
* @return Whether the lunchBoxData field is set.
*/
@java.lang.Override
@@ -276,7 +161,7 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
return lunchBoxData_ != null;
}
/**
* <code>.LunchBoxData lunchBoxData = 15;</code>
* <code>.LunchBoxData lunch_box_data = 7;</code>
* @return The lunchBoxData.
*/
@java.lang.Override
@@ -284,24 +169,13 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
return lunchBoxData_ == null ? emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData.getDefaultInstance() : lunchBoxData_;
}
/**
* <code>.LunchBoxData lunchBoxData = 15;</code>
* <code>.LunchBoxData lunch_box_data = 7;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxDataOrBuilder getLunchBoxDataOrBuilder() {
return getLunchBoxData();
}
public static final int RETCODE_FIELD_NUMBER = 3;
private int retcode_;
/**
* <code>int32 retcode = 3;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -316,11 +190,11 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(3, retcode_);
}
if (lunchBoxData_ != null) {
output.writeMessage(15, getLunchBoxData());
output.writeMessage(7, getLunchBoxData());
}
if (retcode_ != 0) {
output.writeInt32(13, retcode_);
}
unknownFields.writeTo(output);
}
@@ -331,13 +205,13 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
if (size != -1) return size;
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(3, retcode_);
}
if (lunchBoxData_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(15, getLunchBoxData());
.computeMessageSize(7, getLunchBoxData());
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(13, retcode_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -354,13 +228,13 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
}
emu.grasscutter.net.proto.SetUpLunchBoxWidgetRspOuterClass.SetUpLunchBoxWidgetRsp other = (emu.grasscutter.net.proto.SetUpLunchBoxWidgetRspOuterClass.SetUpLunchBoxWidgetRsp) obj;
if (getRetcode()
!= other.getRetcode()) return false;
if (hasLunchBoxData() != other.hasLunchBoxData()) return false;
if (hasLunchBoxData()) {
if (!getLunchBoxData()
.equals(other.getLunchBoxData())) return false;
}
if (getRetcode()
!= other.getRetcode()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -372,12 +246,12 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (hasLunchBoxData()) {
hash = (37 * hash) + LUNCHBOXDATA_FIELD_NUMBER;
hash = (53 * hash) + getLunchBoxData().hashCode();
}
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
if (hasLunchBoxData()) {
hash = (37 * hash) + LUNCH_BOX_DATA_FIELD_NUMBER;
hash = (53 * hash) + getLunchBoxData().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -474,6 +348,11 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
return builder;
}
/**
* <pre>
* Name: BHEMFHAADAI
* CmdId: 4289
* </pre>
*
* Protobuf type {@code SetUpLunchBoxWidgetRsp}
*/
public static final class Builder extends
@@ -511,14 +390,14 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
retcode_ = 0;
if (lunchBoxDataBuilder_ == null) {
lunchBoxData_ = null;
} else {
lunchBoxData_ = null;
lunchBoxDataBuilder_ = null;
}
retcode_ = 0;
return this;
}
@@ -545,12 +424,12 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.SetUpLunchBoxWidgetRspOuterClass.SetUpLunchBoxWidgetRsp buildPartial() {
emu.grasscutter.net.proto.SetUpLunchBoxWidgetRspOuterClass.SetUpLunchBoxWidgetRsp result = new emu.grasscutter.net.proto.SetUpLunchBoxWidgetRspOuterClass.SetUpLunchBoxWidgetRsp(this);
result.retcode_ = retcode_;
if (lunchBoxDataBuilder_ == null) {
result.lunchBoxData_ = lunchBoxData_;
} else {
result.lunchBoxData_ = lunchBoxDataBuilder_.build();
}
result.retcode_ = retcode_;
onBuilt();
return result;
}
@@ -599,12 +478,12 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.SetUpLunchBoxWidgetRspOuterClass.SetUpLunchBoxWidgetRsp other) {
if (other == emu.grasscutter.net.proto.SetUpLunchBoxWidgetRspOuterClass.SetUpLunchBoxWidgetRsp.getDefaultInstance()) return this;
if (other.hasLunchBoxData()) {
mergeLunchBoxData(other.getLunchBoxData());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.hasLunchBoxData()) {
mergeLunchBoxData(other.getLunchBoxData());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -634,18 +513,49 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 13;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 13;</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 = 13;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData lunchBoxData_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData, emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData.Builder, emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxDataOrBuilder> lunchBoxDataBuilder_;
/**
* <code>.LunchBoxData lunchBoxData = 15;</code>
* <code>.LunchBoxData lunch_box_data = 7;</code>
* @return Whether the lunchBoxData field is set.
*/
public boolean hasLunchBoxData() {
return lunchBoxDataBuilder_ != null || lunchBoxData_ != null;
}
/**
* <code>.LunchBoxData lunchBoxData = 15;</code>
* <code>.LunchBoxData lunch_box_data = 7;</code>
* @return The lunchBoxData.
*/
public emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData getLunchBoxData() {
@@ -656,7 +566,7 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
}
}
/**
* <code>.LunchBoxData lunchBoxData = 15;</code>
* <code>.LunchBoxData lunch_box_data = 7;</code>
*/
public Builder setLunchBoxData(emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData value) {
if (lunchBoxDataBuilder_ == null) {
@@ -672,7 +582,7 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
return this;
}
/**
* <code>.LunchBoxData lunchBoxData = 15;</code>
* <code>.LunchBoxData lunch_box_data = 7;</code>
*/
public Builder setLunchBoxData(
emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData.Builder builderForValue) {
@@ -686,7 +596,7 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
return this;
}
/**
* <code>.LunchBoxData lunchBoxData = 15;</code>
* <code>.LunchBoxData lunch_box_data = 7;</code>
*/
public Builder mergeLunchBoxData(emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData value) {
if (lunchBoxDataBuilder_ == null) {
@@ -704,7 +614,7 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
return this;
}
/**
* <code>.LunchBoxData lunchBoxData = 15;</code>
* <code>.LunchBoxData lunch_box_data = 7;</code>
*/
public Builder clearLunchBoxData() {
if (lunchBoxDataBuilder_ == null) {
@@ -718,7 +628,7 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
return this;
}
/**
* <code>.LunchBoxData lunchBoxData = 15;</code>
* <code>.LunchBoxData lunch_box_data = 7;</code>
*/
public emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData.Builder getLunchBoxDataBuilder() {
@@ -726,7 +636,7 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
return getLunchBoxDataFieldBuilder().getBuilder();
}
/**
* <code>.LunchBoxData lunchBoxData = 15;</code>
* <code>.LunchBoxData lunch_box_data = 7;</code>
*/
public emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxDataOrBuilder getLunchBoxDataOrBuilder() {
if (lunchBoxDataBuilder_ != null) {
@@ -737,7 +647,7 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
}
}
/**
* <code>.LunchBoxData lunchBoxData = 15;</code>
* <code>.LunchBoxData lunch_box_data = 7;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData, emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxData.Builder, emu.grasscutter.net.proto.LunchBoxDataOuterClass.LunchBoxDataOrBuilder>
@@ -752,37 +662,6 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
}
return lunchBoxDataBuilder_;
}
private int retcode_ ;
/**
* <code>int32 retcode = 3;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 3;</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 = 3;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -851,11 +730,9 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\034SetUpLunchBoxWidgetRsp.proto\032\022LunchBox" +
"Data.proto\"\237\001\n\026SetUpLunchBoxWidgetRsp\022#\n" +
"\014lunchBoxData\030\017 \001(\0132\r.LunchBoxData\022\017\n\007re" +
"tcode\030\003 \001(\005\"O\n\013MEJCKKOKEFL\022\010\n\004NONE\020\000\022\020\n\013" +
"PEPPOHPHJOJ\020\252!\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKO" +
"LMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.net.prot" +
"Data.proto\"P\n\026SetUpLunchBoxWidgetRsp\022\017\n\007" +
"retcode\030\r \001(\005\022%\n\016lunch_box_data\030\007 \001(\0132\r." +
"LunchBoxDataB\033\n\031emu.grasscutter.net.prot" +
"ob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -868,7 +745,7 @@ public final class SetUpLunchBoxWidgetRspOuterClass {
internal_static_SetUpLunchBoxWidgetRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_SetUpLunchBoxWidgetRsp_descriptor,
new java.lang.String[] { "LunchBoxData", "Retcode", });
new java.lang.String[] { "Retcode", "LunchBoxData", });
emu.grasscutter.net.proto.LunchBoxDataOuterClass.getDescriptor();
}