Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 10:33:34 +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/TakeCompoundOutputRspOuterClass.java
+55 -178
View File
@@ -19,36 +19,41 @@ public final class TakeCompoundOutputRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>
getItemListList();
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index);
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
int getItemListCount();
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>
getItemListOrBuilderList();
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
int index);
/**
* <code>int32 retcode = 2;</code>
* <code>int32 retcode = 7;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* Name: LKHMPMMAEBD
* CmdId: 125
* </pre>
*
* Protobuf type {@code TakeCompoundOutputRsp}
*/
public static final class TakeCompoundOutputRsp extends
@@ -95,12 +100,12 @@ public final class TakeCompoundOutputRspOuterClass {
case 0:
done = true;
break;
case 16: {
case 56: {
retcode_ = input.readInt32();
break;
}
case 106: {
case 98: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
itemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
mutable_bitField0_ |= 0x00000001;
@@ -144,148 +149,17 @@ public final class TakeCompoundOutputRspOuterClass {
emu.grasscutter.net.proto.TakeCompoundOutputRspOuterClass.TakeCompoundOutputRsp.class, emu.grasscutter.net.proto.TakeCompoundOutputRspOuterClass.TakeCompoundOutputRsp.Builder.class);
}
/**
* Protobuf enum {@code TakeCompoundOutputRsp.DAFKGPGFPJP}
*/
public enum DAFKGPGFPJP
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 143;</code>
*/
PEPPOHPHJOJ(1, 143),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final DAFKGPGFPJP DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 143;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 143;
/**
* <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 DAFKGPGFPJP 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 DAFKGPGFPJP forNumber(int value) {
switch (value) {
case 0: return NONE;
case 143: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<DAFKGPGFPJP>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
DAFKGPGFPJP> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<DAFKGPGFPJP>() {
public DAFKGPGFPJP findValueByNumber(int number) {
return DAFKGPGFPJP.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.TakeCompoundOutputRspOuterClass.TakeCompoundOutputRsp.getDescriptor().getEnumTypes().get(0);
}
private static final DAFKGPGFPJP[] VALUES = getStaticValuesArray();
private static DAFKGPGFPJP[] getStaticValuesArray() {
return new DAFKGPGFPJP[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static DAFKGPGFPJP 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 DAFKGPGFPJP(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:TakeCompoundOutputRsp.DAFKGPGFPJP)
}
public static final int ITEMLIST_FIELD_NUMBER = 13;
public static final int ITEM_LIST_FIELD_NUMBER = 12;
private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemList_;
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemListList() {
return itemList_;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>
@@ -293,21 +167,21 @@ public final class TakeCompoundOutputRspOuterClass {
return itemList_;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
@java.lang.Override
public int getItemListCount() {
return itemList_.size();
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) {
return itemList_.get(index);
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
@@ -315,10 +189,10 @@ public final class TakeCompoundOutputRspOuterClass {
return itemList_.get(index);
}
public static final int RETCODE_FIELD_NUMBER = 2;
public static final int RETCODE_FIELD_NUMBER = 7;
private int retcode_;
/**
* <code>int32 retcode = 2;</code>
* <code>int32 retcode = 7;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -341,10 +215,10 @@ public final class TakeCompoundOutputRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(2, retcode_);
output.writeInt32(7, retcode_);
}
for (int i = 0; i < itemList_.size(); i++) {
output.writeMessage(13, itemList_.get(i));
output.writeMessage(12, itemList_.get(i));
}
unknownFields.writeTo(output);
}
@@ -357,11 +231,11 @@ public final class TakeCompoundOutputRspOuterClass {
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(2, retcode_);
.computeInt32Size(7, retcode_);
}
for (int i = 0; i < itemList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(13, itemList_.get(i));
.computeMessageSize(12, itemList_.get(i));
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -394,7 +268,7 @@ public final class TakeCompoundOutputRspOuterClass {
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (getItemListCount() > 0) {
hash = (37 * hash) + ITEMLIST_FIELD_NUMBER;
hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER;
hash = (53 * hash) + getItemListList().hashCode();
}
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
@@ -495,6 +369,11 @@ public final class TakeCompoundOutputRspOuterClass {
return builder;
}
/**
* <pre>
* Name: LKHMPMMAEBD
* CmdId: 125
* </pre>
*
* Protobuf type {@code TakeCompoundOutputRsp}
*/
public static final class Builder extends
@@ -698,7 +577,7 @@ public final class TakeCompoundOutputRspOuterClass {
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemListBuilder_;
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemListList() {
if (itemListBuilder_ == null) {
@@ -708,7 +587,7 @@ public final class TakeCompoundOutputRspOuterClass {
}
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public int getItemListCount() {
if (itemListBuilder_ == null) {
@@ -718,7 +597,7 @@ public final class TakeCompoundOutputRspOuterClass {
}
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) {
if (itemListBuilder_ == null) {
@@ -728,7 +607,7 @@ public final class TakeCompoundOutputRspOuterClass {
}
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public Builder setItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -745,7 +624,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public Builder setItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -759,7 +638,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
if (itemListBuilder_ == null) {
@@ -775,7 +654,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public Builder addItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -792,7 +671,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public Builder addItemList(
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -806,7 +685,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public Builder addItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -820,7 +699,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public Builder addAllItemList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
@@ -835,7 +714,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public Builder clearItemList() {
if (itemListBuilder_ == null) {
@@ -848,7 +727,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public Builder removeItemList(int index) {
if (itemListBuilder_ == null) {
@@ -861,14 +740,14 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemListBuilder(
int index) {
return getItemListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
int index) {
@@ -878,7 +757,7 @@ public final class TakeCompoundOutputRspOuterClass {
}
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>
getItemListOrBuilderList() {
@@ -889,14 +768,14 @@ public final class TakeCompoundOutputRspOuterClass {
}
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder() {
return getItemListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder(
int index) {
@@ -904,7 +783,7 @@ public final class TakeCompoundOutputRspOuterClass {
index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 12;</code>
*/
public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder>
getItemListBuilderList() {
@@ -927,7 +806,7 @@ public final class TakeCompoundOutputRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 2;</code>
* <code>int32 retcode = 7;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -935,7 +814,7 @@ public final class TakeCompoundOutputRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 2;</code>
* <code>int32 retcode = 7;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -946,7 +825,7 @@ public final class TakeCompoundOutputRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 2;</code>
* <code>int32 retcode = 7;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -1023,11 +902,9 @@ public final class TakeCompoundOutputRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\033TakeCompoundOutputRsp.proto\032\017ItemParam" +
".proto\"\227\001\n\025TakeCompoundOutputRsp\022\034\n\010item" +
"List\030\r \003(\0132\n.ItemParam\022\017\n\007retcode\030\002 \001(\005\"" +
"O\n\013DAFKGPGFPJP\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020" +
"\217\001\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001" +
"B\033\n\031emu.grasscutter.net.protob\006proto3"
".proto\"G\n\025TakeCompoundOutputRsp\022\035\n\titem_" +
"list\030\014 \003(\0132\n.ItemParam\022\017\n\007retcode\030\007 \001(\005B" +
"\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,