Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-08 03:43:43 +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/DeleteFriendRspOuterClass.java
+93 -216
View File
@@ -19,18 +19,23 @@ public final class DeleteFriendRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 targetUid = 11;</code>
* @return The targetUid.
*/
int getTargetUid();
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 15;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 target_uid = 7;</code>
* @return The targetUid.
*/
int getTargetUid();
}
/**
* <pre>
* Name: ALPPJOBNODK
* CmdId: 4007
* </pre>
*
* Protobuf type {@code DeleteFriendRsp}
*/
public static final class DeleteFriendRsp extends
@@ -75,16 +80,16 @@ public final class DeleteFriendRspOuterClass {
case 0:
done = true;
break;
case 24: {
retcode_ = input.readInt32();
break;
}
case 88: {
case 56: {
targetUid_ = input.readUInt32();
break;
}
case 120: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -117,152 +122,10 @@ public final class DeleteFriendRspOuterClass {
emu.grasscutter.net.proto.DeleteFriendRspOuterClass.DeleteFriendRsp.class, emu.grasscutter.net.proto.DeleteFriendRspOuterClass.DeleteFriendRsp.Builder.class);
}
/**
* Protobuf enum {@code DeleteFriendRsp.HJECHGCDNFI}
*/
public enum HJECHGCDNFI
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 4029;</code>
*/
PEPPOHPHJOJ(1, 4029),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final HJECHGCDNFI DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 4029;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 4029;
/**
* <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 HJECHGCDNFI 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 HJECHGCDNFI forNumber(int value) {
switch (value) {
case 0: return NONE;
case 4029: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<HJECHGCDNFI>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
HJECHGCDNFI> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<HJECHGCDNFI>() {
public HJECHGCDNFI findValueByNumber(int number) {
return HJECHGCDNFI.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.DeleteFriendRspOuterClass.DeleteFriendRsp.getDescriptor().getEnumTypes().get(0);
}
private static final HJECHGCDNFI[] VALUES = getStaticValuesArray();
private static HJECHGCDNFI[] getStaticValuesArray() {
return new HJECHGCDNFI[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static HJECHGCDNFI 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 HJECHGCDNFI(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:DeleteFriendRsp.HJECHGCDNFI)
}
public static final int TARGETUID_FIELD_NUMBER = 11;
private int targetUid_;
/**
* <code>uint32 targetUid = 11;</code>
* @return The targetUid.
*/
@java.lang.Override
public int getTargetUid() {
return targetUid_;
}
public static final int RETCODE_FIELD_NUMBER = 3;
public static final int RETCODE_FIELD_NUMBER = 15;
private int retcode_;
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 15;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -270,6 +133,17 @@ public final class DeleteFriendRspOuterClass {
return retcode_;
}
public static final int TARGET_UID_FIELD_NUMBER = 7;
private int targetUid_;
/**
* <code>uint32 target_uid = 7;</code>
* @return The targetUid.
*/
@java.lang.Override
public int getTargetUid() {
return targetUid_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -284,11 +158,11 @@ public final class DeleteFriendRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(3, retcode_);
}
if (targetUid_ != 0) {
output.writeUInt32(11, targetUid_);
output.writeUInt32(7, targetUid_);
}
if (retcode_ != 0) {
output.writeInt32(15, retcode_);
}
unknownFields.writeTo(output);
}
@@ -299,13 +173,13 @@ public final class DeleteFriendRspOuterClass {
if (size != -1) return size;
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(3, retcode_);
}
if (targetUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, targetUid_);
.computeUInt32Size(7, targetUid_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(15, retcode_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -322,10 +196,10 @@ public final class DeleteFriendRspOuterClass {
}
emu.grasscutter.net.proto.DeleteFriendRspOuterClass.DeleteFriendRsp other = (emu.grasscutter.net.proto.DeleteFriendRspOuterClass.DeleteFriendRsp) obj;
if (getTargetUid()
!= other.getTargetUid()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (getTargetUid()
!= other.getTargetUid()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -337,10 +211,10 @@ public final class DeleteFriendRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TARGETUID_FIELD_NUMBER;
hash = (53 * hash) + getTargetUid();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
hash = (53 * hash) + getTargetUid();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -437,6 +311,11 @@ public final class DeleteFriendRspOuterClass {
return builder;
}
/**
* <pre>
* Name: ALPPJOBNODK
* CmdId: 4007
* </pre>
*
* Protobuf type {@code DeleteFriendRsp}
*/
public static final class Builder extends
@@ -474,10 +353,10 @@ public final class DeleteFriendRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
targetUid_ = 0;
retcode_ = 0;
targetUid_ = 0;
return this;
}
@@ -504,8 +383,8 @@ public final class DeleteFriendRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.DeleteFriendRspOuterClass.DeleteFriendRsp buildPartial() {
emu.grasscutter.net.proto.DeleteFriendRspOuterClass.DeleteFriendRsp result = new emu.grasscutter.net.proto.DeleteFriendRspOuterClass.DeleteFriendRsp(this);
result.targetUid_ = targetUid_;
result.retcode_ = retcode_;
result.targetUid_ = targetUid_;
onBuilt();
return result;
}
@@ -554,12 +433,12 @@ public final class DeleteFriendRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.DeleteFriendRspOuterClass.DeleteFriendRsp other) {
if (other == emu.grasscutter.net.proto.DeleteFriendRspOuterClass.DeleteFriendRsp.getDefaultInstance()) return this;
if (other.getTargetUid() != 0) {
setTargetUid(other.getTargetUid());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getTargetUid() != 0) {
setTargetUid(other.getTargetUid());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -589,40 +468,9 @@ public final class DeleteFriendRspOuterClass {
return this;
}
private int targetUid_ ;
/**
* <code>uint32 targetUid = 11;</code>
* @return The targetUid.
*/
@java.lang.Override
public int getTargetUid() {
return targetUid_;
}
/**
* <code>uint32 targetUid = 11;</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 = 11;</code>
* @return This builder for chaining.
*/
public Builder clearTargetUid() {
targetUid_ = 0;
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 15;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -630,7 +478,7 @@ public final class DeleteFriendRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 15;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -641,7 +489,7 @@ public final class DeleteFriendRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 3;</code>
* <code>int32 retcode = 15;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -650,6 +498,37 @@ public final class DeleteFriendRspOuterClass {
onChanged();
return this;
}
private int targetUid_ ;
/**
* <code>uint32 target_uid = 7;</code>
* @return The targetUid.
*/
@java.lang.Override
public int getTargetUid() {
return targetUid_;
}
/**
* <code>uint32 target_uid = 7;</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 = 7;</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) {
@@ -717,11 +596,9 @@ public final class DeleteFriendRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\025DeleteFriendRsp.proto\"\206\001\n\017DeleteFriend" +
"Rsp\022\021\n\ttargetUid\030\013 \001(\r\022\017\n\007retcode\030\003 \001(\005\"" +
"O\n\013HJECHGCDNFI\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020" +
"\275\037\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001" +
"B\033\n\031emu.grasscutter.net.protob\006proto3"
"\n\025DeleteFriendRsp.proto\"6\n\017DeleteFriendR" +
"sp\022\017\n\007retcode\030\017 \001(\005\022\022\n\ntarget_uid\030\007 \001(\rB" +
"\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -732,7 +609,7 @@ public final class DeleteFriendRspOuterClass {
internal_static_DeleteFriendRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_DeleteFriendRsp_descriptor,
new java.lang.String[] { "TargetUid", "Retcode", });
new java.lang.String[] { "Retcode", "TargetUid", });
}
// @@protoc_insertion_point(outer_class_scope)