Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 17:01:21 +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/ClientAbilityInitFinishNotifyOuterClass.java
+65 -197
View File
@@ -19,36 +19,41 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 entityId = 1;</code>
* <code>uint32 entity_id = 8;</code>
* @return The entityId.
*/
int getEntityId();
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry>
getInvokesList();
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index);
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
int getInvokesCount();
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder>
getInvokesOrBuilderList();
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
int index);
}
/**
* <pre>
* Name: KDKNIIHLEKH
* CmdId: 1164
* </pre>
*
* Protobuf type {@code ClientAbilityInitFinishNotify}
*/
public static final class ClientAbilityInitFinishNotify extends
@@ -95,12 +100,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
case 0:
done = true;
break;
case 8: {
entityId_ = input.readUInt32();
break;
}
case 114: {
case 26: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
invokes_ = new java.util.ArrayList<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry>();
mutable_bitField0_ |= 0x00000001;
@@ -109,6 +109,11 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
input.readMessage(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.parser(), extensionRegistry));
break;
}
case 64: {
entityId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -144,149 +149,10 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify.class, emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify.Builder.class);
}
/**
* Protobuf enum {@code ClientAbilityInitFinishNotify.NFFHBOGDOEJ}
*/
public enum NFFHBOGDOEJ
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1198;</code>
*/
PEPPOHPHJOJ(1, 1198),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final NFFHBOGDOEJ DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final NFFHBOGDOEJ EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1198;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1198;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final int DCDNILFDFLB_VALUE = 0;
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
public static final int NNBKOLMPOEA_VALUE = 1;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final int EAJIABGAOCI_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 NFFHBOGDOEJ 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 NFFHBOGDOEJ forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1198: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<NFFHBOGDOEJ>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
NFFHBOGDOEJ> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<NFFHBOGDOEJ>() {
public NFFHBOGDOEJ findValueByNumber(int number) {
return NFFHBOGDOEJ.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.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify.getDescriptor().getEnumTypes().get(0);
}
private static final NFFHBOGDOEJ[] VALUES = getStaticValuesArray();
private static NFFHBOGDOEJ[] getStaticValuesArray() {
return new NFFHBOGDOEJ[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static NFFHBOGDOEJ 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 NFFHBOGDOEJ(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:ClientAbilityInitFinishNotify.NFFHBOGDOEJ)
}
public static final int ENTITYID_FIELD_NUMBER = 1;
public static final int ENTITY_ID_FIELD_NUMBER = 8;
private int entityId_;
/**
* <code>uint32 entityId = 1;</code>
* <code>uint32 entity_id = 8;</code>
* @return The entityId.
*/
@java.lang.Override
@@ -294,17 +160,17 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return entityId_;
}
public static final int INVOKES_FIELD_NUMBER = 14;
public static final int INVOKES_FIELD_NUMBER = 3;
private java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> invokes_;
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
return invokes_;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder>
@@ -312,21 +178,21 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return invokes_;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
@java.lang.Override
public int getInvokesCount() {
return invokes_.size();
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
return invokes_.get(index);
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
@@ -348,11 +214,11 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (entityId_ != 0) {
output.writeUInt32(1, entityId_);
}
for (int i = 0; i < invokes_.size(); i++) {
output.writeMessage(14, invokes_.get(i));
output.writeMessage(3, invokes_.get(i));
}
if (entityId_ != 0) {
output.writeUInt32(8, entityId_);
}
unknownFields.writeTo(output);
}
@@ -363,13 +229,13 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, entityId_);
}
for (int i = 0; i < invokes_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(14, invokes_.get(i));
.computeMessageSize(3, invokes_.get(i));
}
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, entityId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -401,7 +267,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ENTITYID_FIELD_NUMBER;
hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getEntityId();
if (getInvokesCount() > 0) {
hash = (37 * hash) + INVOKES_FIELD_NUMBER;
@@ -503,6 +369,11 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: KDKNIIHLEKH
* CmdId: 1164
* </pre>
*
* Protobuf type {@code ClientAbilityInitFinishNotify}
*/
public static final class Builder extends
@@ -695,7 +566,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
private int entityId_ ;
/**
* <code>uint32 entityId = 1;</code>
* <code>uint32 entity_id = 8;</code>
* @return The entityId.
*/
@java.lang.Override
@@ -703,7 +574,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return entityId_;
}
/**
* <code>uint32 entityId = 1;</code>
* <code>uint32 entity_id = 8;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
@@ -714,7 +585,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>uint32 entityId = 1;</code>
* <code>uint32 entity_id = 8;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
@@ -737,7 +608,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> invokesBuilder_;
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
if (invokesBuilder_ == null) {
@@ -747,7 +618,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
}
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public int getInvokesCount() {
if (invokesBuilder_ == null) {
@@ -757,7 +628,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
}
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
if (invokesBuilder_ == null) {
@@ -767,7 +638,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
}
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public Builder setInvokes(
int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -784,7 +655,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public Builder setInvokes(
int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -798,7 +669,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public Builder addInvokes(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
if (invokesBuilder_ == null) {
@@ -814,7 +685,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public Builder addInvokes(
int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -831,7 +702,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public Builder addInvokes(
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -845,7 +716,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public Builder addInvokes(
int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -859,7 +730,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public Builder addAllInvokes(
java.lang.Iterable<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> values) {
@@ -874,7 +745,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public Builder clearInvokes() {
if (invokesBuilder_ == null) {
@@ -887,7 +758,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public Builder removeInvokes(int index) {
if (invokesBuilder_ == null) {
@@ -900,14 +771,14 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
return this;
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder getInvokesBuilder(
int index) {
return getInvokesFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
int index) {
@@ -917,7 +788,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
}
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder>
getInvokesOrBuilderList() {
@@ -928,14 +799,14 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
}
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder() {
return getInvokesFieldBuilder().addBuilder(
emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder(
int index) {
@@ -943,7 +814,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
}
/**
* <code>repeated .AbilityInvokeEntry invokes = 14;</code>
* <code>repeated .AbilityInvokeEntry invokes = 3;</code>
*/
public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder>
getInvokesBuilderList() {
@@ -1031,13 +902,10 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n#ClientAbilityInitFinishNotify.proto\032\030A" +
"bilityInvokeEntry.proto\"\271\001\n\035ClientAbilit" +
"yInitFinishNotify\022\020\n\010entityId\030\001 \001(\r\022$\n\007i" +
"nvokes\030\016 \003(\0132\023.AbilityInvokeEntry\"`\n\013NFF" +
"HBOGDOEJ\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\256\t\022\017\n\013" +
"DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\022\017\n\013EAJIAB" +
"GAOCI\020\001\032\002\020\001B\033\n\031emu.grasscutter.net.proto" +
"b\006proto3"
"bilityInvokeEntry.proto\"X\n\035ClientAbility" +
"InitFinishNotify\022\021\n\tentity_id\030\010 \001(\r\022$\n\007i" +
"nvokes\030\003 \003(\0132\023.AbilityInvokeEntryB\033\n\031emu" +
".grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,