Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 10:13:35 +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/MassivePropSyncInfoOuterClass.java
+42 -33
View File
@@ -25,30 +25,34 @@ public final class MassivePropSyncInfoOuterClass {
long getId();
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
java.util.List<emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam>
getPropListList();
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam getPropList(int index);
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
int getPropListCount();
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParamOrBuilder>
getPropListOrBuilderList();
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParamOrBuilder getPropListOrBuilder(
int index);
}
/**
* <pre>
* Name: IBDHKPKIDND
* </pre>
*
* Protobuf type {@code MassivePropSyncInfo}
*/
public static final class MassivePropSyncInfo extends
@@ -155,17 +159,17 @@ public final class MassivePropSyncInfoOuterClass {
return id_;
}
public static final int PROPLIST_FIELD_NUMBER = 2;
public static final int PROP_LIST_FIELD_NUMBER = 2;
private java.util.List<emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam> propList_;
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam> getPropListList() {
return propList_;
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParamOrBuilder>
@@ -173,21 +177,21 @@ public final class MassivePropSyncInfoOuterClass {
return propList_;
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
@java.lang.Override
public int getPropListCount() {
return propList_.size();
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam getPropList(int index) {
return propList_.get(index);
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParamOrBuilder getPropListOrBuilder(
@@ -266,7 +270,7 @@ public final class MassivePropSyncInfoOuterClass {
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getId());
if (getPropListCount() > 0) {
hash = (37 * hash) + PROPLIST_FIELD_NUMBER;
hash = (37 * hash) + PROP_LIST_FIELD_NUMBER;
hash = (53 * hash) + getPropListList().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
@@ -365,6 +369,10 @@ public final class MassivePropSyncInfoOuterClass {
return builder;
}
/**
* <pre>
* Name: IBDHKPKIDND
* </pre>
*
* Protobuf type {@code MassivePropSyncInfo}
*/
public static final class Builder extends
@@ -599,7 +607,7 @@ public final class MassivePropSyncInfoOuterClass {
emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam, emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam.Builder, emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParamOrBuilder> propListBuilder_;
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public java.util.List<emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam> getPropListList() {
if (propListBuilder_ == null) {
@@ -609,7 +617,7 @@ public final class MassivePropSyncInfoOuterClass {
}
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public int getPropListCount() {
if (propListBuilder_ == null) {
@@ -619,7 +627,7 @@ public final class MassivePropSyncInfoOuterClass {
}
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam getPropList(int index) {
if (propListBuilder_ == null) {
@@ -629,7 +637,7 @@ public final class MassivePropSyncInfoOuterClass {
}
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public Builder setPropList(
int index, emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam value) {
@@ -646,7 +654,7 @@ public final class MassivePropSyncInfoOuterClass {
return this;
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public Builder setPropList(
int index, emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam.Builder builderForValue) {
@@ -660,7 +668,7 @@ public final class MassivePropSyncInfoOuterClass {
return this;
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public Builder addPropList(emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam value) {
if (propListBuilder_ == null) {
@@ -676,7 +684,7 @@ public final class MassivePropSyncInfoOuterClass {
return this;
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public Builder addPropList(
int index, emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam value) {
@@ -693,7 +701,7 @@ public final class MassivePropSyncInfoOuterClass {
return this;
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public Builder addPropList(
emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam.Builder builderForValue) {
@@ -707,7 +715,7 @@ public final class MassivePropSyncInfoOuterClass {
return this;
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public Builder addPropList(
int index, emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam.Builder builderForValue) {
@@ -721,7 +729,7 @@ public final class MassivePropSyncInfoOuterClass {
return this;
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public Builder addAllPropList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam> values) {
@@ -736,7 +744,7 @@ public final class MassivePropSyncInfoOuterClass {
return this;
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public Builder clearPropList() {
if (propListBuilder_ == null) {
@@ -749,7 +757,7 @@ public final class MassivePropSyncInfoOuterClass {
return this;
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public Builder removePropList(int index) {
if (propListBuilder_ == null) {
@@ -762,14 +770,14 @@ public final class MassivePropSyncInfoOuterClass {
return this;
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam.Builder getPropListBuilder(
int index) {
return getPropListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParamOrBuilder getPropListOrBuilder(
int index) {
@@ -779,7 +787,7 @@ public final class MassivePropSyncInfoOuterClass {
}
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParamOrBuilder>
getPropListOrBuilderList() {
@@ -790,14 +798,14 @@ public final class MassivePropSyncInfoOuterClass {
}
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam.Builder addPropListBuilder() {
return getPropListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam.getDefaultInstance());
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam.Builder addPropListBuilder(
int index) {
@@ -805,7 +813,7 @@ public final class MassivePropSyncInfoOuterClass {
index, emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam.getDefaultInstance());
}
/**
* <code>repeated .MassivePropParam propList = 2;</code>
* <code>repeated .MassivePropParam prop_list = 2;</code>
*/
public java.util.List<emu.grasscutter.net.proto.MassivePropParamOuterClass.MassivePropParam.Builder>
getPropListBuilderList() {
@@ -893,9 +901,10 @@ public final class MassivePropSyncInfoOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\031MassivePropSyncInfo.proto\032\026MassiveProp" +
"Param.proto\"F\n\023MassivePropSyncInfo\022\n\n\002id" +
"\030\001 \001(\003\022#\n\010propList\030\002 \003(\0132\021.MassivePropPa" +
"ramB\033\n\031emu.grasscutter.net.protob\006proto3"
"Param.proto\"G\n\023MassivePropSyncInfo\022\n\n\002id" +
"\030\001 \001(\003\022$\n\tprop_list\030\002 \003(\0132\021.MassivePropP" +
"aramB\033\n\031emu.grasscutter.net.protob\006proto" +
"3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,