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
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
@@ -19,46 +19,51 @@ public final class DestroyMaterialRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated uint32 itemIdList = 7;</code>
* <code>int32 retcode = 15;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>repeated uint32 item_id_list = 3;</code>
* @return A list containing the itemIdList.
*/
java.util.List<java.lang.Integer> getItemIdListList();
/**
* <code>repeated uint32 itemIdList = 7;</code>
* <code>repeated uint32 item_id_list = 3;</code>
* @return The count of itemIdList.
*/
int getItemIdListCount();
/**
* <code>repeated uint32 itemIdList = 7;</code>
* <code>repeated uint32 item_id_list = 3;</code>
* @param index The index of the element to return.
* @return The itemIdList at the given index.
*/
int getItemIdList(int index);
/**
* <code>int32 retcode = 12;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>repeated uint32 itemCountList = 13;</code>
* <code>repeated uint32 item_count_list = 13;</code>
* @return A list containing the itemCountList.
*/
java.util.List<java.lang.Integer> getItemCountListList();
/**
* <code>repeated uint32 itemCountList = 13;</code>
* <code>repeated uint32 item_count_list = 13;</code>
* @return The count of itemCountList.
*/
int getItemCountListCount();
/**
* <code>repeated uint32 itemCountList = 13;</code>
* <code>repeated uint32 item_count_list = 13;</code>
* @param index The index of the element to return.
* @return The itemCountList at the given index.
*/
int getItemCountList(int index);
}
/**
* <pre>
* Name: JFDLBMJGCDD
* CmdId: 679
* </pre>
*
* Protobuf type {@code DestroyMaterialRsp}
*/
public static final class DestroyMaterialRsp extends
@@ -106,7 +111,7 @@ public final class DestroyMaterialRspOuterClass {
case 0:
done = true;
break;
case 56: {
case 24: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
itemIdList_ = newIntList();
mutable_bitField0_ |= 0x00000001;
@@ -114,7 +119,7 @@ public final class DestroyMaterialRspOuterClass {
itemIdList_.addInt(input.readUInt32());
break;
}
case 58: {
case 26: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -127,11 +132,6 @@ public final class DestroyMaterialRspOuterClass {
input.popLimit(limit);
break;
}
case 96: {
retcode_ = input.readInt32();
break;
}
case 104: {
if (!((mutable_bitField0_ & 0x00000002) != 0)) {
itemCountList_ = newIntList();
@@ -153,6 +153,11 @@ public final class DestroyMaterialRspOuterClass {
input.popLimit(limit);
break;
}
case 120: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -191,141 +196,21 @@ public final class DestroyMaterialRspOuterClass {
emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp.class, emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp.Builder.class);
}
public static final int RETCODE_FIELD_NUMBER = 15;
private int retcode_;
/**
* Protobuf enum {@code DestroyMaterialRsp.IEOFDMOHAPI}
* <code>int32 retcode = 15;</code>
* @return The retcode.
*/
public enum IEOFDMOHAPI
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 637;</code>
*/
PEPPOHPHJOJ(1, 637),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final IEOFDMOHAPI DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 637;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 637;
/**
* <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 IEOFDMOHAPI 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 IEOFDMOHAPI forNumber(int value) {
switch (value) {
case 0: return NONE;
case 637: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<IEOFDMOHAPI>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
IEOFDMOHAPI> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<IEOFDMOHAPI>() {
public IEOFDMOHAPI findValueByNumber(int number) {
return IEOFDMOHAPI.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.DestroyMaterialRspOuterClass.DestroyMaterialRsp.getDescriptor().getEnumTypes().get(0);
}
private static final IEOFDMOHAPI[] VALUES = getStaticValuesArray();
private static IEOFDMOHAPI[] getStaticValuesArray() {
return new IEOFDMOHAPI[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static IEOFDMOHAPI 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 IEOFDMOHAPI(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:DestroyMaterialRsp.IEOFDMOHAPI)
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int ITEMIDLIST_FIELD_NUMBER = 7;
public static final int ITEM_ID_LIST_FIELD_NUMBER = 3;
private com.google.protobuf.Internal.IntList itemIdList_;
/**
* <code>repeated uint32 itemIdList = 7;</code>
* <code>repeated uint32 item_id_list = 3;</code>
* @return A list containing the itemIdList.
*/
@java.lang.Override
@@ -334,14 +219,14 @@ public final class DestroyMaterialRspOuterClass {
return itemIdList_;
}
/**
* <code>repeated uint32 itemIdList = 7;</code>
* <code>repeated uint32 item_id_list = 3;</code>
* @return The count of itemIdList.
*/
public int getItemIdListCount() {
return itemIdList_.size();
}
/**
* <code>repeated uint32 itemIdList = 7;</code>
* <code>repeated uint32 item_id_list = 3;</code>
* @param index The index of the element to return.
* @return The itemIdList at the given index.
*/
@@ -350,21 +235,10 @@ public final class DestroyMaterialRspOuterClass {
}
private int itemIdListMemoizedSerializedSize = -1;
public static final int RETCODE_FIELD_NUMBER = 12;
private int retcode_;
/**
* <code>int32 retcode = 12;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int ITEMCOUNTLIST_FIELD_NUMBER = 13;
public static final int ITEM_COUNT_LIST_FIELD_NUMBER = 13;
private com.google.protobuf.Internal.IntList itemCountList_;
/**
* <code>repeated uint32 itemCountList = 13;</code>
* <code>repeated uint32 item_count_list = 13;</code>
* @return A list containing the itemCountList.
*/
@java.lang.Override
@@ -373,14 +247,14 @@ public final class DestroyMaterialRspOuterClass {
return itemCountList_;
}
/**
* <code>repeated uint32 itemCountList = 13;</code>
* <code>repeated uint32 item_count_list = 13;</code>
* @return The count of itemCountList.
*/
public int getItemCountListCount() {
return itemCountList_.size();
}
/**
* <code>repeated uint32 itemCountList = 13;</code>
* <code>repeated uint32 item_count_list = 13;</code>
* @param index The index of the element to return.
* @return The itemCountList at the given index.
*/
@@ -405,15 +279,12 @@ public final class DestroyMaterialRspOuterClass {
throws java.io.IOException {
getSerializedSize();
if (getItemIdListList().size() > 0) {
output.writeUInt32NoTag(58);
output.writeUInt32NoTag(26);
output.writeUInt32NoTag(itemIdListMemoizedSerializedSize);
}
for (int i = 0; i < itemIdList_.size(); i++) {
output.writeUInt32NoTag(itemIdList_.getInt(i));
}
if (retcode_ != 0) {
output.writeInt32(12, retcode_);
}
if (getItemCountListList().size() > 0) {
output.writeUInt32NoTag(106);
output.writeUInt32NoTag(itemCountListMemoizedSerializedSize);
@@ -421,6 +292,9 @@ public final class DestroyMaterialRspOuterClass {
for (int i = 0; i < itemCountList_.size(); i++) {
output.writeUInt32NoTag(itemCountList_.getInt(i));
}
if (retcode_ != 0) {
output.writeInt32(15, retcode_);
}
unknownFields.writeTo(output);
}
@@ -444,10 +318,6 @@ public final class DestroyMaterialRspOuterClass {
}
itemIdListMemoizedSerializedSize = dataSize;
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(12, retcode_);
}
{
int dataSize = 0;
for (int i = 0; i < itemCountList_.size(); i++) {
@@ -462,6 +332,10 @@ public final class DestroyMaterialRspOuterClass {
}
itemCountListMemoizedSerializedSize = dataSize;
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(15, retcode_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -477,10 +351,10 @@ public final class DestroyMaterialRspOuterClass {
}
emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp other = (emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp) obj;
if (!getItemIdListList()
.equals(other.getItemIdListList())) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (!getItemIdListList()
.equals(other.getItemIdListList())) return false;
if (!getItemCountListList()
.equals(other.getItemCountListList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -494,14 +368,14 @@ public final class DestroyMaterialRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (getItemIdListCount() > 0) {
hash = (37 * hash) + ITEMIDLIST_FIELD_NUMBER;
hash = (53 * hash) + getItemIdListList().hashCode();
}
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
if (getItemIdListCount() > 0) {
hash = (37 * hash) + ITEM_ID_LIST_FIELD_NUMBER;
hash = (53 * hash) + getItemIdListList().hashCode();
}
if (getItemCountListCount() > 0) {
hash = (37 * hash) + ITEMCOUNTLIST_FIELD_NUMBER;
hash = (37 * hash) + ITEM_COUNT_LIST_FIELD_NUMBER;
hash = (53 * hash) + getItemCountListList().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
@@ -600,6 +474,11 @@ public final class DestroyMaterialRspOuterClass {
return builder;
}
/**
* <pre>
* Name: JFDLBMJGCDD
* CmdId: 679
* </pre>
*
* Protobuf type {@code DestroyMaterialRsp}
*/
public static final class Builder extends
@@ -637,10 +516,10 @@ public final class DestroyMaterialRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
itemIdList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
retcode_ = 0;
itemIdList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
itemCountList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000002);
return this;
@@ -670,12 +549,12 @@ public final class DestroyMaterialRspOuterClass {
public emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp buildPartial() {
emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp result = new emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp(this);
int from_bitField0_ = bitField0_;
result.retcode_ = retcode_;
if (((bitField0_ & 0x00000001) != 0)) {
itemIdList_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000001);
}
result.itemIdList_ = itemIdList_;
result.retcode_ = retcode_;
if (((bitField0_ & 0x00000002) != 0)) {
itemCountList_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000002);
@@ -729,6 +608,9 @@ public final class DestroyMaterialRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp other) {
if (other == emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp.getDefaultInstance()) return this;
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (!other.itemIdList_.isEmpty()) {
if (itemIdList_.isEmpty()) {
itemIdList_ = other.itemIdList_;
@@ -739,9 +621,6 @@ public final class DestroyMaterialRspOuterClass {
}
onChanged();
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (!other.itemCountList_.isEmpty()) {
if (itemCountList_.isEmpty()) {
itemCountList_ = other.itemCountList_;
@@ -782,6 +661,37 @@ public final class DestroyMaterialRspOuterClass {
}
private int bitField0_;
private int retcode_ ;
/**
* <code>int32 retcode = 15;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 15;</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 = 15;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private com.google.protobuf.Internal.IntList itemIdList_ = emptyIntList();
private void ensureItemIdListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
@@ -790,7 +700,7 @@ public final class DestroyMaterialRspOuterClass {
}
}
/**
* <code>repeated uint32 itemIdList = 7;</code>
* <code>repeated uint32 item_id_list = 3;</code>
* @return A list containing the itemIdList.
*/
public java.util.List<java.lang.Integer>
@@ -799,14 +709,14 @@ public final class DestroyMaterialRspOuterClass {
java.util.Collections.unmodifiableList(itemIdList_) : itemIdList_;
}
/**
* <code>repeated uint32 itemIdList = 7;</code>
* <code>repeated uint32 item_id_list = 3;</code>
* @return The count of itemIdList.
*/
public int getItemIdListCount() {
return itemIdList_.size();
}
/**
* <code>repeated uint32 itemIdList = 7;</code>
* <code>repeated uint32 item_id_list = 3;</code>
* @param index The index of the element to return.
* @return The itemIdList at the given index.
*/
@@ -814,7 +724,7 @@ public final class DestroyMaterialRspOuterClass {
return itemIdList_.getInt(index);
}
/**
* <code>repeated uint32 itemIdList = 7;</code>
* <code>repeated uint32 item_id_list = 3;</code>
* @param index The index to set the value at.
* @param value The itemIdList to set.
* @return This builder for chaining.
@@ -827,7 +737,7 @@ public final class DestroyMaterialRspOuterClass {
return this;
}
/**
* <code>repeated uint32 itemIdList = 7;</code>
* <code>repeated uint32 item_id_list = 3;</code>
* @param value The itemIdList to add.
* @return This builder for chaining.
*/
@@ -838,7 +748,7 @@ public final class DestroyMaterialRspOuterClass {
return this;
}
/**
* <code>repeated uint32 itemIdList = 7;</code>
* <code>repeated uint32 item_id_list = 3;</code>
* @param values The itemIdList to add.
* @return This builder for chaining.
*/
@@ -851,7 +761,7 @@ public final class DestroyMaterialRspOuterClass {
return this;
}
/**
* <code>repeated uint32 itemIdList = 7;</code>
* <code>repeated uint32 item_id_list = 3;</code>
* @return This builder for chaining.
*/
public Builder clearItemIdList() {
@@ -861,37 +771,6 @@ public final class DestroyMaterialRspOuterClass {
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 12;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 12;</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 = 12;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private com.google.protobuf.Internal.IntList itemCountList_ = emptyIntList();
private void ensureItemCountListIsMutable() {
if (!((bitField0_ & 0x00000002) != 0)) {
@@ -900,7 +779,7 @@ public final class DestroyMaterialRspOuterClass {
}
}
/**
* <code>repeated uint32 itemCountList = 13;</code>
* <code>repeated uint32 item_count_list = 13;</code>
* @return A list containing the itemCountList.
*/
public java.util.List<java.lang.Integer>
@@ -909,14 +788,14 @@ public final class DestroyMaterialRspOuterClass {
java.util.Collections.unmodifiableList(itemCountList_) : itemCountList_;
}
/**
* <code>repeated uint32 itemCountList = 13;</code>
* <code>repeated uint32 item_count_list = 13;</code>
* @return The count of itemCountList.
*/
public int getItemCountListCount() {
return itemCountList_.size();
}
/**
* <code>repeated uint32 itemCountList = 13;</code>
* <code>repeated uint32 item_count_list = 13;</code>
* @param index The index of the element to return.
* @return The itemCountList at the given index.
*/
@@ -924,7 +803,7 @@ public final class DestroyMaterialRspOuterClass {
return itemCountList_.getInt(index);
}
/**
* <code>repeated uint32 itemCountList = 13;</code>
* <code>repeated uint32 item_count_list = 13;</code>
* @param index The index to set the value at.
* @param value The itemCountList to set.
* @return This builder for chaining.
@@ -937,7 +816,7 @@ public final class DestroyMaterialRspOuterClass {
return this;
}
/**
* <code>repeated uint32 itemCountList = 13;</code>
* <code>repeated uint32 item_count_list = 13;</code>
* @param value The itemCountList to add.
* @return This builder for chaining.
*/
@@ -948,7 +827,7 @@ public final class DestroyMaterialRspOuterClass {
return this;
}
/**
* <code>repeated uint32 itemCountList = 13;</code>
* <code>repeated uint32 item_count_list = 13;</code>
* @param values The itemCountList to add.
* @return This builder for chaining.
*/
@@ -961,7 +840,7 @@ public final class DestroyMaterialRspOuterClass {
return this;
}
/**
* <code>repeated uint32 itemCountList = 13;</code>
* <code>repeated uint32 item_count_list = 13;</code>
* @return This builder for chaining.
*/
public Builder clearItemCountList() {
@@ -1037,12 +916,10 @@ public final class DestroyMaterialRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\030DestroyMaterialRsp.proto\"\241\001\n\022DestroyMa" +
"terialRsp\022\022\n\nitemIdList\030\007 \003(\r\022\017\n\007retcode" +
"\030\014 \001(\005\022\025\n\ritemCountList\030\r \003(\r\"O\n\013IEOFDMO" +
"HAPI\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\375\004\022\017\n\013DCDN" +
"ILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.gr" +
"asscutter.net.protob\006proto3"
"\n\030DestroyMaterialRsp.proto\"T\n\022DestroyMat" +
"erialRsp\022\017\n\007retcode\030\017 \001(\005\022\024\n\014item_id_lis" +
"t\030\003 \003(\r\022\027\n\017item_count_list\030\r \003(\rB\033\n\031emu." +
"grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -1053,7 +930,7 @@ public final class DestroyMaterialRspOuterClass {
internal_static_DestroyMaterialRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_DestroyMaterialRsp_descriptor,
new java.lang.String[] { "ItemIdList", "Retcode", "ItemCountList", });
new java.lang.String[] { "Retcode", "ItemIdList", "ItemCountList", });
}
// @@protoc_insertion_point(outer_class_scope)