Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-18 13:09:54 +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/AvatarSkillMaxChargeCountNotifyOuterClass.java
+50 -173
View File
@@ -19,24 +19,29 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 skillId = 3;</code>
* <code>uint32 skill_id = 3;</code>
* @return The skillId.
*/
int getSkillId();
/**
* <code>uint64 avatarGuid = 7;</code>
* <code>uint64 avatar_guid = 14;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>uint32 maxChargeCount = 1;</code>
* <code>uint32 max_charge_count = 9;</code>
* @return The maxChargeCount.
*/
int getMaxChargeCount();
}
/**
* <pre>
* Name: GBCNKEKBGKI
* CmdId: 1072
* </pre>
*
* Protobuf type {@code AvatarSkillMaxChargeCountNotify}
*/
public static final class AvatarSkillMaxChargeCountNotify extends
@@ -81,17 +86,17 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
case 0:
done = true;
break;
case 8: {
maxChargeCount_ = input.readUInt32();
break;
}
case 24: {
skillId_ = input.readUInt32();
break;
}
case 56: {
case 72: {
maxChargeCount_ = input.readUInt32();
break;
}
case 112: {
avatarGuid_ = input.readUInt64();
break;
@@ -128,141 +133,10 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify.class, emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify.Builder.class);
}
/**
* Protobuf enum {@code AvatarSkillMaxChargeCountNotify.GJOILNCPKPJ}
*/
public enum GJOILNCPKPJ
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1080;</code>
*/
PEPPOHPHJOJ(1, 1080),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final GJOILNCPKPJ DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1080;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1080;
/**
* <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 GJOILNCPKPJ 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 GJOILNCPKPJ forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1080: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<GJOILNCPKPJ>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
GJOILNCPKPJ> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<GJOILNCPKPJ>() {
public GJOILNCPKPJ findValueByNumber(int number) {
return GJOILNCPKPJ.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.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify.getDescriptor().getEnumTypes().get(0);
}
private static final GJOILNCPKPJ[] VALUES = getStaticValuesArray();
private static GJOILNCPKPJ[] getStaticValuesArray() {
return new GJOILNCPKPJ[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static GJOILNCPKPJ 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 GJOILNCPKPJ(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:AvatarSkillMaxChargeCountNotify.GJOILNCPKPJ)
}
public static final int SKILLID_FIELD_NUMBER = 3;
public static final int SKILL_ID_FIELD_NUMBER = 3;
private int skillId_;
/**
* <code>uint32 skillId = 3;</code>
* <code>uint32 skill_id = 3;</code>
* @return The skillId.
*/
@java.lang.Override
@@ -270,10 +144,10 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
return skillId_;
}
public static final int AVATARGUID_FIELD_NUMBER = 7;
public static final int AVATAR_GUID_FIELD_NUMBER = 14;
private long avatarGuid_;
/**
* <code>uint64 avatarGuid = 7;</code>
* <code>uint64 avatar_guid = 14;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -281,10 +155,10 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
return avatarGuid_;
}
public static final int MAXCHARGECOUNT_FIELD_NUMBER = 1;
public static final int MAX_CHARGE_COUNT_FIELD_NUMBER = 9;
private int maxChargeCount_;
/**
* <code>uint32 maxChargeCount = 1;</code>
* <code>uint32 max_charge_count = 9;</code>
* @return The maxChargeCount.
*/
@java.lang.Override
@@ -306,14 +180,14 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (maxChargeCount_ != 0) {
output.writeUInt32(1, maxChargeCount_);
}
if (skillId_ != 0) {
output.writeUInt32(3, skillId_);
}
if (maxChargeCount_ != 0) {
output.writeUInt32(9, maxChargeCount_);
}
if (avatarGuid_ != 0L) {
output.writeUInt64(7, avatarGuid_);
output.writeUInt64(14, avatarGuid_);
}
unknownFields.writeTo(output);
}
@@ -324,17 +198,17 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (maxChargeCount_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, maxChargeCount_);
}
if (skillId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, skillId_);
}
if (maxChargeCount_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, maxChargeCount_);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(7, avatarGuid_);
.computeUInt64Size(14, avatarGuid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -368,12 +242,12 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SKILLID_FIELD_NUMBER;
hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
hash = (53 * hash) + getSkillId();
hash = (37 * hash) + AVATARGUID_FIELD_NUMBER;
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (37 * hash) + MAXCHARGECOUNT_FIELD_NUMBER;
hash = (37 * hash) + MAX_CHARGE_COUNT_FIELD_NUMBER;
hash = (53 * hash) + getMaxChargeCount();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -471,6 +345,11 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: GBCNKEKBGKI
* CmdId: 1072
* </pre>
*
* Protobuf type {@code AvatarSkillMaxChargeCountNotify}
*/
public static final class Builder extends
@@ -631,7 +510,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
private int skillId_ ;
/**
* <code>uint32 skillId = 3;</code>
* <code>uint32 skill_id = 3;</code>
* @return The skillId.
*/
@java.lang.Override
@@ -639,7 +518,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
return skillId_;
}
/**
* <code>uint32 skillId = 3;</code>
* <code>uint32 skill_id = 3;</code>
* @param value The skillId to set.
* @return This builder for chaining.
*/
@@ -650,7 +529,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
return this;
}
/**
* <code>uint32 skillId = 3;</code>
* <code>uint32 skill_id = 3;</code>
* @return This builder for chaining.
*/
public Builder clearSkillId() {
@@ -662,7 +541,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
private long avatarGuid_ ;
/**
* <code>uint64 avatarGuid = 7;</code>
* <code>uint64 avatar_guid = 14;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -670,7 +549,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
return avatarGuid_;
}
/**
* <code>uint64 avatarGuid = 7;</code>
* <code>uint64 avatar_guid = 14;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
@@ -681,7 +560,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
return this;
}
/**
* <code>uint64 avatarGuid = 7;</code>
* <code>uint64 avatar_guid = 14;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
@@ -693,7 +572,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
private int maxChargeCount_ ;
/**
* <code>uint32 maxChargeCount = 1;</code>
* <code>uint32 max_charge_count = 9;</code>
* @return The maxChargeCount.
*/
@java.lang.Override
@@ -701,7 +580,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
return maxChargeCount_;
}
/**
* <code>uint32 maxChargeCount = 1;</code>
* <code>uint32 max_charge_count = 9;</code>
* @param value The maxChargeCount to set.
* @return This builder for chaining.
*/
@@ -712,7 +591,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
return this;
}
/**
* <code>uint32 maxChargeCount = 1;</code>
* <code>uint32 max_charge_count = 9;</code>
* @return This builder for chaining.
*/
public Builder clearMaxChargeCount() {
@@ -789,12 +668,10 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n%AvatarSkillMaxChargeCountNotify.proto\"" +
"\257\001\n\037AvatarSkillMaxChargeCountNotify\022\017\n\007s" +
"killId\030\003 \001(\r\022\022\n\navatarGuid\030\007 \001(\004\022\026\n\016maxC" +
"hargeCount\030\001 \001(\r\"O\n\013GJOILNCPKPJ\022\010\n\004NONE\020" +
"\000\022\020\n\013PEPPOHPHJOJ\020\270\010\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013" +
"NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.net" +
".protob\006proto3"
"b\n\037AvatarSkillMaxChargeCountNotify\022\020\n\010sk" +
"ill_id\030\003 \001(\r\022\023\n\013avatar_guid\030\016 \001(\004\022\030\n\020max" +
"_charge_count\030\t \001(\rB\033\n\031emu.grasscutter.n" +
"et.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,