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,18 +19,23 @@ public final class HomeChangeEditModeRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>bool isEnterEditMode = 9;</code>
* @return The isEnterEditMode.
*/
boolean getIsEnterEditMode();
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 14;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>bool is_enter_edit_mode = 11;</code>
* @return The isEnterEditMode.
*/
boolean getIsEnterEditMode();
}
/**
* <pre>
* Name: HKFKCOODNHH
* CmdId: 4862
* </pre>
*
* Protobuf type {@code HomeChangeEditModeRsp}
*/
public static final class HomeChangeEditModeRsp extends
@@ -75,16 +80,16 @@ public final class HomeChangeEditModeRspOuterClass {
case 0:
done = true;
break;
case 24: {
retcode_ = input.readInt32();
break;
}
case 72: {
case 88: {
isEnterEditMode_ = input.readBool();
break;
}
case 112: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -117,152 +122,10 @@ public final class HomeChangeEditModeRspOuterClass {
emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp.class, emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp.Builder.class);
}
/**
* Protobuf enum {@code HomeChangeEditModeRsp.DBDBLCNDCHO}
*/
public enum DBDBLCNDCHO
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 4767;</code>
*/
PEPPOHPHJOJ(1, 4767),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final DBDBLCNDCHO DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 4767;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 4767;
/**
* <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 DBDBLCNDCHO 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 DBDBLCNDCHO forNumber(int value) {
switch (value) {
case 0: return NONE;
case 4767: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<DBDBLCNDCHO>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
DBDBLCNDCHO> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<DBDBLCNDCHO>() {
public DBDBLCNDCHO findValueByNumber(int number) {
return DBDBLCNDCHO.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.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp.getDescriptor().getEnumTypes().get(0);
}
private static final DBDBLCNDCHO[] VALUES = getStaticValuesArray();
private static DBDBLCNDCHO[] getStaticValuesArray() {
return new DBDBLCNDCHO[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static DBDBLCNDCHO 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 DBDBLCNDCHO(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:HomeChangeEditModeRsp.DBDBLCNDCHO)
}
public static final int ISENTEREDITMODE_FIELD_NUMBER = 9;
private boolean isEnterEditMode_;
/**
* <code>bool isEnterEditMode = 9;</code>
* @return The isEnterEditMode.
*/
@java.lang.Override
public boolean getIsEnterEditMode() {
return isEnterEditMode_;
}
public static final int RETCODE_FIELD_NUMBER = 3;
public static final int RETCODE_FIELD_NUMBER = 14;
private int retcode_;
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 14;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -270,6 +133,17 @@ public final class HomeChangeEditModeRspOuterClass {
return retcode_;
}
public static final int IS_ENTER_EDIT_MODE_FIELD_NUMBER = 11;
private boolean isEnterEditMode_;
/**
* <code>bool is_enter_edit_mode = 11;</code>
* @return The isEnterEditMode.
*/
@java.lang.Override
public boolean getIsEnterEditMode() {
return isEnterEditMode_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -284,11 +158,11 @@ public final class HomeChangeEditModeRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(3, retcode_);
}
if (isEnterEditMode_ != false) {
output.writeBool(9, isEnterEditMode_);
output.writeBool(11, isEnterEditMode_);
}
if (retcode_ != 0) {
output.writeInt32(14, retcode_);
}
unknownFields.writeTo(output);
}
@@ -299,13 +173,13 @@ public final class HomeChangeEditModeRspOuterClass {
if (size != -1) return size;
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(3, retcode_);
}
if (isEnterEditMode_ != false) {
size += com.google.protobuf.CodedOutputStream
.computeBoolSize(9, isEnterEditMode_);
.computeBoolSize(11, isEnterEditMode_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(14, retcode_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -322,10 +196,10 @@ public final class HomeChangeEditModeRspOuterClass {
}
emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp other = (emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp) obj;
if (getIsEnterEditMode()
!= other.getIsEnterEditMode()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (getIsEnterEditMode()
!= other.getIsEnterEditMode()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -337,11 +211,11 @@ public final class HomeChangeEditModeRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ISENTEREDITMODE_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsEnterEditMode());
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + IS_ENTER_EDIT_MODE_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsEnterEditMode());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -438,6 +312,11 @@ public final class HomeChangeEditModeRspOuterClass {
return builder;
}
/**
* <pre>
* Name: HKFKCOODNHH
* CmdId: 4862
* </pre>
*
* Protobuf type {@code HomeChangeEditModeRsp}
*/
public static final class Builder extends
@@ -475,10 +354,10 @@ public final class HomeChangeEditModeRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
isEnterEditMode_ = false;
retcode_ = 0;
isEnterEditMode_ = false;
return this;
}
@@ -505,8 +384,8 @@ public final class HomeChangeEditModeRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp buildPartial() {
emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp result = new emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp(this);
result.isEnterEditMode_ = isEnterEditMode_;
result.retcode_ = retcode_;
result.isEnterEditMode_ = isEnterEditMode_;
onBuilt();
return result;
}
@@ -555,12 +434,12 @@ public final class HomeChangeEditModeRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp other) {
if (other == emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp.getDefaultInstance()) return this;
if (other.getIsEnterEditMode() != false) {
setIsEnterEditMode(other.getIsEnterEditMode());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getIsEnterEditMode() != false) {
setIsEnterEditMode(other.getIsEnterEditMode());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -590,40 +469,9 @@ public final class HomeChangeEditModeRspOuterClass {
return this;
}
private boolean isEnterEditMode_ ;
/**
* <code>bool isEnterEditMode = 9;</code>
* @return The isEnterEditMode.
*/
@java.lang.Override
public boolean getIsEnterEditMode() {
return isEnterEditMode_;
}
/**
* <code>bool isEnterEditMode = 9;</code>
* @param value The isEnterEditMode to set.
* @return This builder for chaining.
*/
public Builder setIsEnterEditMode(boolean value) {
isEnterEditMode_ = value;
onChanged();
return this;
}
/**
* <code>bool isEnterEditMode = 9;</code>
* @return This builder for chaining.
*/
public Builder clearIsEnterEditMode() {
isEnterEditMode_ = false;
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 14;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -631,7 +479,7 @@ public final class HomeChangeEditModeRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 14;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -642,7 +490,7 @@ public final class HomeChangeEditModeRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 14;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -651,6 +499,37 @@ public final class HomeChangeEditModeRspOuterClass {
onChanged();
return this;
}
private boolean isEnterEditMode_ ;
/**
* <code>bool is_enter_edit_mode = 11;</code>
* @return The isEnterEditMode.
*/
@java.lang.Override
public boolean getIsEnterEditMode() {
return isEnterEditMode_;
}
/**
* <code>bool is_enter_edit_mode = 11;</code>
* @param value The isEnterEditMode to set.
* @return This builder for chaining.
*/
public Builder setIsEnterEditMode(boolean value) {
isEnterEditMode_ = value;
onChanged();
return this;
}
/**
* <code>bool is_enter_edit_mode = 11;</code>
* @return This builder for chaining.
*/
public Builder clearIsEnterEditMode() {
isEnterEditMode_ = false;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -718,12 +597,10 @@ public final class HomeChangeEditModeRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\033HomeChangeEditModeRsp.proto\"\222\001\n\025HomeCh" +
"angeEditModeRsp\022\027\n\017isEnterEditMode\030\t \001(\010" +
"\022\017\n\007retcode\030\003 \001(\005\"O\n\013DBDBLCNDCHO\022\010\n\004NONE" +
"\020\000\022\020\n\013PEPPOHPHJOJ\020\237%\022\017\n\013DCDNILFDFLB\020\000\022\017\n" +
"\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.ne" +
"t.protob\006proto3"
"\n\033HomeChangeEditModeRsp.proto\"D\n\025HomeCha" +
"ngeEditModeRsp\022\017\n\007retcode\030\016 \001(\005\022\032\n\022is_en" +
"ter_edit_mode\030\013 \001(\010B\033\n\031emu.grasscutter.n" +
"et.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -734,7 +611,7 @@ public final class HomeChangeEditModeRspOuterClass {
internal_static_HomeChangeEditModeRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_HomeChangeEditModeRsp_descriptor,
new java.lang.String[] { "IsEnterEditMode", "Retcode", });
new java.lang.String[] { "Retcode", "IsEnterEditMode", });
}
// @@protoc_insertion_point(outer_class_scope)