Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 16:20: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/ServerAnnounceNotifyOuterClass.java
+45 -168
View File
@@ -19,30 +19,35 @@ public final class ServerAnnounceNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
java.util.List<emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData>
getAnnounceDataListList();
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData getAnnounceDataList(int index);
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
int getAnnounceDataListCount();
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceDataOrBuilder>
getAnnounceDataListOrBuilderList();
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceDataOrBuilder getAnnounceDataListOrBuilder(
int index);
}
/**
* <pre>
* Name: CPNKOEAMHKE
* CmdId: 2073
* </pre>
*
* Protobuf type {@code ServerAnnounceNotify}
*/
public static final class ServerAnnounceNotify extends
@@ -89,7 +94,7 @@ public final class ServerAnnounceNotifyOuterClass {
case 0:
done = true;
break;
case 10: {
case 74: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
announceDataList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData>();
mutable_bitField0_ |= 0x00000001;
@@ -133,148 +138,17 @@ public final class ServerAnnounceNotifyOuterClass {
emu.grasscutter.net.proto.ServerAnnounceNotifyOuterClass.ServerAnnounceNotify.class, emu.grasscutter.net.proto.ServerAnnounceNotifyOuterClass.ServerAnnounceNotify.Builder.class);
}
/**
* Protobuf enum {@code ServerAnnounceNotify.LGCEIPJMBJB}
*/
public enum LGCEIPJMBJB
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 2148;</code>
*/
PEPPOHPHJOJ(1, 2148),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final LGCEIPJMBJB DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 2148;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 2148;
/**
* <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 LGCEIPJMBJB 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 LGCEIPJMBJB forNumber(int value) {
switch (value) {
case 0: return NONE;
case 2148: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<LGCEIPJMBJB>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
LGCEIPJMBJB> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<LGCEIPJMBJB>() {
public LGCEIPJMBJB findValueByNumber(int number) {
return LGCEIPJMBJB.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.ServerAnnounceNotifyOuterClass.ServerAnnounceNotify.getDescriptor().getEnumTypes().get(0);
}
private static final LGCEIPJMBJB[] VALUES = getStaticValuesArray();
private static LGCEIPJMBJB[] getStaticValuesArray() {
return new LGCEIPJMBJB[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static LGCEIPJMBJB 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 LGCEIPJMBJB(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:ServerAnnounceNotify.LGCEIPJMBJB)
}
public static final int ANNOUNCEDATALIST_FIELD_NUMBER = 1;
public static final int ANNOUNCE_DATA_LIST_FIELD_NUMBER = 9;
private java.util.List<emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData> announceDataList_;
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData> getAnnounceDataListList() {
return announceDataList_;
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceDataOrBuilder>
@@ -282,21 +156,21 @@ public final class ServerAnnounceNotifyOuterClass {
return announceDataList_;
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
@java.lang.Override
public int getAnnounceDataListCount() {
return announceDataList_.size();
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData getAnnounceDataList(int index) {
return announceDataList_.get(index);
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceDataOrBuilder getAnnounceDataListOrBuilder(
@@ -319,7 +193,7 @@ public final class ServerAnnounceNotifyOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
for (int i = 0; i < announceDataList_.size(); i++) {
output.writeMessage(1, announceDataList_.get(i));
output.writeMessage(9, announceDataList_.get(i));
}
unknownFields.writeTo(output);
}
@@ -332,7 +206,7 @@ public final class ServerAnnounceNotifyOuterClass {
size = 0;
for (int i = 0; i < announceDataList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(1, announceDataList_.get(i));
.computeMessageSize(9, announceDataList_.get(i));
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -363,7 +237,7 @@ public final class ServerAnnounceNotifyOuterClass {
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (getAnnounceDataListCount() > 0) {
hash = (37 * hash) + ANNOUNCEDATALIST_FIELD_NUMBER;
hash = (37 * hash) + ANNOUNCE_DATA_LIST_FIELD_NUMBER;
hash = (53 * hash) + getAnnounceDataListList().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
@@ -462,6 +336,11 @@ public final class ServerAnnounceNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: CPNKOEAMHKE
* CmdId: 2073
* </pre>
*
* Protobuf type {@code ServerAnnounceNotify}
*/
public static final class Builder extends
@@ -659,7 +538,7 @@ public final class ServerAnnounceNotifyOuterClass {
emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData, emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder, emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceDataOrBuilder> announceDataListBuilder_;
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public java.util.List<emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData> getAnnounceDataListList() {
if (announceDataListBuilder_ == null) {
@@ -669,7 +548,7 @@ public final class ServerAnnounceNotifyOuterClass {
}
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public int getAnnounceDataListCount() {
if (announceDataListBuilder_ == null) {
@@ -679,7 +558,7 @@ public final class ServerAnnounceNotifyOuterClass {
}
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData getAnnounceDataList(int index) {
if (announceDataListBuilder_ == null) {
@@ -689,7 +568,7 @@ public final class ServerAnnounceNotifyOuterClass {
}
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public Builder setAnnounceDataList(
int index, emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData value) {
@@ -706,7 +585,7 @@ public final class ServerAnnounceNotifyOuterClass {
return this;
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public Builder setAnnounceDataList(
int index, emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder builderForValue) {
@@ -720,7 +599,7 @@ public final class ServerAnnounceNotifyOuterClass {
return this;
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public Builder addAnnounceDataList(emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData value) {
if (announceDataListBuilder_ == null) {
@@ -736,7 +615,7 @@ public final class ServerAnnounceNotifyOuterClass {
return this;
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public Builder addAnnounceDataList(
int index, emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData value) {
@@ -753,7 +632,7 @@ public final class ServerAnnounceNotifyOuterClass {
return this;
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public Builder addAnnounceDataList(
emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder builderForValue) {
@@ -767,7 +646,7 @@ public final class ServerAnnounceNotifyOuterClass {
return this;
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public Builder addAnnounceDataList(
int index, emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder builderForValue) {
@@ -781,7 +660,7 @@ public final class ServerAnnounceNotifyOuterClass {
return this;
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public Builder addAllAnnounceDataList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData> values) {
@@ -796,7 +675,7 @@ public final class ServerAnnounceNotifyOuterClass {
return this;
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public Builder clearAnnounceDataList() {
if (announceDataListBuilder_ == null) {
@@ -809,7 +688,7 @@ public final class ServerAnnounceNotifyOuterClass {
return this;
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public Builder removeAnnounceDataList(int index) {
if (announceDataListBuilder_ == null) {
@@ -822,14 +701,14 @@ public final class ServerAnnounceNotifyOuterClass {
return this;
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder getAnnounceDataListBuilder(
int index) {
return getAnnounceDataListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceDataOrBuilder getAnnounceDataListOrBuilder(
int index) {
@@ -839,7 +718,7 @@ public final class ServerAnnounceNotifyOuterClass {
}
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceDataOrBuilder>
getAnnounceDataListOrBuilderList() {
@@ -850,14 +729,14 @@ public final class ServerAnnounceNotifyOuterClass {
}
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder addAnnounceDataListBuilder() {
return getAnnounceDataListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.getDefaultInstance());
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder addAnnounceDataListBuilder(
int index) {
@@ -865,7 +744,7 @@ public final class ServerAnnounceNotifyOuterClass {
index, emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.getDefaultInstance());
}
/**
* <code>repeated .AnnounceData announceDataList = 1;</code>
* <code>repeated .AnnounceData announce_data_list = 9;</code>
*/
public java.util.List<emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder>
getAnnounceDataListBuilderList() {
@@ -953,10 +832,8 @@ public final class ServerAnnounceNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\032ServerAnnounceNotify.proto\032\022AnnounceDa" +
"ta.proto\"\220\001\n\024ServerAnnounceNotify\022\'\n\020ann" +
"ounceDataList\030\001 \003(\0132\r.AnnounceData\"O\n\013LG" +
"CEIPJMBJB\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\344\020\022\017\n" +
"\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031e" +
"ta.proto\"A\n\024ServerAnnounceNotify\022)\n\022anno" +
"unce_data_list\030\t \003(\0132\r.AnnounceDataB\033\n\031e" +
"mu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor