Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-16 19:15:29 +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/AskAddFriendNotifyOuterClass.java
+92 -215
View File
@@ -19,27 +19,32 @@ public final class AskAddFriendNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.FriendBrief targetFriendBrief = 7;</code>
* <code>uint32 target_uid = 9;</code>
* @return The targetUid.
*/
int getTargetUid();
/**
* <code>.FriendBrief target_friend_brief = 3;</code>
* @return Whether the targetFriendBrief field is set.
*/
boolean hasTargetFriendBrief();
/**
* <code>.FriendBrief targetFriendBrief = 7;</code>
* <code>.FriendBrief target_friend_brief = 3;</code>
* @return The targetFriendBrief.
*/
emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief();
/**
* <code>.FriendBrief targetFriendBrief = 7;</code>
* <code>.FriendBrief target_friend_brief = 3;</code>
*/
emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder();
/**
* <code>uint32 targetUid = 8;</code>
* @return The targetUid.
*/
int getTargetUid();
}
/**
* <pre>
* Name: PCOJKOCFPIN
* CmdId: 4044
* </pre>
*
* Protobuf type {@code AskAddFriendNotify}
*/
public static final class AskAddFriendNotify extends
@@ -84,7 +89,7 @@ public final class AskAddFriendNotifyOuterClass {
case 0:
done = true;
break;
case 58: {
case 26: {
emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder subBuilder = null;
if (targetFriendBrief_ != null) {
subBuilder = targetFriendBrief_.toBuilder();
@@ -97,7 +102,7 @@ public final class AskAddFriendNotifyOuterClass {
break;
}
case 64: {
case 72: {
targetUid_ = input.readUInt32();
break;
@@ -134,141 +139,21 @@ public final class AskAddFriendNotifyOuterClass {
emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify.class, emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify.Builder.class);
}
public static final int TARGET_UID_FIELD_NUMBER = 9;
private int targetUid_;
/**
* Protobuf enum {@code AskAddFriendNotify.ACDJLMOMLPL}
* <code>uint32 target_uid = 9;</code>
* @return The targetUid.
*/
public enum ACDJLMOMLPL
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 4088;</code>
*/
PEPPOHPHJOJ(1, 4088),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final ACDJLMOMLPL DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 4088;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 4088;
/**
* <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 ACDJLMOMLPL 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 ACDJLMOMLPL forNumber(int value) {
switch (value) {
case 0: return NONE;
case 4088: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<ACDJLMOMLPL>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
ACDJLMOMLPL> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<ACDJLMOMLPL>() {
public ACDJLMOMLPL findValueByNumber(int number) {
return ACDJLMOMLPL.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.AskAddFriendNotifyOuterClass.AskAddFriendNotify.getDescriptor().getEnumTypes().get(0);
}
private static final ACDJLMOMLPL[] VALUES = getStaticValuesArray();
private static ACDJLMOMLPL[] getStaticValuesArray() {
return new ACDJLMOMLPL[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static ACDJLMOMLPL 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 ACDJLMOMLPL(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:AskAddFriendNotify.ACDJLMOMLPL)
@java.lang.Override
public int getTargetUid() {
return targetUid_;
}
public static final int TARGETFRIENDBRIEF_FIELD_NUMBER = 7;
public static final int TARGET_FRIEND_BRIEF_FIELD_NUMBER = 3;
private emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief targetFriendBrief_;
/**
* <code>.FriendBrief targetFriendBrief = 7;</code>
* <code>.FriendBrief target_friend_brief = 3;</code>
* @return Whether the targetFriendBrief field is set.
*/
@java.lang.Override
@@ -276,7 +161,7 @@ public final class AskAddFriendNotifyOuterClass {
return targetFriendBrief_ != null;
}
/**
* <code>.FriendBrief targetFriendBrief = 7;</code>
* <code>.FriendBrief target_friend_brief = 3;</code>
* @return The targetFriendBrief.
*/
@java.lang.Override
@@ -284,24 +169,13 @@ public final class AskAddFriendNotifyOuterClass {
return targetFriendBrief_ == null ? emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance() : targetFriendBrief_;
}
/**
* <code>.FriendBrief targetFriendBrief = 7;</code>
* <code>.FriendBrief target_friend_brief = 3;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
return getTargetFriendBrief();
}
public static final int TARGETUID_FIELD_NUMBER = 8;
private int targetUid_;
/**
* <code>uint32 targetUid = 8;</code>
* @return The targetUid.
*/
@java.lang.Override
public int getTargetUid() {
return targetUid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -317,10 +191,10 @@ public final class AskAddFriendNotifyOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (targetFriendBrief_ != null) {
output.writeMessage(7, getTargetFriendBrief());
output.writeMessage(3, getTargetFriendBrief());
}
if (targetUid_ != 0) {
output.writeUInt32(8, targetUid_);
output.writeUInt32(9, targetUid_);
}
unknownFields.writeTo(output);
}
@@ -333,11 +207,11 @@ public final class AskAddFriendNotifyOuterClass {
size = 0;
if (targetFriendBrief_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(7, getTargetFriendBrief());
.computeMessageSize(3, getTargetFriendBrief());
}
if (targetUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, targetUid_);
.computeUInt32Size(9, targetUid_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -354,13 +228,13 @@ public final class AskAddFriendNotifyOuterClass {
}
emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify other = (emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify) obj;
if (getTargetUid()
!= other.getTargetUid()) return false;
if (hasTargetFriendBrief() != other.hasTargetFriendBrief()) return false;
if (hasTargetFriendBrief()) {
if (!getTargetFriendBrief()
.equals(other.getTargetFriendBrief())) return false;
}
if (getTargetUid()
!= other.getTargetUid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -372,12 +246,12 @@ public final class AskAddFriendNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
hash = (53 * hash) + getTargetUid();
if (hasTargetFriendBrief()) {
hash = (37 * hash) + TARGETFRIENDBRIEF_FIELD_NUMBER;
hash = (37 * hash) + TARGET_FRIEND_BRIEF_FIELD_NUMBER;
hash = (53 * hash) + getTargetFriendBrief().hashCode();
}
hash = (37 * hash) + TARGETUID_FIELD_NUMBER;
hash = (53 * hash) + getTargetUid();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -474,6 +348,11 @@ public final class AskAddFriendNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: PCOJKOCFPIN
* CmdId: 4044
* </pre>
*
* Protobuf type {@code AskAddFriendNotify}
*/
public static final class Builder extends
@@ -511,14 +390,14 @@ public final class AskAddFriendNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
targetUid_ = 0;
if (targetFriendBriefBuilder_ == null) {
targetFriendBrief_ = null;
} else {
targetFriendBrief_ = null;
targetFriendBriefBuilder_ = null;
}
targetUid_ = 0;
return this;
}
@@ -545,12 +424,12 @@ public final class AskAddFriendNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify buildPartial() {
emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify result = new emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify(this);
result.targetUid_ = targetUid_;
if (targetFriendBriefBuilder_ == null) {
result.targetFriendBrief_ = targetFriendBrief_;
} else {
result.targetFriendBrief_ = targetFriendBriefBuilder_.build();
}
result.targetUid_ = targetUid_;
onBuilt();
return result;
}
@@ -599,12 +478,12 @@ public final class AskAddFriendNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify other) {
if (other == emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify.getDefaultInstance()) return this;
if (other.hasTargetFriendBrief()) {
mergeTargetFriendBrief(other.getTargetFriendBrief());
}
if (other.getTargetUid() != 0) {
setTargetUid(other.getTargetUid());
}
if (other.hasTargetFriendBrief()) {
mergeTargetFriendBrief(other.getTargetFriendBrief());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -634,18 +513,49 @@ public final class AskAddFriendNotifyOuterClass {
return this;
}
private int targetUid_ ;
/**
* <code>uint32 target_uid = 9;</code>
* @return The targetUid.
*/
@java.lang.Override
public int getTargetUid() {
return targetUid_;
}
/**
* <code>uint32 target_uid = 9;</code>
* @param value The targetUid to set.
* @return This builder for chaining.
*/
public Builder setTargetUid(int value) {
targetUid_ = value;
onChanged();
return this;
}
/**
* <code>uint32 target_uid = 9;</code>
* @return This builder for chaining.
*/
public Builder clearTargetUid() {
targetUid_ = 0;
onChanged();
return this;
}
private emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief targetFriendBrief_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> targetFriendBriefBuilder_;
/**
* <code>.FriendBrief targetFriendBrief = 7;</code>
* <code>.FriendBrief target_friend_brief = 3;</code>
* @return Whether the targetFriendBrief field is set.
*/
public boolean hasTargetFriendBrief() {
return targetFriendBriefBuilder_ != null || targetFriendBrief_ != null;
}
/**
* <code>.FriendBrief targetFriendBrief = 7;</code>
* <code>.FriendBrief target_friend_brief = 3;</code>
* @return The targetFriendBrief.
*/
public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief() {
@@ -656,7 +566,7 @@ public final class AskAddFriendNotifyOuterClass {
}
}
/**
* <code>.FriendBrief targetFriendBrief = 7;</code>
* <code>.FriendBrief target_friend_brief = 3;</code>
*/
public Builder setTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
if (targetFriendBriefBuilder_ == null) {
@@ -672,7 +582,7 @@ public final class AskAddFriendNotifyOuterClass {
return this;
}
/**
* <code>.FriendBrief targetFriendBrief = 7;</code>
* <code>.FriendBrief target_friend_brief = 3;</code>
*/
public Builder setTargetFriendBrief(
emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -686,7 +596,7 @@ public final class AskAddFriendNotifyOuterClass {
return this;
}
/**
* <code>.FriendBrief targetFriendBrief = 7;</code>
* <code>.FriendBrief target_friend_brief = 3;</code>
*/
public Builder mergeTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
if (targetFriendBriefBuilder_ == null) {
@@ -704,7 +614,7 @@ public final class AskAddFriendNotifyOuterClass {
return this;
}
/**
* <code>.FriendBrief targetFriendBrief = 7;</code>
* <code>.FriendBrief target_friend_brief = 3;</code>
*/
public Builder clearTargetFriendBrief() {
if (targetFriendBriefBuilder_ == null) {
@@ -718,7 +628,7 @@ public final class AskAddFriendNotifyOuterClass {
return this;
}
/**
* <code>.FriendBrief targetFriendBrief = 7;</code>
* <code>.FriendBrief target_friend_brief = 3;</code>
*/
public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder getTargetFriendBriefBuilder() {
@@ -726,7 +636,7 @@ public final class AskAddFriendNotifyOuterClass {
return getTargetFriendBriefFieldBuilder().getBuilder();
}
/**
* <code>.FriendBrief targetFriendBrief = 7;</code>
* <code>.FriendBrief target_friend_brief = 3;</code>
*/
public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
if (targetFriendBriefBuilder_ != null) {
@@ -737,7 +647,7 @@ public final class AskAddFriendNotifyOuterClass {
}
}
/**
* <code>.FriendBrief targetFriendBrief = 7;</code>
* <code>.FriendBrief target_friend_brief = 3;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder>
@@ -752,37 +662,6 @@ public final class AskAddFriendNotifyOuterClass {
}
return targetFriendBriefBuilder_;
}
private int targetUid_ ;
/**
* <code>uint32 targetUid = 8;</code>
* @return The targetUid.
*/
@java.lang.Override
public int getTargetUid() {
return targetUid_;
}
/**
* <code>uint32 targetUid = 8;</code>
* @param value The targetUid to set.
* @return This builder for chaining.
*/
public Builder setTargetUid(int value) {
targetUid_ = value;
onChanged();
return this;
}
/**
* <code>uint32 targetUid = 8;</code>
* @return This builder for chaining.
*/
public Builder clearTargetUid() {
targetUid_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -851,12 +730,10 @@ public final class AskAddFriendNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\030AskAddFriendNotify.proto\032\021FriendBrief." +
"proto\"\241\001\n\022AskAddFriendNotify\022\'\n\021targetFr" +
"iendBrief\030\007 \001(\0132\014.FriendBrief\022\021\n\ttargetU" +
"id\030\010 \001(\r\"O\n\013ACDJLMOMLPL\022\010\n\004NONE\020\000\022\020\n\013PEP" +
"POHPHJOJ\020\370\037\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMP" +
"OEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.net.protob\006" +
"proto3"
"proto\"S\n\022AskAddFriendNotify\022\022\n\ntarget_ui" +
"d\030\t \001(\r\022)\n\023target_friend_brief\030\003 \001(\0132\014.F" +
"riendBriefB\033\n\031emu.grasscutter.net.protob" +
"\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -868,7 +745,7 @@ public final class AskAddFriendNotifyOuterClass {
internal_static_AskAddFriendNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AskAddFriendNotify_descriptor,
new java.lang.String[] { "TargetFriendBrief", "TargetUid", });
new java.lang.String[] { "TargetUid", "TargetFriendBrief", });
emu.grasscutter.net.proto.FriendBriefOuterClass.getDescriptor();
}