Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-17 22:12:34 +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/AbilityChangeNotifyOuterClass.java
+44 -167
View File
@@ -19,27 +19,32 @@ public final class AbilityChangeNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.AbilityControlBlock abilityControlBlock = 10;</code>
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* @return Whether the abilityControlBlock field is set.
*/
boolean hasAbilityControlBlock();
/**
* <code>.AbilityControlBlock abilityControlBlock = 10;</code>
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* @return The abilityControlBlock.
*/
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
/**
* <code>.AbilityControlBlock abilityControlBlock = 10;</code>
* <code>.AbilityControlBlock ability_control_block = 12;</code>
*/
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
/**
* <code>uint32 entityId = 7;</code>
* <code>uint32 entity_id = 2;</code>
* @return The entityId.
*/
int getEntityId();
}
/**
* <pre>
* Name: FGNFEPLECFC
* CmdId: 1159
* </pre>
*
* Protobuf type {@code AbilityChangeNotify}
*/
public static final class AbilityChangeNotify extends
@@ -84,12 +89,12 @@ public final class AbilityChangeNotifyOuterClass {
case 0:
done = true;
break;
case 56: {
case 16: {
entityId_ = input.readUInt32();
break;
}
case 82: {
case 98: {
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
if (abilityControlBlock_ != null) {
subBuilder = abilityControlBlock_.toBuilder();
@@ -134,141 +139,10 @@ public final class AbilityChangeNotifyOuterClass {
emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.class, emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.Builder.class);
}
/**
* Protobuf enum {@code AbilityChangeNotify.KEAFGMDBMGG}
*/
public enum KEAFGMDBMGG
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1124;</code>
*/
PEPPOHPHJOJ(1, 1124),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final KEAFGMDBMGG DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1124;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1124;
/**
* <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 KEAFGMDBMGG 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 KEAFGMDBMGG forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1124: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<KEAFGMDBMGG>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
KEAFGMDBMGG> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<KEAFGMDBMGG>() {
public KEAFGMDBMGG findValueByNumber(int number) {
return KEAFGMDBMGG.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.AbilityChangeNotifyOuterClass.AbilityChangeNotify.getDescriptor().getEnumTypes().get(0);
}
private static final KEAFGMDBMGG[] VALUES = getStaticValuesArray();
private static KEAFGMDBMGG[] getStaticValuesArray() {
return new KEAFGMDBMGG[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static KEAFGMDBMGG 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 KEAFGMDBMGG(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:AbilityChangeNotify.KEAFGMDBMGG)
}
public static final int ABILITYCONTROLBLOCK_FIELD_NUMBER = 10;
public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 12;
private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
/**
* <code>.AbilityControlBlock abilityControlBlock = 10;</code>
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* @return Whether the abilityControlBlock field is set.
*/
@java.lang.Override
@@ -276,7 +150,7 @@ public final class AbilityChangeNotifyOuterClass {
return abilityControlBlock_ != null;
}
/**
* <code>.AbilityControlBlock abilityControlBlock = 10;</code>
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* @return The abilityControlBlock.
*/
@java.lang.Override
@@ -284,17 +158,17 @@ public final class AbilityChangeNotifyOuterClass {
return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
}
/**
* <code>.AbilityControlBlock abilityControlBlock = 10;</code>
* <code>.AbilityControlBlock ability_control_block = 12;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
return getAbilityControlBlock();
}
public static final int ENTITYID_FIELD_NUMBER = 7;
public static final int ENTITY_ID_FIELD_NUMBER = 2;
private int entityId_;
/**
* <code>uint32 entityId = 7;</code>
* <code>uint32 entity_id = 2;</code>
* @return The entityId.
*/
@java.lang.Override
@@ -317,10 +191,10 @@ public final class AbilityChangeNotifyOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (entityId_ != 0) {
output.writeUInt32(7, entityId_);
output.writeUInt32(2, entityId_);
}
if (abilityControlBlock_ != null) {
output.writeMessage(10, getAbilityControlBlock());
output.writeMessage(12, getAbilityControlBlock());
}
unknownFields.writeTo(output);
}
@@ -333,11 +207,11 @@ public final class AbilityChangeNotifyOuterClass {
size = 0;
if (entityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(7, entityId_);
.computeUInt32Size(2, entityId_);
}
if (abilityControlBlock_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(10, getAbilityControlBlock());
.computeMessageSize(12, getAbilityControlBlock());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -373,10 +247,10 @@ public final class AbilityChangeNotifyOuterClass {
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (hasAbilityControlBlock()) {
hash = (37 * hash) + ABILITYCONTROLBLOCK_FIELD_NUMBER;
hash = (37 * hash) + ABILITY_CONTROL_BLOCK_FIELD_NUMBER;
hash = (53 * hash) + getAbilityControlBlock().hashCode();
}
hash = (37 * hash) + ENTITYID_FIELD_NUMBER;
hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getEntityId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -474,6 +348,11 @@ public final class AbilityChangeNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: FGNFEPLECFC
* CmdId: 1159
* </pre>
*
* Protobuf type {@code AbilityChangeNotify}
*/
public static final class Builder extends
@@ -638,14 +517,14 @@ public final class AbilityChangeNotifyOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> abilityControlBlockBuilder_;
/**
* <code>.AbilityControlBlock abilityControlBlock = 10;</code>
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* @return Whether the abilityControlBlock field is set.
*/
public boolean hasAbilityControlBlock() {
return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
}
/**
* <code>.AbilityControlBlock abilityControlBlock = 10;</code>
* <code>.AbilityControlBlock ability_control_block = 12;</code>
* @return The abilityControlBlock.
*/
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
@@ -656,7 +535,7 @@ public final class AbilityChangeNotifyOuterClass {
}
}
/**
* <code>.AbilityControlBlock abilityControlBlock = 10;</code>
* <code>.AbilityControlBlock ability_control_block = 12;</code>
*/
public Builder setAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
if (abilityControlBlockBuilder_ == null) {
@@ -672,7 +551,7 @@ public final class AbilityChangeNotifyOuterClass {
return this;
}
/**
* <code>.AbilityControlBlock abilityControlBlock = 10;</code>
* <code>.AbilityControlBlock ability_control_block = 12;</code>
*/
public Builder setAbilityControlBlock(
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder builderForValue) {
@@ -686,7 +565,7 @@ public final class AbilityChangeNotifyOuterClass {
return this;
}
/**
* <code>.AbilityControlBlock abilityControlBlock = 10;</code>
* <code>.AbilityControlBlock ability_control_block = 12;</code>
*/
public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
if (abilityControlBlockBuilder_ == null) {
@@ -704,7 +583,7 @@ public final class AbilityChangeNotifyOuterClass {
return this;
}
/**
* <code>.AbilityControlBlock abilityControlBlock = 10;</code>
* <code>.AbilityControlBlock ability_control_block = 12;</code>
*/
public Builder clearAbilityControlBlock() {
if (abilityControlBlockBuilder_ == null) {
@@ -718,7 +597,7 @@ public final class AbilityChangeNotifyOuterClass {
return this;
}
/**
* <code>.AbilityControlBlock abilityControlBlock = 10;</code>
* <code>.AbilityControlBlock ability_control_block = 12;</code>
*/
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
@@ -726,7 +605,7 @@ public final class AbilityChangeNotifyOuterClass {
return getAbilityControlBlockFieldBuilder().getBuilder();
}
/**
* <code>.AbilityControlBlock abilityControlBlock = 10;</code>
* <code>.AbilityControlBlock ability_control_block = 12;</code>
*/
public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
if (abilityControlBlockBuilder_ != null) {
@@ -737,7 +616,7 @@ public final class AbilityChangeNotifyOuterClass {
}
}
/**
* <code>.AbilityControlBlock abilityControlBlock = 10;</code>
* <code>.AbilityControlBlock ability_control_block = 12;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder>
@@ -755,7 +634,7 @@ public final class AbilityChangeNotifyOuterClass {
private int entityId_ ;
/**
* <code>uint32 entityId = 7;</code>
* <code>uint32 entity_id = 2;</code>
* @return The entityId.
*/
@java.lang.Override
@@ -763,7 +642,7 @@ public final class AbilityChangeNotifyOuterClass {
return entityId_;
}
/**
* <code>uint32 entityId = 7;</code>
* <code>uint32 entity_id = 2;</code>
* @param value The entityId to set.
* @return This builder for chaining.
*/
@@ -774,7 +653,7 @@ public final class AbilityChangeNotifyOuterClass {
return this;
}
/**
* <code>uint32 entityId = 7;</code>
* <code>uint32 entity_id = 2;</code>
* @return This builder for chaining.
*/
public Builder clearEntityId() {
@@ -851,12 +730,10 @@ public final class AbilityChangeNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\031AbilityChangeNotify.proto\032\031AbilityCont" +
"rolBlock.proto\"\253\001\n\023AbilityChangeNotify\0221" +
"\n\023abilityControlBlock\030\n \001(\0132\024.AbilityCon" +
"trolBlock\022\020\n\010entityId\030\007 \001(\r\"O\n\013KEAFGMDBM" +
"GG\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\344\010\022\017\n\013DCDNIL" +
"FDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.gras" +
"scutter.net.protob\006proto3"
"rolBlock.proto\"]\n\023AbilityChangeNotify\0223\n" +
"\025ability_control_block\030\014 \001(\0132\024.AbilityCo" +
"ntrolBlock\022\021\n\tentity_id\030\002 \001(\rB\033\n\031emu.gra" +
"sscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,