Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 09:45:03 +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/DelTeamEntityNotifyOuterClass.java
+36 -159
View File
@@ -19,29 +19,34 @@ public final class DelTeamEntityNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 sceneId = 15;</code>
* <code>uint32 scene_id = 15;</code>
* @return The sceneId.
*/
int getSceneId();
/**
* <code>repeated uint32 delEntityIdList = 1;</code>
* <code>repeated uint32 del_entity_id_list = 1;</code>
* @return A list containing the delEntityIdList.
*/
java.util.List<java.lang.Integer> getDelEntityIdListList();
/**
* <code>repeated uint32 delEntityIdList = 1;</code>
* <code>repeated uint32 del_entity_id_list = 1;</code>
* @return The count of delEntityIdList.
*/
int getDelEntityIdListCount();
/**
* <code>repeated uint32 delEntityIdList = 1;</code>
* <code>repeated uint32 del_entity_id_list = 1;</code>
* @param index The index of the element to return.
* @return The delEntityIdList at the given index.
*/
int getDelEntityIdList(int index);
}
/**
* <pre>
* Name: DIEEAFMCPBM
* CmdId: 330
* </pre>
*
* Protobuf type {@code DelTeamEntityNotify}
*/
public static final class DelTeamEntityNotify extends
@@ -149,141 +154,10 @@ public final class DelTeamEntityNotifyOuterClass {
emu.grasscutter.net.proto.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify.class, emu.grasscutter.net.proto.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify.Builder.class);
}
/**
* Protobuf enum {@code DelTeamEntityNotify.KOEAKIPCJJN}
*/
public enum KOEAKIPCJJN
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 363;</code>
*/
PEPPOHPHJOJ(1, 363),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final KOEAKIPCJJN DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 363;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 363;
/**
* <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 KOEAKIPCJJN 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 KOEAKIPCJJN forNumber(int value) {
switch (value) {
case 0: return NONE;
case 363: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<KOEAKIPCJJN>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
KOEAKIPCJJN> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<KOEAKIPCJJN>() {
public KOEAKIPCJJN findValueByNumber(int number) {
return KOEAKIPCJJN.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.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify.getDescriptor().getEnumTypes().get(0);
}
private static final KOEAKIPCJJN[] VALUES = getStaticValuesArray();
private static KOEAKIPCJJN[] getStaticValuesArray() {
return new KOEAKIPCJJN[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static KOEAKIPCJJN 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 KOEAKIPCJJN(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:DelTeamEntityNotify.KOEAKIPCJJN)
}
public static final int SCENEID_FIELD_NUMBER = 15;
public static final int SCENE_ID_FIELD_NUMBER = 15;
private int sceneId_;
/**
* <code>uint32 sceneId = 15;</code>
* <code>uint32 scene_id = 15;</code>
* @return The sceneId.
*/
@java.lang.Override
@@ -291,10 +165,10 @@ public final class DelTeamEntityNotifyOuterClass {
return sceneId_;
}
public static final int DELENTITYIDLIST_FIELD_NUMBER = 1;
public static final int DEL_ENTITY_ID_LIST_FIELD_NUMBER = 1;
private com.google.protobuf.Internal.IntList delEntityIdList_;
/**
* <code>repeated uint32 delEntityIdList = 1;</code>
* <code>repeated uint32 del_entity_id_list = 1;</code>
* @return A list containing the delEntityIdList.
*/
@java.lang.Override
@@ -303,14 +177,14 @@ public final class DelTeamEntityNotifyOuterClass {
return delEntityIdList_;
}
/**
* <code>repeated uint32 delEntityIdList = 1;</code>
* <code>repeated uint32 del_entity_id_list = 1;</code>
* @return The count of delEntityIdList.
*/
public int getDelEntityIdListCount() {
return delEntityIdList_.size();
}
/**
* <code>repeated uint32 delEntityIdList = 1;</code>
* <code>repeated uint32 del_entity_id_list = 1;</code>
* @param index The index of the element to return.
* @return The delEntityIdList at the given index.
*/
@@ -401,10 +275,10 @@ public final class DelTeamEntityNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SCENEID_FIELD_NUMBER;
hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getSceneId();
if (getDelEntityIdListCount() > 0) {
hash = (37 * hash) + DELENTITYIDLIST_FIELD_NUMBER;
hash = (37 * hash) + DEL_ENTITY_ID_LIST_FIELD_NUMBER;
hash = (53 * hash) + getDelEntityIdListList().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
@@ -503,6 +377,11 @@ public final class DelTeamEntityNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: DIEEAFMCPBM
* CmdId: 330
* </pre>
*
* Protobuf type {@code DelTeamEntityNotify}
*/
public static final class Builder extends
@@ -670,7 +549,7 @@ public final class DelTeamEntityNotifyOuterClass {
private int sceneId_ ;
/**
* <code>uint32 sceneId = 15;</code>
* <code>uint32 scene_id = 15;</code>
* @return The sceneId.
*/
@java.lang.Override
@@ -678,7 +557,7 @@ public final class DelTeamEntityNotifyOuterClass {
return sceneId_;
}
/**
* <code>uint32 sceneId = 15;</code>
* <code>uint32 scene_id = 15;</code>
* @param value The sceneId to set.
* @return This builder for chaining.
*/
@@ -689,7 +568,7 @@ public final class DelTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>uint32 sceneId = 15;</code>
* <code>uint32 scene_id = 15;</code>
* @return This builder for chaining.
*/
public Builder clearSceneId() {
@@ -707,7 +586,7 @@ public final class DelTeamEntityNotifyOuterClass {
}
}
/**
* <code>repeated uint32 delEntityIdList = 1;</code>
* <code>repeated uint32 del_entity_id_list = 1;</code>
* @return A list containing the delEntityIdList.
*/
public java.util.List<java.lang.Integer>
@@ -716,14 +595,14 @@ public final class DelTeamEntityNotifyOuterClass {
java.util.Collections.unmodifiableList(delEntityIdList_) : delEntityIdList_;
}
/**
* <code>repeated uint32 delEntityIdList = 1;</code>
* <code>repeated uint32 del_entity_id_list = 1;</code>
* @return The count of delEntityIdList.
*/
public int getDelEntityIdListCount() {
return delEntityIdList_.size();
}
/**
* <code>repeated uint32 delEntityIdList = 1;</code>
* <code>repeated uint32 del_entity_id_list = 1;</code>
* @param index The index of the element to return.
* @return The delEntityIdList at the given index.
*/
@@ -731,7 +610,7 @@ public final class DelTeamEntityNotifyOuterClass {
return delEntityIdList_.getInt(index);
}
/**
* <code>repeated uint32 delEntityIdList = 1;</code>
* <code>repeated uint32 del_entity_id_list = 1;</code>
* @param index The index to set the value at.
* @param value The delEntityIdList to set.
* @return This builder for chaining.
@@ -744,7 +623,7 @@ public final class DelTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated uint32 delEntityIdList = 1;</code>
* <code>repeated uint32 del_entity_id_list = 1;</code>
* @param value The delEntityIdList to add.
* @return This builder for chaining.
*/
@@ -755,7 +634,7 @@ public final class DelTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated uint32 delEntityIdList = 1;</code>
* <code>repeated uint32 del_entity_id_list = 1;</code>
* @param values The delEntityIdList to add.
* @return This builder for chaining.
*/
@@ -768,7 +647,7 @@ public final class DelTeamEntityNotifyOuterClass {
return this;
}
/**
* <code>repeated uint32 delEntityIdList = 1;</code>
* <code>repeated uint32 del_entity_id_list = 1;</code>
* @return This builder for chaining.
*/
public Builder clearDelEntityIdList() {
@@ -844,12 +723,10 @@ public final class DelTeamEntityNotifyOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\031DelTeamEntityNotify.proto\"\220\001\n\023DelTeamE" +
"ntityNotify\022\017\n\007sceneId\030\017 \001(\r\022\027\n\017delEntit" +
"yIdList\030\001 \003(\r\"O\n\013KOEAKIPCJJN\022\010\n\004NONE\020\000\022\020" +
"\n\013PEPPOHPHJOJ\020\353\002\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNB" +
"KOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.net.pr" +
"otob\006proto3"
"\n\031DelTeamEntityNotify.proto\"C\n\023DelTeamEn" +
"tityNotify\022\020\n\010scene_id\030\017 \001(\r\022\032\n\022del_enti" +
"ty_id_list\030\001 \003(\rB\033\n\031emu.grasscutter.net." +
"protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,