Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-08 21:43:51 +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/TakeBattlePassMissionPointRspOuterClass.java
+90 -213
View File
@@ -19,29 +19,34 @@ public final class TakeBattlePassMissionPointRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated uint32 missionIdList = 10;</code>
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>repeated uint32 mission_id_list = 3;</code>
* @return A list containing the missionIdList.
*/
java.util.List<java.lang.Integer> getMissionIdListList();
/**
* <code>repeated uint32 missionIdList = 10;</code>
* <code>repeated uint32 mission_id_list = 3;</code>
* @return The count of missionIdList.
*/
int getMissionIdListCount();
/**
* <code>repeated uint32 missionIdList = 10;</code>
* <code>repeated uint32 mission_id_list = 3;</code>
* @param index The index of the element to return.
* @return The missionIdList at the given index.
*/
int getMissionIdList(int index);
/**
* <code>int32 retcode = 4;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* Name: KABHDLGHLMD
* CmdId: 2632
* </pre>
*
* Protobuf type {@code TakeBattlePassMissionPointRsp}
*/
public static final class TakeBattlePassMissionPointRsp extends
@@ -88,12 +93,12 @@ public final class TakeBattlePassMissionPointRspOuterClass {
case 0:
done = true;
break;
case 32: {
case 8: {
retcode_ = input.readInt32();
break;
}
case 80: {
case 24: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
missionIdList_ = newIntList();
mutable_bitField0_ |= 0x00000001;
@@ -101,7 +106,7 @@ public final class TakeBattlePassMissionPointRspOuterClass {
missionIdList_.addInt(input.readUInt32());
break;
}
case 82: {
case 26: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -149,141 +154,21 @@ public final class TakeBattlePassMissionPointRspOuterClass {
emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp.class, emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp.Builder.class);
}
public static final int RETCODE_FIELD_NUMBER = 1;
private int retcode_;
/**
* Protobuf enum {@code TakeBattlePassMissionPointRsp.GKEHNOBOCLO}
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
public enum GKEHNOBOCLO
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 2635;</code>
*/
PEPPOHPHJOJ(1, 2635),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final GKEHNOBOCLO DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 2635;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 2635;
/**
* <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 GKEHNOBOCLO 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 GKEHNOBOCLO forNumber(int value) {
switch (value) {
case 0: return NONE;
case 2635: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<GKEHNOBOCLO>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
GKEHNOBOCLO> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<GKEHNOBOCLO>() {
public GKEHNOBOCLO findValueByNumber(int number) {
return GKEHNOBOCLO.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.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp.getDescriptor().getEnumTypes().get(0);
}
private static final GKEHNOBOCLO[] VALUES = getStaticValuesArray();
private static GKEHNOBOCLO[] getStaticValuesArray() {
return new GKEHNOBOCLO[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static GKEHNOBOCLO 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 GKEHNOBOCLO(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:TakeBattlePassMissionPointRsp.GKEHNOBOCLO)
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int MISSIONIDLIST_FIELD_NUMBER = 10;
public static final int MISSION_ID_LIST_FIELD_NUMBER = 3;
private com.google.protobuf.Internal.IntList missionIdList_;
/**
* <code>repeated uint32 missionIdList = 10;</code>
* <code>repeated uint32 mission_id_list = 3;</code>
* @return A list containing the missionIdList.
*/
@java.lang.Override
@@ -292,14 +177,14 @@ public final class TakeBattlePassMissionPointRspOuterClass {
return missionIdList_;
}
/**
* <code>repeated uint32 missionIdList = 10;</code>
* <code>repeated uint32 mission_id_list = 3;</code>
* @return The count of missionIdList.
*/
public int getMissionIdListCount() {
return missionIdList_.size();
}
/**
* <code>repeated uint32 missionIdList = 10;</code>
* <code>repeated uint32 mission_id_list = 3;</code>
* @param index The index of the element to return.
* @return The missionIdList at the given index.
*/
@@ -308,17 +193,6 @@ public final class TakeBattlePassMissionPointRspOuterClass {
}
private int missionIdListMemoizedSerializedSize = -1;
public static final int RETCODE_FIELD_NUMBER = 4;
private int retcode_;
/**
* <code>int32 retcode = 4;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -335,10 +209,10 @@ public final class TakeBattlePassMissionPointRspOuterClass {
throws java.io.IOException {
getSerializedSize();
if (retcode_ != 0) {
output.writeInt32(4, retcode_);
output.writeInt32(1, retcode_);
}
if (getMissionIdListList().size() > 0) {
output.writeUInt32NoTag(82);
output.writeUInt32NoTag(26);
output.writeUInt32NoTag(missionIdListMemoizedSerializedSize);
}
for (int i = 0; i < missionIdList_.size(); i++) {
@@ -355,7 +229,7 @@ public final class TakeBattlePassMissionPointRspOuterClass {
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(4, retcode_);
.computeInt32Size(1, retcode_);
}
{
int dataSize = 0;
@@ -386,10 +260,10 @@ public final class TakeBattlePassMissionPointRspOuterClass {
}
emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp other = (emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp) obj;
if (!getMissionIdListList()
.equals(other.getMissionIdListList())) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (!getMissionIdListList()
.equals(other.getMissionIdListList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -401,12 +275,12 @@ public final class TakeBattlePassMissionPointRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (getMissionIdListCount() > 0) {
hash = (37 * hash) + MISSIONIDLIST_FIELD_NUMBER;
hash = (53 * hash) + getMissionIdListList().hashCode();
}
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
if (getMissionIdListCount() > 0) {
hash = (37 * hash) + MISSION_ID_LIST_FIELD_NUMBER;
hash = (53 * hash) + getMissionIdListList().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -503,6 +377,11 @@ public final class TakeBattlePassMissionPointRspOuterClass {
return builder;
}
/**
* <pre>
* Name: KABHDLGHLMD
* CmdId: 2632
* </pre>
*
* Protobuf type {@code TakeBattlePassMissionPointRsp}
*/
public static final class Builder extends
@@ -540,10 +419,10 @@ public final class TakeBattlePassMissionPointRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
missionIdList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
retcode_ = 0;
missionIdList_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
@@ -571,12 +450,12 @@ public final class TakeBattlePassMissionPointRspOuterClass {
public emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp buildPartial() {
emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp result = new emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp(this);
int from_bitField0_ = bitField0_;
result.retcode_ = retcode_;
if (((bitField0_ & 0x00000001) != 0)) {
missionIdList_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000001);
}
result.missionIdList_ = missionIdList_;
result.retcode_ = retcode_;
onBuilt();
return result;
}
@@ -625,6 +504,9 @@ public final class TakeBattlePassMissionPointRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp other) {
if (other == emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp.getDefaultInstance()) return this;
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (!other.missionIdList_.isEmpty()) {
if (missionIdList_.isEmpty()) {
missionIdList_ = other.missionIdList_;
@@ -635,9 +517,6 @@ public final class TakeBattlePassMissionPointRspOuterClass {
}
onChanged();
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -668,6 +547,37 @@ public final class TakeBattlePassMissionPointRspOuterClass {
}
private int bitField0_;
private int retcode_ ;
/**
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 1;</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 = 1;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private com.google.protobuf.Internal.IntList missionIdList_ = emptyIntList();
private void ensureMissionIdListIsMutable() {
if (!((bitField0_ & 0x00000001) != 0)) {
@@ -676,7 +586,7 @@ public final class TakeBattlePassMissionPointRspOuterClass {
}
}
/**
* <code>repeated uint32 missionIdList = 10;</code>
* <code>repeated uint32 mission_id_list = 3;</code>
* @return A list containing the missionIdList.
*/
public java.util.List<java.lang.Integer>
@@ -685,14 +595,14 @@ public final class TakeBattlePassMissionPointRspOuterClass {
java.util.Collections.unmodifiableList(missionIdList_) : missionIdList_;
}
/**
* <code>repeated uint32 missionIdList = 10;</code>
* <code>repeated uint32 mission_id_list = 3;</code>
* @return The count of missionIdList.
*/
public int getMissionIdListCount() {
return missionIdList_.size();
}
/**
* <code>repeated uint32 missionIdList = 10;</code>
* <code>repeated uint32 mission_id_list = 3;</code>
* @param index The index of the element to return.
* @return The missionIdList at the given index.
*/
@@ -700,7 +610,7 @@ public final class TakeBattlePassMissionPointRspOuterClass {
return missionIdList_.getInt(index);
}
/**
* <code>repeated uint32 missionIdList = 10;</code>
* <code>repeated uint32 mission_id_list = 3;</code>
* @param index The index to set the value at.
* @param value The missionIdList to set.
* @return This builder for chaining.
@@ -713,7 +623,7 @@ public final class TakeBattlePassMissionPointRspOuterClass {
return this;
}
/**
* <code>repeated uint32 missionIdList = 10;</code>
* <code>repeated uint32 mission_id_list = 3;</code>
* @param value The missionIdList to add.
* @return This builder for chaining.
*/
@@ -724,7 +634,7 @@ public final class TakeBattlePassMissionPointRspOuterClass {
return this;
}
/**
* <code>repeated uint32 missionIdList = 10;</code>
* <code>repeated uint32 mission_id_list = 3;</code>
* @param values The missionIdList to add.
* @return This builder for chaining.
*/
@@ -737,7 +647,7 @@ public final class TakeBattlePassMissionPointRspOuterClass {
return this;
}
/**
* <code>repeated uint32 missionIdList = 10;</code>
* <code>repeated uint32 mission_id_list = 3;</code>
* @return This builder for chaining.
*/
public Builder clearMissionIdList() {
@@ -746,37 +656,6 @@ public final class TakeBattlePassMissionPointRspOuterClass {
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 4;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 4;</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 = 4;</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) {
@@ -844,11 +723,9 @@ public final class TakeBattlePassMissionPointRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n#TakeBattlePassMissionPointRsp.proto\"\230\001" +
"\n\035TakeBattlePassMissionPointRsp\022\025\n\rmissi" +
"onIdList\030\n \003(\r\022\017\n\007retcode\030\004 \001(\005\"O\n\013GKEHN" +
"OBOCLO\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\313\024\022\017\n\013DC" +
"DNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu." +
"\n#TakeBattlePassMissionPointRsp.proto\"I\n" +
"\035TakeBattlePassMissionPointRsp\022\017\n\007retcod" +
"e\030\001 \001(\005\022\027\n\017mission_id_list\030\003 \003(\rB\033\n\031emu." +
"grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -860,7 +737,7 @@ public final class TakeBattlePassMissionPointRspOuterClass {
internal_static_TakeBattlePassMissionPointRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_TakeBattlePassMissionPointRsp_descriptor,
new java.lang.String[] { "MissionIdList", "Retcode", });
new java.lang.String[] { "Retcode", "MissionIdList", });
}
// @@protoc_insertion_point(outer_class_scope)