Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-08 15:33:39 +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/VehicleMemberOuterClass.java
+19 -11
View File
@@ -25,7 +25,7 @@ public final class VehicleMemberOuterClass {
int getUid();
/**
* <code>uint64 avatarGuid = 2;</code>
* <code>uint64 avatar_guid = 2;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
@@ -37,6 +37,10 @@ public final class VehicleMemberOuterClass {
int getPos();
}
/**
* <pre>
* Name: ENANJKOACDB
* </pre>
*
* Protobuf type {@code VehicleMember}
*/
public static final class VehicleMember extends
@@ -139,10 +143,10 @@ public final class VehicleMemberOuterClass {
return uid_;
}
public static final int AVATARGUID_FIELD_NUMBER = 2;
public static final int AVATAR_GUID_FIELD_NUMBER = 2;
private long avatarGuid_;
/**
* <code>uint64 avatarGuid = 2;</code>
* <code>uint64 avatar_guid = 2;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -239,7 +243,7 @@ public final class VehicleMemberOuterClass {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + UID_FIELD_NUMBER;
hash = (53 * hash) + getUid();
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) + POS_FIELD_NUMBER;
@@ -340,6 +344,10 @@ public final class VehicleMemberOuterClass {
return builder;
}
/**
* <pre>
* Name: ENANJKOACDB
* </pre>
*
* Protobuf type {@code VehicleMember}
*/
public static final class Builder extends
@@ -531,7 +539,7 @@ public final class VehicleMemberOuterClass {
private long avatarGuid_ ;
/**
* <code>uint64 avatarGuid = 2;</code>
* <code>uint64 avatar_guid = 2;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -539,7 +547,7 @@ public final class VehicleMemberOuterClass {
return avatarGuid_;
}
/**
* <code>uint64 avatarGuid = 2;</code>
* <code>uint64 avatar_guid = 2;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
@@ -550,7 +558,7 @@ public final class VehicleMemberOuterClass {
return this;
}
/**
* <code>uint64 avatarGuid = 2;</code>
* <code>uint64 avatar_guid = 2;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
@@ -657,10 +665,10 @@ public final class VehicleMemberOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\023VehicleMember.proto\"=\n\rVehicleMember\022\013" +
"\n\003uid\030\001 \001(\r\022\022\n\navatarGuid\030\002 \001(\004\022\013\n\003pos\030\003" +
" \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
"\n\023VehicleMember.proto\">\n\rVehicleMember\022\013" +
"\n\003uid\030\001 \001(\r\022\023\n\013avatar_guid\030\002 \001(\004\022\013\n\003pos\030" +
"\003 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
"o3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,