Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 11:40: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/PropPairOuterClass.java
+29 -21
View File
@@ -25,21 +25,25 @@ public final class PropPairOuterClass {
int getType();
/**
* <code>.PropValue propValue = 2;</code>
* <code>.PropValue prop_value = 2;</code>
* @return Whether the propValue field is set.
*/
boolean hasPropValue();
/**
* <code>.PropValue propValue = 2;</code>
* <code>.PropValue prop_value = 2;</code>
* @return The propValue.
*/
emu.grasscutter.net.proto.PropValueOuterClass.PropValue getPropValue();
/**
* <code>.PropValue propValue = 2;</code>
* <code>.PropValue prop_value = 2;</code>
*/
emu.grasscutter.net.proto.PropValueOuterClass.PropValueOrBuilder getPropValueOrBuilder();
}
/**
* <pre>
* Name: KLGFAAAPHPO
* </pre>
*
* Protobuf type {@code PropPair}
*/
public static final class PropPair extends
@@ -145,10 +149,10 @@ public final class PropPairOuterClass {
return type_;
}
public static final int PROPVALUE_FIELD_NUMBER = 2;
public static final int PROP_VALUE_FIELD_NUMBER = 2;
private emu.grasscutter.net.proto.PropValueOuterClass.PropValue propValue_;
/**
* <code>.PropValue propValue = 2;</code>
* <code>.PropValue prop_value = 2;</code>
* @return Whether the propValue field is set.
*/
@java.lang.Override
@@ -156,7 +160,7 @@ public final class PropPairOuterClass {
return propValue_ != null;
}
/**
* <code>.PropValue propValue = 2;</code>
* <code>.PropValue prop_value = 2;</code>
* @return The propValue.
*/
@java.lang.Override
@@ -164,7 +168,7 @@ public final class PropPairOuterClass {
return propValue_ == null ? emu.grasscutter.net.proto.PropValueOuterClass.PropValue.getDefaultInstance() : propValue_;
}
/**
* <code>.PropValue propValue = 2;</code>
* <code>.PropValue prop_value = 2;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.PropValueOuterClass.PropValueOrBuilder getPropValueOrBuilder() {
@@ -244,7 +248,7 @@ public final class PropPairOuterClass {
hash = (37 * hash) + TYPE_FIELD_NUMBER;
hash = (53 * hash) + getType();
if (hasPropValue()) {
hash = (37 * hash) + PROPVALUE_FIELD_NUMBER;
hash = (37 * hash) + PROP_VALUE_FIELD_NUMBER;
hash = (53 * hash) + getPropValue().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
@@ -343,6 +347,10 @@ public final class PropPairOuterClass {
return builder;
}
/**
* <pre>
* Name: KLGFAAAPHPO
* </pre>
*
* Protobuf type {@code PropPair}
*/
public static final class Builder extends
@@ -538,14 +546,14 @@ public final class PropPairOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.PropValueOuterClass.PropValue, emu.grasscutter.net.proto.PropValueOuterClass.PropValue.Builder, emu.grasscutter.net.proto.PropValueOuterClass.PropValueOrBuilder> propValueBuilder_;
/**
* <code>.PropValue propValue = 2;</code>
* <code>.PropValue prop_value = 2;</code>
* @return Whether the propValue field is set.
*/
public boolean hasPropValue() {
return propValueBuilder_ != null || propValue_ != null;
}
/**
* <code>.PropValue propValue = 2;</code>
* <code>.PropValue prop_value = 2;</code>
* @return The propValue.
*/
public emu.grasscutter.net.proto.PropValueOuterClass.PropValue getPropValue() {
@@ -556,7 +564,7 @@ public final class PropPairOuterClass {
}
}
/**
* <code>.PropValue propValue = 2;</code>
* <code>.PropValue prop_value = 2;</code>
*/
public Builder setPropValue(emu.grasscutter.net.proto.PropValueOuterClass.PropValue value) {
if (propValueBuilder_ == null) {
@@ -572,7 +580,7 @@ public final class PropPairOuterClass {
return this;
}
/**
* <code>.PropValue propValue = 2;</code>
* <code>.PropValue prop_value = 2;</code>
*/
public Builder setPropValue(
emu.grasscutter.net.proto.PropValueOuterClass.PropValue.Builder builderForValue) {
@@ -586,7 +594,7 @@ public final class PropPairOuterClass {
return this;
}
/**
* <code>.PropValue propValue = 2;</code>
* <code>.PropValue prop_value = 2;</code>
*/
public Builder mergePropValue(emu.grasscutter.net.proto.PropValueOuterClass.PropValue value) {
if (propValueBuilder_ == null) {
@@ -604,7 +612,7 @@ public final class PropPairOuterClass {
return this;
}
/**
* <code>.PropValue propValue = 2;</code>
* <code>.PropValue prop_value = 2;</code>
*/
public Builder clearPropValue() {
if (propValueBuilder_ == null) {
@@ -618,7 +626,7 @@ public final class PropPairOuterClass {
return this;
}
/**
* <code>.PropValue propValue = 2;</code>
* <code>.PropValue prop_value = 2;</code>
*/
public emu.grasscutter.net.proto.PropValueOuterClass.PropValue.Builder getPropValueBuilder() {
@@ -626,7 +634,7 @@ public final class PropPairOuterClass {
return getPropValueFieldBuilder().getBuilder();
}
/**
* <code>.PropValue propValue = 2;</code>
* <code>.PropValue prop_value = 2;</code>
*/
public emu.grasscutter.net.proto.PropValueOuterClass.PropValueOrBuilder getPropValueOrBuilder() {
if (propValueBuilder_ != null) {
@@ -637,7 +645,7 @@ public final class PropPairOuterClass {
}
}
/**
* <code>.PropValue propValue = 2;</code>
* <code>.PropValue prop_value = 2;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.PropValueOuterClass.PropValue, emu.grasscutter.net.proto.PropValueOuterClass.PropValue.Builder, emu.grasscutter.net.proto.PropValueOuterClass.PropValueOrBuilder>
@@ -719,10 +727,10 @@ public final class PropPairOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\016PropPair.proto\032\017PropValue.proto\"7\n\010Pro" +
"pPair\022\014\n\004type\030\001 \001(\r\022\035\n\tpropValue\030\002 \001(\0132\n" +
".PropValueB\033\n\031emu.grasscutter.net.protob" +
"\006proto3"
"\n\016PropPair.proto\032\017PropValue.proto\"8\n\010Pro" +
"pPair\022\014\n\004type\030\001 \001(\r\022\036\n\nprop_value\030\002 \001(\0132" +
"\n.PropValueB\033\n\031emu.grasscutter.net.proto" +
"b\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,