Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 12:53: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/PropValueOuterClass.java
+166 -158
View File
@@ -24,6 +24,12 @@ public final class PropValueOuterClass {
*/
int getType();
/**
* <code>int64 val = 4;</code>
* @return The val.
*/
long getVal();
/**
* <code>int64 ival = 2;</code>
* @return Whether the ival field is set.
@@ -46,15 +52,13 @@ public final class PropValueOuterClass {
*/
float getFval();
/**
* <code>int64 val = 4;</code>
* @return The val.
*/
long getVal();
public emu.grasscutter.net.proto.PropValueOuterClass.PropValue.CAPPJMGFHDPCase getCAPPJMGFHDPCase();
public emu.grasscutter.net.proto.PropValueOuterClass.PropValue.ValueCase getValueCase();
}
/**
* <pre>
* Name: EACNABDMBBF
* </pre>
*
* Protobuf type {@code PropValue}
*/
public static final class PropValue extends
@@ -105,13 +109,13 @@ public final class PropValueOuterClass {
break;
}
case 16: {
cAPPJMGFHDPCase_ = 2;
cAPPJMGFHDP_ = input.readInt64();
valueCase_ = 2;
value_ = input.readInt64();
break;
}
case 29: {
cAPPJMGFHDPCase_ = 3;
cAPPJMGFHDP_ = input.readFloat();
valueCase_ = 3;
value_ = input.readFloat();
break;
}
case 32: {
@@ -151,16 +155,16 @@ public final class PropValueOuterClass {
emu.grasscutter.net.proto.PropValueOuterClass.PropValue.class, emu.grasscutter.net.proto.PropValueOuterClass.PropValue.Builder.class);
}
private int cAPPJMGFHDPCase_ = 0;
private java.lang.Object cAPPJMGFHDP_;
public enum CAPPJMGFHDPCase
private int valueCase_ = 0;
private java.lang.Object value_;
public enum ValueCase
implements com.google.protobuf.Internal.EnumLite,
com.google.protobuf.AbstractMessage.InternalOneOfEnum {
IVAL(2),
FVAL(3),
CAPPJMGFHDP_NOT_SET(0);
VALUE_NOT_SET(0);
private final int value;
private CAPPJMGFHDPCase(int value) {
private ValueCase(int value) {
this.value = value;
}
/**
@@ -169,15 +173,15 @@ public final class PropValueOuterClass {
* @deprecated Use {@link #forNumber(int)} instead.
*/
@java.lang.Deprecated
public static CAPPJMGFHDPCase valueOf(int value) {
public static ValueCase valueOf(int value) {
return forNumber(value);
}
public static CAPPJMGFHDPCase forNumber(int value) {
public static ValueCase forNumber(int value) {
switch (value) {
case 2: return IVAL;
case 3: return FVAL;
case 0: return CAPPJMGFHDP_NOT_SET;
case 0: return VALUE_NOT_SET;
default: return null;
}
}
@@ -186,10 +190,10 @@ public final class PropValueOuterClass {
}
};
public CAPPJMGFHDPCase
getCAPPJMGFHDPCase() {
return CAPPJMGFHDPCase.forNumber(
cAPPJMGFHDPCase_);
public ValueCase
getValueCase() {
return ValueCase.forNumber(
valueCase_);
}
public static final int TYPE_FIELD_NUMBER = 1;
@@ -203,6 +207,17 @@ public final class PropValueOuterClass {
return type_;
}
public static final int VAL_FIELD_NUMBER = 4;
private long val_;
/**
* <code>int64 val = 4;</code>
* @return The val.
*/
@java.lang.Override
public long getVal() {
return val_;
}
public static final int IVAL_FIELD_NUMBER = 2;
/**
* <code>int64 ival = 2;</code>
@@ -210,7 +225,7 @@ public final class PropValueOuterClass {
*/
@java.lang.Override
public boolean hasIval() {
return cAPPJMGFHDPCase_ == 2;
return valueCase_ == 2;
}
/**
* <code>int64 ival = 2;</code>
@@ -218,8 +233,8 @@ public final class PropValueOuterClass {
*/
@java.lang.Override
public long getIval() {
if (cAPPJMGFHDPCase_ == 2) {
return (java.lang.Long) cAPPJMGFHDP_;
if (valueCase_ == 2) {
return (java.lang.Long) value_;
}
return 0L;
}
@@ -231,7 +246,7 @@ public final class PropValueOuterClass {
*/
@java.lang.Override
public boolean hasFval() {
return cAPPJMGFHDPCase_ == 3;
return valueCase_ == 3;
}
/**
* <code>float fval = 3;</code>
@@ -239,23 +254,12 @@ public final class PropValueOuterClass {
*/
@java.lang.Override
public float getFval() {
if (cAPPJMGFHDPCase_ == 3) {
return (java.lang.Float) cAPPJMGFHDP_;
if (valueCase_ == 3) {
return (java.lang.Float) value_;
}
return 0F;
}
public static final int VAL_FIELD_NUMBER = 4;
private long val_;
/**
* <code>int64 val = 4;</code>
* @return The val.
*/
@java.lang.Override
public long getVal() {
return val_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -273,13 +277,13 @@ public final class PropValueOuterClass {
if (type_ != 0) {
output.writeUInt32(1, type_);
}
if (cAPPJMGFHDPCase_ == 2) {
if (valueCase_ == 2) {
output.writeInt64(
2, (long)((java.lang.Long) cAPPJMGFHDP_));
2, (long)((java.lang.Long) value_));
}
if (cAPPJMGFHDPCase_ == 3) {
if (valueCase_ == 3) {
output.writeFloat(
3, (float)((java.lang.Float) cAPPJMGFHDP_));
3, (float)((java.lang.Float) value_));
}
if (val_ != 0L) {
output.writeInt64(4, val_);
@@ -297,15 +301,15 @@ public final class PropValueOuterClass {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, type_);
}
if (cAPPJMGFHDPCase_ == 2) {
if (valueCase_ == 2) {
size += com.google.protobuf.CodedOutputStream
.computeInt64Size(
2, (long)((java.lang.Long) cAPPJMGFHDP_));
2, (long)((java.lang.Long) value_));
}
if (cAPPJMGFHDPCase_ == 3) {
if (valueCase_ == 3) {
size += com.google.protobuf.CodedOutputStream
.computeFloatSize(
3, (float)((java.lang.Float) cAPPJMGFHDP_));
3, (float)((java.lang.Float) value_));
}
if (val_ != 0L) {
size += com.google.protobuf.CodedOutputStream
@@ -330,8 +334,8 @@ public final class PropValueOuterClass {
!= other.getType()) return false;
if (getVal()
!= other.getVal()) return false;
if (!getCAPPJMGFHDPCase().equals(other.getCAPPJMGFHDPCase())) return false;
switch (cAPPJMGFHDPCase_) {
if (!getValueCase().equals(other.getValueCase())) return false;
switch (valueCase_) {
case 2:
if (getIval()
!= other.getIval()) return false;
@@ -360,7 +364,7 @@ public final class PropValueOuterClass {
hash = (37 * hash) + VAL_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getVal());
switch (cAPPJMGFHDPCase_) {
switch (valueCase_) {
case 2:
hash = (37 * hash) + IVAL_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
@@ -470,6 +474,10 @@ public final class PropValueOuterClass {
return builder;
}
/**
* <pre>
* Name: EACNABDMBBF
* </pre>
*
* Protobuf type {@code PropValue}
*/
public static final class Builder extends
@@ -511,8 +519,8 @@ public final class PropValueOuterClass {
val_ = 0L;
cAPPJMGFHDPCase_ = 0;
cAPPJMGFHDP_ = null;
valueCase_ = 0;
value_ = null;
return this;
}
@@ -540,14 +548,14 @@ public final class PropValueOuterClass {
public emu.grasscutter.net.proto.PropValueOuterClass.PropValue buildPartial() {
emu.grasscutter.net.proto.PropValueOuterClass.PropValue result = new emu.grasscutter.net.proto.PropValueOuterClass.PropValue(this);
result.type_ = type_;
if (cAPPJMGFHDPCase_ == 2) {
result.cAPPJMGFHDP_ = cAPPJMGFHDP_;
}
if (cAPPJMGFHDPCase_ == 3) {
result.cAPPJMGFHDP_ = cAPPJMGFHDP_;
}
result.val_ = val_;
result.cAPPJMGFHDPCase_ = cAPPJMGFHDPCase_;
if (valueCase_ == 2) {
result.value_ = value_;
}
if (valueCase_ == 3) {
result.value_ = value_;
}
result.valueCase_ = valueCase_;
onBuilt();
return result;
}
@@ -602,7 +610,7 @@ public final class PropValueOuterClass {
if (other.getVal() != 0L) {
setVal(other.getVal());
}
switch (other.getCAPPJMGFHDPCase()) {
switch (other.getValueCase()) {
case IVAL: {
setIval(other.getIval());
break;
@@ -611,7 +619,7 @@ public final class PropValueOuterClass {
setFval(other.getFval());
break;
}
case CAPPJMGFHDP_NOT_SET: {
case VALUE_NOT_SET: {
break;
}
}
@@ -643,17 +651,17 @@ public final class PropValueOuterClass {
}
return this;
}
private int cAPPJMGFHDPCase_ = 0;
private java.lang.Object cAPPJMGFHDP_;
public CAPPJMGFHDPCase
getCAPPJMGFHDPCase() {
return CAPPJMGFHDPCase.forNumber(
cAPPJMGFHDPCase_);
private int valueCase_ = 0;
private java.lang.Object value_;
public ValueCase
getValueCase() {
return ValueCase.forNumber(
valueCase_);
}
public Builder clearCAPPJMGFHDP() {
cAPPJMGFHDPCase_ = 0;
cAPPJMGFHDP_ = null;
public Builder clearValue() {
valueCase_ = 0;
value_ = null;
onChanged();
return this;
}
@@ -690,88 +698,6 @@ public final class PropValueOuterClass {
return this;
}
/**
* <code>int64 ival = 2;</code>
* @return Whether the ival field is set.
*/
public boolean hasIval() {
return cAPPJMGFHDPCase_ == 2;
}
/**
* <code>int64 ival = 2;</code>
* @return The ival.
*/
public long getIval() {
if (cAPPJMGFHDPCase_ == 2) {
return (java.lang.Long) cAPPJMGFHDP_;
}
return 0L;
}
/**
* <code>int64 ival = 2;</code>
* @param value The ival to set.
* @return This builder for chaining.
*/
public Builder setIval(long value) {
cAPPJMGFHDPCase_ = 2;
cAPPJMGFHDP_ = value;
onChanged();
return this;
}
/**
* <code>int64 ival = 2;</code>
* @return This builder for chaining.
*/
public Builder clearIval() {
if (cAPPJMGFHDPCase_ == 2) {
cAPPJMGFHDPCase_ = 0;
cAPPJMGFHDP_ = null;
onChanged();
}
return this;
}
/**
* <code>float fval = 3;</code>
* @return Whether the fval field is set.
*/
public boolean hasFval() {
return cAPPJMGFHDPCase_ == 3;
}
/**
* <code>float fval = 3;</code>
* @return The fval.
*/
public float getFval() {
if (cAPPJMGFHDPCase_ == 3) {
return (java.lang.Float) cAPPJMGFHDP_;
}
return 0F;
}
/**
* <code>float fval = 3;</code>
* @param value The fval to set.
* @return This builder for chaining.
*/
public Builder setFval(float value) {
cAPPJMGFHDPCase_ = 3;
cAPPJMGFHDP_ = value;
onChanged();
return this;
}
/**
* <code>float fval = 3;</code>
* @return This builder for chaining.
*/
public Builder clearFval() {
if (cAPPJMGFHDPCase_ == 3) {
cAPPJMGFHDPCase_ = 0;
cAPPJMGFHDP_ = null;
onChanged();
}
return this;
}
private long val_ ;
/**
* <code>int64 val = 4;</code>
@@ -802,6 +728,88 @@ public final class PropValueOuterClass {
onChanged();
return this;
}
/**
* <code>int64 ival = 2;</code>
* @return Whether the ival field is set.
*/
public boolean hasIval() {
return valueCase_ == 2;
}
/**
* <code>int64 ival = 2;</code>
* @return The ival.
*/
public long getIval() {
if (valueCase_ == 2) {
return (java.lang.Long) value_;
}
return 0L;
}
/**
* <code>int64 ival = 2;</code>
* @param value The ival to set.
* @return This builder for chaining.
*/
public Builder setIval(long value) {
valueCase_ = 2;
value_ = value;
onChanged();
return this;
}
/**
* <code>int64 ival = 2;</code>
* @return This builder for chaining.
*/
public Builder clearIval() {
if (valueCase_ == 2) {
valueCase_ = 0;
value_ = null;
onChanged();
}
return this;
}
/**
* <code>float fval = 3;</code>
* @return Whether the fval field is set.
*/
public boolean hasFval() {
return valueCase_ == 3;
}
/**
* <code>float fval = 3;</code>
* @return The fval.
*/
public float getFval() {
if (valueCase_ == 3) {
return (java.lang.Float) value_;
}
return 0F;
}
/**
* <code>float fval = 3;</code>
* @param value The fval to set.
* @return This builder for chaining.
*/
public Builder setFval(float value) {
valueCase_ = 3;
value_ = value;
onChanged();
return this;
}
/**
* <code>float fval = 3;</code>
* @return This builder for chaining.
*/
public Builder clearFval() {
if (valueCase_ == 3) {
valueCase_ = 0;
value_ = null;
onChanged();
}
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -869,10 +877,10 @@ public final class PropValueOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\017PropValue.proto\"U\n\tPropValue\022\014\n\004type\030\001" +
" \001(\r\022\016\n\004ival\030\002 \001(\003H\000\022\016\n\004fval\030\003 \001(\002H\000\022\013\n\003" +
"val\030\004 \001(\003B\r\n\013CAPPJMGFHDPB\033\n\031emu.grasscut" +
"ter.net.protob\006proto3"
"\n\017PropValue.proto\"O\n\tPropValue\022\014\n\004type\030\001" +
" \001(\r\022\013\n\003val\030\004 \001(\003\022\016\n\004ival\030\002 \001(\003H\000\022\016\n\004fva" +
"l\030\003 \001(\002H\000B\007\n\005valueB\033\n\031emu.grasscutter.ne" +
"t.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -883,7 +891,7 @@ public final class PropValueOuterClass {
internal_static_PropValue_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PropValue_descriptor,
new java.lang.String[] { "Type", "Ival", "Fval", "Val", "CAPPJMGFHDP", });
new java.lang.String[] { "Type", "Val", "Ival", "Fval", "Value", });
}
// @@protoc_insertion_point(outer_class_scope)