Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 14:40:04 +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/BonusActivityInfoRspOuterClass.java
+65 -188
View File
@@ -19,36 +19,41 @@ public final class BonusActivityInfoRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
java.util.List<emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo>
getBonusActivityInfoListList();
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo getBonusActivityInfoList(int index);
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
int getBonusActivityInfoListCount();
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfoOrBuilder>
getBonusActivityInfoListOrBuilderList();
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfoOrBuilder getBonusActivityInfoListOrBuilder(
int index);
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* Name: IBIFLPDMIII
* CmdId: 2542
* </pre>
*
* Protobuf type {@code BonusActivityInfoRsp}
*/
public static final class BonusActivityInfoRsp extends
@@ -95,12 +100,7 @@ public final class BonusActivityInfoRspOuterClass {
case 0:
done = true;
break;
case 96: {
retcode_ = input.readInt32();
break;
}
case 106: {
case 42: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
bonusActivityInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo>();
mutable_bitField0_ |= 0x00000001;
@@ -109,6 +109,11 @@ public final class BonusActivityInfoRspOuterClass {
input.readMessage(emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo.parser(), extensionRegistry));
break;
}
case 72: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -144,148 +149,17 @@ public final class BonusActivityInfoRspOuterClass {
emu.grasscutter.net.proto.BonusActivityInfoRspOuterClass.BonusActivityInfoRsp.class, emu.grasscutter.net.proto.BonusActivityInfoRspOuterClass.BonusActivityInfoRsp.Builder.class);
}
/**
* Protobuf enum {@code BonusActivityInfoRsp.JAGOBCLBFBH}
*/
public enum JAGOBCLBFBH
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 2516;</code>
*/
PEPPOHPHJOJ(1, 2516),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final JAGOBCLBFBH DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 2516;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 2516;
/**
* <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 JAGOBCLBFBH 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 JAGOBCLBFBH forNumber(int value) {
switch (value) {
case 0: return NONE;
case 2516: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<JAGOBCLBFBH>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
JAGOBCLBFBH> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<JAGOBCLBFBH>() {
public JAGOBCLBFBH findValueByNumber(int number) {
return JAGOBCLBFBH.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.BonusActivityInfoRspOuterClass.BonusActivityInfoRsp.getDescriptor().getEnumTypes().get(0);
}
private static final JAGOBCLBFBH[] VALUES = getStaticValuesArray();
private static JAGOBCLBFBH[] getStaticValuesArray() {
return new JAGOBCLBFBH[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static JAGOBCLBFBH 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 JAGOBCLBFBH(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:BonusActivityInfoRsp.JAGOBCLBFBH)
}
public static final int BONUSACTIVITYINFOLIST_FIELD_NUMBER = 13;
public static final int BONUS_ACTIVITY_INFO_LIST_FIELD_NUMBER = 5;
private java.util.List<emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo> bonusActivityInfoList_;
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo> getBonusActivityInfoListList() {
return bonusActivityInfoList_;
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfoOrBuilder>
@@ -293,21 +167,21 @@ public final class BonusActivityInfoRspOuterClass {
return bonusActivityInfoList_;
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
@java.lang.Override
public int getBonusActivityInfoListCount() {
return bonusActivityInfoList_.size();
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo getBonusActivityInfoList(int index) {
return bonusActivityInfoList_.get(index);
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfoOrBuilder getBonusActivityInfoListOrBuilder(
@@ -315,10 +189,10 @@ public final class BonusActivityInfoRspOuterClass {
return bonusActivityInfoList_.get(index);
}
public static final int RETCODE_FIELD_NUMBER = 12;
public static final int RETCODE_FIELD_NUMBER = 9;
private int retcode_;
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -340,11 +214,11 @@ public final class BonusActivityInfoRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(12, retcode_);
}
for (int i = 0; i < bonusActivityInfoList_.size(); i++) {
output.writeMessage(13, bonusActivityInfoList_.get(i));
output.writeMessage(5, bonusActivityInfoList_.get(i));
}
if (retcode_ != 0) {
output.writeInt32(9, retcode_);
}
unknownFields.writeTo(output);
}
@@ -355,13 +229,13 @@ public final class BonusActivityInfoRspOuterClass {
if (size != -1) return size;
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(12, retcode_);
}
for (int i = 0; i < bonusActivityInfoList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(13, bonusActivityInfoList_.get(i));
.computeMessageSize(5, bonusActivityInfoList_.get(i));
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(9, retcode_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -394,7 +268,7 @@ public final class BonusActivityInfoRspOuterClass {
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (getBonusActivityInfoListCount() > 0) {
hash = (37 * hash) + BONUSACTIVITYINFOLIST_FIELD_NUMBER;
hash = (37 * hash) + BONUS_ACTIVITY_INFO_LIST_FIELD_NUMBER;
hash = (53 * hash) + getBonusActivityInfoListList().hashCode();
}
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
@@ -495,6 +369,11 @@ public final class BonusActivityInfoRspOuterClass {
return builder;
}
/**
* <pre>
* Name: IBIFLPDMIII
* CmdId: 2542
* </pre>
*
* Protobuf type {@code BonusActivityInfoRsp}
*/
public static final class Builder extends
@@ -698,7 +577,7 @@ public final class BonusActivityInfoRspOuterClass {
emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo, emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo.Builder, emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfoOrBuilder> bonusActivityInfoListBuilder_;
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public java.util.List<emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo> getBonusActivityInfoListList() {
if (bonusActivityInfoListBuilder_ == null) {
@@ -708,7 +587,7 @@ public final class BonusActivityInfoRspOuterClass {
}
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public int getBonusActivityInfoListCount() {
if (bonusActivityInfoListBuilder_ == null) {
@@ -718,7 +597,7 @@ public final class BonusActivityInfoRspOuterClass {
}
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo getBonusActivityInfoList(int index) {
if (bonusActivityInfoListBuilder_ == null) {
@@ -728,7 +607,7 @@ public final class BonusActivityInfoRspOuterClass {
}
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public Builder setBonusActivityInfoList(
int index, emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo value) {
@@ -745,7 +624,7 @@ public final class BonusActivityInfoRspOuterClass {
return this;
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public Builder setBonusActivityInfoList(
int index, emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo.Builder builderForValue) {
@@ -759,7 +638,7 @@ public final class BonusActivityInfoRspOuterClass {
return this;
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public Builder addBonusActivityInfoList(emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo value) {
if (bonusActivityInfoListBuilder_ == null) {
@@ -775,7 +654,7 @@ public final class BonusActivityInfoRspOuterClass {
return this;
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public Builder addBonusActivityInfoList(
int index, emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo value) {
@@ -792,7 +671,7 @@ public final class BonusActivityInfoRspOuterClass {
return this;
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public Builder addBonusActivityInfoList(
emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo.Builder builderForValue) {
@@ -806,7 +685,7 @@ public final class BonusActivityInfoRspOuterClass {
return this;
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public Builder addBonusActivityInfoList(
int index, emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo.Builder builderForValue) {
@@ -820,7 +699,7 @@ public final class BonusActivityInfoRspOuterClass {
return this;
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public Builder addAllBonusActivityInfoList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo> values) {
@@ -835,7 +714,7 @@ public final class BonusActivityInfoRspOuterClass {
return this;
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public Builder clearBonusActivityInfoList() {
if (bonusActivityInfoListBuilder_ == null) {
@@ -848,7 +727,7 @@ public final class BonusActivityInfoRspOuterClass {
return this;
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public Builder removeBonusActivityInfoList(int index) {
if (bonusActivityInfoListBuilder_ == null) {
@@ -861,14 +740,14 @@ public final class BonusActivityInfoRspOuterClass {
return this;
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo.Builder getBonusActivityInfoListBuilder(
int index) {
return getBonusActivityInfoListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfoOrBuilder getBonusActivityInfoListOrBuilder(
int index) {
@@ -878,7 +757,7 @@ public final class BonusActivityInfoRspOuterClass {
}
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfoOrBuilder>
getBonusActivityInfoListOrBuilderList() {
@@ -889,14 +768,14 @@ public final class BonusActivityInfoRspOuterClass {
}
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo.Builder addBonusActivityInfoListBuilder() {
return getBonusActivityInfoListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo.getDefaultInstance());
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo.Builder addBonusActivityInfoListBuilder(
int index) {
@@ -904,7 +783,7 @@ public final class BonusActivityInfoRspOuterClass {
index, emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo.getDefaultInstance());
}
/**
* <code>repeated .BonusActivityInfo bonusActivityInfoList = 13;</code>
* <code>repeated .BonusActivityInfo bonus_activity_info_list = 5;</code>
*/
public java.util.List<emu.grasscutter.net.proto.BonusActivityInfoOuterClass.BonusActivityInfo.Builder>
getBonusActivityInfoListBuilderList() {
@@ -927,7 +806,7 @@ public final class BonusActivityInfoRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -935,7 +814,7 @@ public final class BonusActivityInfoRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 9;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -946,7 +825,7 @@ public final class BonusActivityInfoRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 9;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -1023,12 +902,10 @@ public final class BonusActivityInfoRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\032BonusActivityInfoRsp.proto\032\027BonusActiv" +
"ityInfo.proto\"\253\001\n\024BonusActivityInfoRsp\0221" +
"\n\025bonusActivityInfoList\030\r \003(\0132\022.BonusAct" +
"ivityInfo\022\017\n\007retcode\030\014 \001(\005\"O\n\013JAGOBCLBFB" +
"H\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\324\023\022\017\n\013DCDNILF" +
"DFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grass" +
"cutter.net.protob\006proto3"
"ityInfo.proto\"]\n\024BonusActivityInfoRsp\0224\n" +
"\030bonus_activity_info_list\030\005 \003(\0132\022.BonusA" +
"ctivityInfo\022\017\n\007retcode\030\t \001(\005B\033\n\031emu.gras" +
"scutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,