Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 22:30:02 +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/DelBackupAvatarTeamRspOuterClass.java
+94 -217
View File
@@ -19,18 +19,23 @@ public final class DelBackupAvatarTeamRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 backupAvatarTeamId = 11;</code>
* @return The backupAvatarTeamId.
*/
int getBackupAvatarTeamId();
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 backup_avatar_team_id = 15;</code>
* @return The backupAvatarTeamId.
*/
int getBackupAvatarTeamId();
}
/**
* <pre>
* Name: MPCJMAGGPMG
* CmdId: 1615
* </pre>
*
* Protobuf type {@code DelBackupAvatarTeamRsp}
*/
public static final class DelBackupAvatarTeamRsp extends
@@ -75,16 +80,16 @@ public final class DelBackupAvatarTeamRspOuterClass {
case 0:
done = true;
break;
case 88: {
backupAvatarTeamId_ = input.readUInt32();
break;
}
case 96: {
case 16: {
retcode_ = input.readInt32();
break;
}
case 120: {
backupAvatarTeamId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -117,152 +122,10 @@ public final class DelBackupAvatarTeamRspOuterClass {
emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp.class, emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp.Builder.class);
}
/**
* Protobuf enum {@code DelBackupAvatarTeamRsp.HMFPBAACAFA}
*/
public enum HMFPBAACAFA
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1756;</code>
*/
PEPPOHPHJOJ(1, 1756),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final HMFPBAACAFA DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1756;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1756;
/**
* <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 HMFPBAACAFA 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 HMFPBAACAFA forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1756: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<HMFPBAACAFA>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
HMFPBAACAFA> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<HMFPBAACAFA>() {
public HMFPBAACAFA findValueByNumber(int number) {
return HMFPBAACAFA.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.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp.getDescriptor().getEnumTypes().get(0);
}
private static final HMFPBAACAFA[] VALUES = getStaticValuesArray();
private static HMFPBAACAFA[] getStaticValuesArray() {
return new HMFPBAACAFA[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static HMFPBAACAFA 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 HMFPBAACAFA(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:DelBackupAvatarTeamRsp.HMFPBAACAFA)
}
public static final int BACKUPAVATARTEAMID_FIELD_NUMBER = 11;
private int backupAvatarTeamId_;
/**
* <code>uint32 backupAvatarTeamId = 11;</code>
* @return The backupAvatarTeamId.
*/
@java.lang.Override
public int getBackupAvatarTeamId() {
return backupAvatarTeamId_;
}
public static final int RETCODE_FIELD_NUMBER = 12;
public static final int RETCODE_FIELD_NUMBER = 2;
private int retcode_;
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -270,6 +133,17 @@ public final class DelBackupAvatarTeamRspOuterClass {
return retcode_;
}
public static final int BACKUP_AVATAR_TEAM_ID_FIELD_NUMBER = 15;
private int backupAvatarTeamId_;
/**
* <code>uint32 backup_avatar_team_id = 15;</code>
* @return The backupAvatarTeamId.
*/
@java.lang.Override
public int getBackupAvatarTeamId() {
return backupAvatarTeamId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -284,11 +158,11 @@ public final class DelBackupAvatarTeamRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (backupAvatarTeamId_ != 0) {
output.writeUInt32(11, backupAvatarTeamId_);
}
if (retcode_ != 0) {
output.writeInt32(12, retcode_);
output.writeInt32(2, retcode_);
}
if (backupAvatarTeamId_ != 0) {
output.writeUInt32(15, backupAvatarTeamId_);
}
unknownFields.writeTo(output);
}
@@ -299,13 +173,13 @@ public final class DelBackupAvatarTeamRspOuterClass {
if (size != -1) return size;
size = 0;
if (backupAvatarTeamId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, backupAvatarTeamId_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(12, retcode_);
.computeInt32Size(2, retcode_);
}
if (backupAvatarTeamId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, backupAvatarTeamId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -322,10 +196,10 @@ public final class DelBackupAvatarTeamRspOuterClass {
}
emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp other = (emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp) obj;
if (getBackupAvatarTeamId()
!= other.getBackupAvatarTeamId()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (getBackupAvatarTeamId()
!= other.getBackupAvatarTeamId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -337,10 +211,10 @@ public final class DelBackupAvatarTeamRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + BACKUPAVATARTEAMID_FIELD_NUMBER;
hash = (53 * hash) + getBackupAvatarTeamId();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + BACKUP_AVATAR_TEAM_ID_FIELD_NUMBER;
hash = (53 * hash) + getBackupAvatarTeamId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -437,6 +311,11 @@ public final class DelBackupAvatarTeamRspOuterClass {
return builder;
}
/**
* <pre>
* Name: MPCJMAGGPMG
* CmdId: 1615
* </pre>
*
* Protobuf type {@code DelBackupAvatarTeamRsp}
*/
public static final class Builder extends
@@ -474,10 +353,10 @@ public final class DelBackupAvatarTeamRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
backupAvatarTeamId_ = 0;
retcode_ = 0;
backupAvatarTeamId_ = 0;
return this;
}
@@ -504,8 +383,8 @@ public final class DelBackupAvatarTeamRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp buildPartial() {
emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp result = new emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp(this);
result.backupAvatarTeamId_ = backupAvatarTeamId_;
result.retcode_ = retcode_;
result.backupAvatarTeamId_ = backupAvatarTeamId_;
onBuilt();
return result;
}
@@ -554,12 +433,12 @@ public final class DelBackupAvatarTeamRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp other) {
if (other == emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp.getDefaultInstance()) return this;
if (other.getBackupAvatarTeamId() != 0) {
setBackupAvatarTeamId(other.getBackupAvatarTeamId());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getBackupAvatarTeamId() != 0) {
setBackupAvatarTeamId(other.getBackupAvatarTeamId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -589,40 +468,9 @@ public final class DelBackupAvatarTeamRspOuterClass {
return this;
}
private int backupAvatarTeamId_ ;
/**
* <code>uint32 backupAvatarTeamId = 11;</code>
* @return The backupAvatarTeamId.
*/
@java.lang.Override
public int getBackupAvatarTeamId() {
return backupAvatarTeamId_;
}
/**
* <code>uint32 backupAvatarTeamId = 11;</code>
* @param value The backupAvatarTeamId to set.
* @return This builder for chaining.
*/
public Builder setBackupAvatarTeamId(int value) {
backupAvatarTeamId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 backupAvatarTeamId = 11;</code>
* @return This builder for chaining.
*/
public Builder clearBackupAvatarTeamId() {
backupAvatarTeamId_ = 0;
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 2;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -630,7 +478,7 @@ public final class DelBackupAvatarTeamRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 2;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -641,7 +489,7 @@ public final class DelBackupAvatarTeamRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 12;</code>
* <code>int32 retcode = 2;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -650,6 +498,37 @@ public final class DelBackupAvatarTeamRspOuterClass {
onChanged();
return this;
}
private int backupAvatarTeamId_ ;
/**
* <code>uint32 backup_avatar_team_id = 15;</code>
* @return The backupAvatarTeamId.
*/
@java.lang.Override
public int getBackupAvatarTeamId() {
return backupAvatarTeamId_;
}
/**
* <code>uint32 backup_avatar_team_id = 15;</code>
* @param value The backupAvatarTeamId to set.
* @return This builder for chaining.
*/
public Builder setBackupAvatarTeamId(int value) {
backupAvatarTeamId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 backup_avatar_team_id = 15;</code>
* @return This builder for chaining.
*/
public Builder clearBackupAvatarTeamId() {
backupAvatarTeamId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -717,12 +596,10 @@ public final class DelBackupAvatarTeamRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\034DelBackupAvatarTeamRsp.proto\"\226\001\n\026DelBa" +
"ckupAvatarTeamRsp\022\032\n\022backupAvatarTeamId\030" +
"\013 \001(\r\022\017\n\007retcode\030\014 \001(\005\"O\n\013HMFPBAACAFA\022\010\n" +
"\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\334\r\022\017\n\013DCDNILFDFLB" +
"\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutt" +
"er.net.protob\006proto3"
"\n\034DelBackupAvatarTeamRsp.proto\"H\n\026DelBac" +
"kupAvatarTeamRsp\022\017\n\007retcode\030\002 \001(\005\022\035\n\025bac" +
"kup_avatar_team_id\030\017 \001(\rB\033\n\031emu.grasscut" +
"ter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -733,7 +610,7 @@ public final class DelBackupAvatarTeamRspOuterClass {
internal_static_DelBackupAvatarTeamRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_DelBackupAvatarTeamRsp_descriptor,
new java.lang.String[] { "BackupAvatarTeamId", "Retcode", });
new java.lang.String[] { "Retcode", "BackupAvatarTeamId", });
}
// @@protoc_insertion_point(outer_class_scope)