Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-18 23:41:17 +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/AvatarEquipAffixStartNotifyOuterClass.java
+104 -226
View File
@@ -19,27 +19,32 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.AvatarEquipAffixInfo equipAffixInfo = 5;</code>
* <code>uint64 avatar_guid = 5;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* @return Whether the equipAffixInfo field is set.
*/
boolean hasEquipAffixInfo();
/**
* <code>.AvatarEquipAffixInfo equipAffixInfo = 5;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* @return The equipAffixInfo.
*/
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo getEquipAffixInfo();
/**
* <code>.AvatarEquipAffixInfo equipAffixInfo = 5;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
*/
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder();
/**
* <code>uint64 avatarGuid = 15;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
}
/**
* <pre>
* Name: GDBEDIEBFFL
* CmdId: 1666
* </pre>
*
* Protobuf type {@code AvatarEquipAffixStartNotify}
*/
public static final class AvatarEquipAffixStartNotify extends
@@ -84,7 +89,12 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
case 0:
done = true;
break;
case 42: {
case 40: {
avatarGuid_ = input.readUInt64();
break;
}
case 82: {
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder subBuilder = null;
if (equipAffixInfo_ != null) {
subBuilder = equipAffixInfo_.toBuilder();
@@ -97,11 +107,6 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
break;
}
case 120: {
avatarGuid_ = input.readUInt64();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -134,141 +139,21 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.class, emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.Builder.class);
}
public static final int AVATAR_GUID_FIELD_NUMBER = 5;
private long avatarGuid_;
/**
* Protobuf enum {@code AvatarEquipAffixStartNotify.CIBOKBFGLBI}
* <code>uint64 avatar_guid = 5;</code>
* @return The avatarGuid.
*/
public enum CIBOKBFGLBI
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1602;</code>
*/
PEPPOHPHJOJ(1, 1602),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final CIBOKBFGLBI DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1602;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1602;
/**
* <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 CIBOKBFGLBI 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 CIBOKBFGLBI forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1602: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<CIBOKBFGLBI>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
CIBOKBFGLBI> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<CIBOKBFGLBI>() {
public CIBOKBFGLBI findValueByNumber(int number) {
return CIBOKBFGLBI.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.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.getDescriptor().getEnumTypes().get(0);
}
private static final CIBOKBFGLBI[] VALUES = getStaticValuesArray();
private static CIBOKBFGLBI[] getStaticValuesArray() {
return new CIBOKBFGLBI[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static CIBOKBFGLBI 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 CIBOKBFGLBI(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:AvatarEquipAffixStartNotify.CIBOKBFGLBI)
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
public static final int EQUIPAFFIXINFO_FIELD_NUMBER = 5;
public static final int EQUIP_AFFIX_INFO_FIELD_NUMBER = 10;
private emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo equipAffixInfo_;
/**
* <code>.AvatarEquipAffixInfo equipAffixInfo = 5;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* @return Whether the equipAffixInfo field is set.
*/
@java.lang.Override
@@ -276,7 +161,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return equipAffixInfo_ != null;
}
/**
* <code>.AvatarEquipAffixInfo equipAffixInfo = 5;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* @return The equipAffixInfo.
*/
@java.lang.Override
@@ -284,24 +169,13 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return equipAffixInfo_ == null ? emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.getDefaultInstance() : equipAffixInfo_;
}
/**
* <code>.AvatarEquipAffixInfo equipAffixInfo = 5;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder() {
return getEquipAffixInfo();
}
public static final int AVATARGUID_FIELD_NUMBER = 15;
private long avatarGuid_;
/**
* <code>uint64 avatarGuid = 15;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -316,11 +190,11 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (equipAffixInfo_ != null) {
output.writeMessage(5, getEquipAffixInfo());
}
if (avatarGuid_ != 0L) {
output.writeUInt64(15, avatarGuid_);
output.writeUInt64(5, avatarGuid_);
}
if (equipAffixInfo_ != null) {
output.writeMessage(10, getEquipAffixInfo());
}
unknownFields.writeTo(output);
}
@@ -331,13 +205,13 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (equipAffixInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, getEquipAffixInfo());
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(15, avatarGuid_);
.computeUInt64Size(5, avatarGuid_);
}
if (equipAffixInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(10, getEquipAffixInfo());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -354,13 +228,13 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
}
emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify other = (emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify) obj;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (hasEquipAffixInfo() != other.hasEquipAffixInfo()) return false;
if (hasEquipAffixInfo()) {
if (!getEquipAffixInfo()
.equals(other.getEquipAffixInfo())) return false;
}
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -372,13 +246,13 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (hasEquipAffixInfo()) {
hash = (37 * hash) + EQUIPAFFIXINFO_FIELD_NUMBER;
hash = (53 * hash) + getEquipAffixInfo().hashCode();
}
hash = (37 * hash) + AVATARGUID_FIELD_NUMBER;
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
if (hasEquipAffixInfo()) {
hash = (37 * hash) + EQUIP_AFFIX_INFO_FIELD_NUMBER;
hash = (53 * hash) + getEquipAffixInfo().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -475,6 +349,11 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: GDBEDIEBFFL
* CmdId: 1666
* </pre>
*
* Protobuf type {@code AvatarEquipAffixStartNotify}
*/
public static final class Builder extends
@@ -512,14 +391,14 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
avatarGuid_ = 0L;
if (equipAffixInfoBuilder_ == null) {
equipAffixInfo_ = null;
} else {
equipAffixInfo_ = null;
equipAffixInfoBuilder_ = null;
}
avatarGuid_ = 0L;
return this;
}
@@ -546,12 +425,12 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify buildPartial() {
emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify result = new emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify(this);
result.avatarGuid_ = avatarGuid_;
if (equipAffixInfoBuilder_ == null) {
result.equipAffixInfo_ = equipAffixInfo_;
} else {
result.equipAffixInfo_ = equipAffixInfoBuilder_.build();
}
result.avatarGuid_ = avatarGuid_;
onBuilt();
return result;
}
@@ -600,12 +479,12 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify other) {
if (other == emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.getDefaultInstance()) return this;
if (other.hasEquipAffixInfo()) {
mergeEquipAffixInfo(other.getEquipAffixInfo());
}
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
if (other.hasEquipAffixInfo()) {
mergeEquipAffixInfo(other.getEquipAffixInfo());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -635,18 +514,49 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return this;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatar_guid = 5;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatar_guid = 5;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuid(long value) {
avatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 avatar_guid = 5;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
private emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo equipAffixInfo_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder> equipAffixInfoBuilder_;
/**
* <code>.AvatarEquipAffixInfo equipAffixInfo = 5;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* @return Whether the equipAffixInfo field is set.
*/
public boolean hasEquipAffixInfo() {
return equipAffixInfoBuilder_ != null || equipAffixInfo_ != null;
}
/**
* <code>.AvatarEquipAffixInfo equipAffixInfo = 5;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
* @return The equipAffixInfo.
*/
public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo getEquipAffixInfo() {
@@ -657,7 +567,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
}
}
/**
* <code>.AvatarEquipAffixInfo equipAffixInfo = 5;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
*/
public Builder setEquipAffixInfo(emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo value) {
if (equipAffixInfoBuilder_ == null) {
@@ -673,7 +583,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return this;
}
/**
* <code>.AvatarEquipAffixInfo equipAffixInfo = 5;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
*/
public Builder setEquipAffixInfo(
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder builderForValue) {
@@ -687,7 +597,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return this;
}
/**
* <code>.AvatarEquipAffixInfo equipAffixInfo = 5;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
*/
public Builder mergeEquipAffixInfo(emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo value) {
if (equipAffixInfoBuilder_ == null) {
@@ -705,7 +615,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return this;
}
/**
* <code>.AvatarEquipAffixInfo equipAffixInfo = 5;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
*/
public Builder clearEquipAffixInfo() {
if (equipAffixInfoBuilder_ == null) {
@@ -719,7 +629,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return this;
}
/**
* <code>.AvatarEquipAffixInfo equipAffixInfo = 5;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
*/
public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder getEquipAffixInfoBuilder() {
@@ -727,7 +637,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
return getEquipAffixInfoFieldBuilder().getBuilder();
}
/**
* <code>.AvatarEquipAffixInfo equipAffixInfo = 5;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
*/
public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder() {
if (equipAffixInfoBuilder_ != null) {
@@ -738,7 +648,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
}
}
/**
* <code>.AvatarEquipAffixInfo equipAffixInfo = 5;</code>
* <code>.AvatarEquipAffixInfo equip_affix_info = 10;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder>
@@ -753,37 +663,6 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
}
return equipAffixInfoBuilder_;
}
private long avatarGuid_ ;
/**
* <code>uint64 avatarGuid = 15;</code>
* @return The avatarGuid.
*/
@java.lang.Override
public long getAvatarGuid() {
return avatarGuid_;
}
/**
* <code>uint64 avatarGuid = 15;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
public Builder setAvatarGuid(long value) {
avatarGuid_ = value;
onChanged();
return this;
}
/**
* <code>uint64 avatarGuid = 15;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
avatarGuid_ = 0L;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -852,12 +731,11 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n!AvatarEquipAffixStartNotify.proto\032\032Ava" +
"tarEquipAffixInfo.proto\"\261\001\n\033AvatarEquipA" +
"ffixStartNotify\022-\n\016equipAffixInfo\030\005 \001(\0132" +
"\025.AvatarEquipAffixInfo\022\022\n\navatarGuid\030\017 \001" +
"(\004\"O\n\013CIBOKBFGLBI\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJ" +
"OJ\020\302\014\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032" +
"\002\020\001B\033\n\031emu.grasscutter.net.protob\006proto3"
"tarEquipAffixInfo.proto\"c\n\033AvatarEquipAf" +
"fixStartNotify\022\023\n\013avatar_guid\030\005 \001(\004\022/\n\020e" +
"quip_affix_info\030\n \001(\0132\025.AvatarEquipAffix" +
"InfoB\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -869,7 +747,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
internal_static_AvatarEquipAffixStartNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarEquipAffixStartNotify_descriptor,
new java.lang.String[] { "EquipAffixInfo", "AvatarGuid", });
new java.lang.String[] { "AvatarGuid", "EquipAffixInfo", });
emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.getDescriptor();
}