Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-08 14: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/WearEquipRspOuterClass.java
+102 -225
View File
@@ -19,24 +19,29 @@ public final class WearEquipRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>int32 retcode = 9;</code>
* <code>uint64 equip_guid = 4;</code>
* @return The equipGuid.
*/
long getEquipGuid();
/**
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint64 avatarGuid = 6;</code>
* <code>uint64 avatar_guid = 11;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>uint64 equipGuid = 13;</code>
* @return The equipGuid.
*/
long getEquipGuid();
}
/**
* <pre>
* Name: BHBOLAAJJFE
* CmdId: 629
* </pre>
*
* Protobuf type {@code WearEquipRsp}
*/
public static final class WearEquipRsp extends
@@ -81,21 +86,21 @@ public final class WearEquipRspOuterClass {
case 0:
done = true;
break;
case 48: {
avatarGuid_ = input.readUInt64();
break;
}
case 72: {
case 16: {
retcode_ = input.readInt32();
break;
}
case 104: {
case 32: {
equipGuid_ = input.readUInt64();
break;
}
case 88: {
avatarGuid_ = input.readUInt64();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -128,141 +133,21 @@ public final class WearEquipRspOuterClass {
emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp.class, emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp.Builder.class);
}
public static final int EQUIP_GUID_FIELD_NUMBER = 4;
private long equipGuid_;
/**
* Protobuf enum {@code WearEquipRsp.MOMHFFAMGFM}
* <code>uint64 equip_guid = 4;</code>
* @return The equipGuid.
*/
public enum MOMHFFAMGFM
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 613;</code>
*/
PEPPOHPHJOJ(1, 613),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final MOMHFFAMGFM DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 613;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 613;
/**
* <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 MOMHFFAMGFM 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 MOMHFFAMGFM forNumber(int value) {
switch (value) {
case 0: return NONE;
case 613: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<MOMHFFAMGFM>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
MOMHFFAMGFM> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<MOMHFFAMGFM>() {
public MOMHFFAMGFM findValueByNumber(int number) {
return MOMHFFAMGFM.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.WearEquipRspOuterClass.WearEquipRsp.getDescriptor().getEnumTypes().get(0);
}
private static final MOMHFFAMGFM[] VALUES = getStaticValuesArray();
private static MOMHFFAMGFM[] getStaticValuesArray() {
return new MOMHFFAMGFM[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static MOMHFFAMGFM 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 MOMHFFAMGFM(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:WearEquipRsp.MOMHFFAMGFM)
@java.lang.Override
public long getEquipGuid() {
return equipGuid_;
}
public static final int RETCODE_FIELD_NUMBER = 9;
public static final int RETCODE_FIELD_NUMBER = 2;
private int retcode_;
/**
* <code>int32 retcode = 9;</code>
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -270,10 +155,10 @@ public final class WearEquipRspOuterClass {
return retcode_;
}
public static final int AVATARGUID_FIELD_NUMBER = 6;
public static final int AVATAR_GUID_FIELD_NUMBER = 11;
private long avatarGuid_;
/**
* <code>uint64 avatarGuid = 6;</code>
* <code>uint64 avatar_guid = 11;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -281,17 +166,6 @@ public final class WearEquipRspOuterClass {
return avatarGuid_;
}
public static final int EQUIPGUID_FIELD_NUMBER = 13;
private long equipGuid_;
/**
* <code>uint64 equipGuid = 13;</code>
* @return The equipGuid.
*/
@java.lang.Override
public long getEquipGuid() {
return equipGuid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -306,14 +180,14 @@ public final class WearEquipRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (avatarGuid_ != 0L) {
output.writeUInt64(6, avatarGuid_);
}
if (retcode_ != 0) {
output.writeInt32(9, retcode_);
output.writeInt32(2, retcode_);
}
if (equipGuid_ != 0L) {
output.writeUInt64(13, equipGuid_);
output.writeUInt64(4, equipGuid_);
}
if (avatarGuid_ != 0L) {
output.writeUInt64(11, avatarGuid_);
}
unknownFields.writeTo(output);
}
@@ -324,17 +198,17 @@ public final class WearEquipRspOuterClass {
if (size != -1) return size;
size = 0;
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(6, avatarGuid_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(9, retcode_);
.computeInt32Size(2, retcode_);
}
if (equipGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(13, equipGuid_);
.computeUInt64Size(4, equipGuid_);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(11, avatarGuid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -351,12 +225,12 @@ public final class WearEquipRspOuterClass {
}
emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp other = (emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp) obj;
if (getEquipGuid()
!= other.getEquipGuid()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (getEquipGuid()
!= other.getEquipGuid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -368,14 +242,14 @@ public final class WearEquipRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + AVATARGUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (37 * hash) + EQUIPGUID_FIELD_NUMBER;
hash = (37 * hash) + EQUIP_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getEquipGuid());
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -472,6 +346,11 @@ public final class WearEquipRspOuterClass {
return builder;
}
/**
* <pre>
* Name: BHBOLAAJJFE
* CmdId: 629
* </pre>
*
* Protobuf type {@code WearEquipRsp}
*/
public static final class Builder extends
@@ -509,12 +388,12 @@ public final class WearEquipRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
equipGuid_ = 0L;
retcode_ = 0;
avatarGuid_ = 0L;
equipGuid_ = 0L;
return this;
}
@@ -541,9 +420,9 @@ public final class WearEquipRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp buildPartial() {
emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp result = new emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp(this);
result.equipGuid_ = equipGuid_;
result.retcode_ = retcode_;
result.avatarGuid_ = avatarGuid_;
result.equipGuid_ = equipGuid_;
onBuilt();
return result;
}
@@ -592,15 +471,15 @@ public final class WearEquipRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp other) {
if (other == emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp.getDefaultInstance()) return this;
if (other.getEquipGuid() != 0L) {
setEquipGuid(other.getEquipGuid());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
if (other.getEquipGuid() != 0L) {
setEquipGuid(other.getEquipGuid());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -630,9 +509,40 @@ public final class WearEquipRspOuterClass {
return this;
}
private long equipGuid_ ;
/**
* <code>uint64 equip_guid = 4;</code>
* @return The equipGuid.
*/
@java.lang.Override
public long getEquipGuid() {
return equipGuid_;
}
/**
* <code>uint64 equip_guid = 4;</code>
* @param value The equipGuid to set.
* @return This builder for chaining.
*/
public Builder setEquipGuid(long value) {
equipGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 equip_guid = 4;</code>
* @return This builder for chaining.
*/
public Builder clearEquipGuid() {
equipGuid_ = 0L;
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 9;</code>
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -640,7 +550,7 @@ public final class WearEquipRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 9;</code>
* <code>int32 retcode = 2;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -651,7 +561,7 @@ public final class WearEquipRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 9;</code>
* <code>int32 retcode = 2;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -663,7 +573,7 @@ public final class WearEquipRspOuterClass {
private long avatarGuid_ ;
/**
* <code>uint64 avatarGuid = 6;</code>
* <code>uint64 avatar_guid = 11;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -671,7 +581,7 @@ public final class WearEquipRspOuterClass {
return avatarGuid_;
}
/**
* <code>uint64 avatarGuid = 6;</code>
* <code>uint64 avatar_guid = 11;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
@@ -682,7 +592,7 @@ public final class WearEquipRspOuterClass {
return this;
}
/**
* <code>uint64 avatarGuid = 6;</code>
* <code>uint64 avatar_guid = 11;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
@@ -691,37 +601,6 @@ public final class WearEquipRspOuterClass {
onChanged();
return this;
}
private long equipGuid_ ;
/**
* <code>uint64 equipGuid = 13;</code>
* @return The equipGuid.
*/
@java.lang.Override
public long getEquipGuid() {
return equipGuid_;
}
/**
* <code>uint64 equipGuid = 13;</code>
* @param value The equipGuid to set.
* @return This builder for chaining.
*/
public Builder setEquipGuid(long value) {
equipGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 equipGuid = 13;</code>
* @return This builder for chaining.
*/
public Builder clearEquipGuid() {
equipGuid_ = 0L;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -789,11 +668,9 @@ public final class WearEquipRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\022WearEquipRsp.proto\"\227\001\n\014WearEquipRsp\022\017\n" +
"\007retcode\030\t \001(\005\022\022\n\navatarGuid\030\006 \001(\004\022\021\n\teq" +
"uipGuid\030\r \001(\004\"O\n\013MOMHFFAMGFM\022\010\n\004NONE\020\000\022\020" +
"\n\013PEPPOHPHJOJ\020\345\004\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNB" +
"KOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.net.pr" +
"\n\022WearEquipRsp.proto\"H\n\014WearEquipRsp\022\022\n\n" +
"equip_guid\030\004 \001(\004\022\017\n\007retcode\030\002 \001(\005\022\023\n\013ava" +
"tar_guid\030\013 \001(\004B\033\n\031emu.grasscutter.net.pr" +
"otob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -805,7 +682,7 @@ public final class WearEquipRspOuterClass {
internal_static_WearEquipRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_WearEquipRsp_descriptor,
new java.lang.String[] { "Retcode", "AvatarGuid", "EquipGuid", });
new java.lang.String[] { "EquipGuid", "Retcode", "AvatarGuid", });
}
// @@protoc_insertion_point(outer_class_scope)