mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-05-21 11:30:12 +08:00
Add support for v3.5.0 (#2090)
* 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
committed by
GitHub
Unverified
GitHub
parent
922f7bca51
commit
516e5975e1
+30
-22
@@ -34,12 +34,12 @@ public final class AbilityScalarValueEntryOuterClass {
|
||||
emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getKeyOrBuilder();
|
||||
|
||||
/**
|
||||
* <code>.AbilityScalarType valueType = 2;</code>
|
||||
* <code>.AbilityScalarType value_type = 2;</code>
|
||||
* @return The enum numeric value on the wire for valueType.
|
||||
*/
|
||||
int getValueTypeValue();
|
||||
/**
|
||||
* <code>.AbilityScalarType valueType = 2;</code>
|
||||
* <code>.AbilityScalarType value_type = 2;</code>
|
||||
* @return The valueType.
|
||||
*/
|
||||
emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType getValueType();
|
||||
@@ -97,6 +97,10 @@ public final class AbilityScalarValueEntryOuterClass {
|
||||
public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.ValueCase getValueCase();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: JHJPOIJGPEB
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code AbilityScalarValueEntry}
|
||||
*/
|
||||
public static final class AbilityScalarValueEntry extends
|
||||
@@ -285,17 +289,17 @@ public final class AbilityScalarValueEntryOuterClass {
|
||||
return getKey();
|
||||
}
|
||||
|
||||
public static final int VALUETYPE_FIELD_NUMBER = 2;
|
||||
public static final int VALUE_TYPE_FIELD_NUMBER = 2;
|
||||
private int valueType_;
|
||||
/**
|
||||
* <code>.AbilityScalarType valueType = 2;</code>
|
||||
* <code>.AbilityScalarType value_type = 2;</code>
|
||||
* @return The enum numeric value on the wire for valueType.
|
||||
*/
|
||||
@java.lang.Override public int getValueTypeValue() {
|
||||
return valueType_;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilityScalarType valueType = 2;</code>
|
||||
* <code>.AbilityScalarType value_type = 2;</code>
|
||||
* @return The valueType.
|
||||
*/
|
||||
@java.lang.Override public emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType getValueType() {
|
||||
@@ -436,7 +440,7 @@ public final class AbilityScalarValueEntryOuterClass {
|
||||
if (key_ != null) {
|
||||
output.writeMessage(1, getKey());
|
||||
}
|
||||
if (valueType_ != emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType.ABILITY_SCALAR_TYPE_UNKNOWN.getNumber()) {
|
||||
if (valueType_ != emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType.ABILITY_SCALAR_TYPE_UNKNOW.getNumber()) {
|
||||
output.writeEnum(2, valueType_);
|
||||
}
|
||||
if (valueCase_ == 3) {
|
||||
@@ -467,7 +471,7 @@ public final class AbilityScalarValueEntryOuterClass {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeMessageSize(1, getKey());
|
||||
}
|
||||
if (valueType_ != emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType.ABILITY_SCALAR_TYPE_UNKNOWN.getNumber()) {
|
||||
if (valueType_ != emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType.ABILITY_SCALAR_TYPE_UNKNOW.getNumber()) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeEnumSize(2, valueType_);
|
||||
}
|
||||
@@ -547,7 +551,7 @@ public final class AbilityScalarValueEntryOuterClass {
|
||||
hash = (37 * hash) + KEY_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getKey().hashCode();
|
||||
}
|
||||
hash = (37 * hash) + VALUETYPE_FIELD_NUMBER;
|
||||
hash = (37 * hash) + VALUE_TYPE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + valueType_;
|
||||
switch (valueCase_) {
|
||||
case 3:
|
||||
@@ -666,6 +670,10 @@ public final class AbilityScalarValueEntryOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: JHJPOIJGPEB
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code AbilityScalarValueEntry}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -1000,14 +1008,14 @@ public final class AbilityScalarValueEntryOuterClass {
|
||||
|
||||
private int valueType_ = 0;
|
||||
/**
|
||||
* <code>.AbilityScalarType valueType = 2;</code>
|
||||
* <code>.AbilityScalarType value_type = 2;</code>
|
||||
* @return The enum numeric value on the wire for valueType.
|
||||
*/
|
||||
@java.lang.Override public int getValueTypeValue() {
|
||||
return valueType_;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilityScalarType valueType = 2;</code>
|
||||
* <code>.AbilityScalarType value_type = 2;</code>
|
||||
* @param value The enum numeric value on the wire for valueType to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -1018,7 +1026,7 @@ public final class AbilityScalarValueEntryOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilityScalarType valueType = 2;</code>
|
||||
* <code>.AbilityScalarType value_type = 2;</code>
|
||||
* @return The valueType.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -1028,7 +1036,7 @@ public final class AbilityScalarValueEntryOuterClass {
|
||||
return result == null ? emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType.UNRECOGNIZED : result;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilityScalarType valueType = 2;</code>
|
||||
* <code>.AbilityScalarType value_type = 2;</code>
|
||||
* @param value The valueType to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -1042,7 +1050,7 @@ public final class AbilityScalarValueEntryOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>.AbilityScalarType valueType = 2;</code>
|
||||
* <code>.AbilityScalarType value_type = 2;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearValueType() {
|
||||
@@ -1338,20 +1346,20 @@ public final class AbilityScalarValueEntryOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\035AbilityScalarValueEntry.proto\032\023Ability" +
|
||||
"String.proto\032\027AbilityScalarType.proto\"\300\001" +
|
||||
"\n\035AbilityScalarValueEntry.proto\032\027Ability" +
|
||||
"ScalarType.proto\032\023AbilityString.proto\"\301\001" +
|
||||
"\n\027AbilityScalarValueEntry\022\033\n\003key\030\001 \001(\0132\016" +
|
||||
".AbilityString\022%\n\tvalueType\030\002 \001(\0162\022.Abil" +
|
||||
"ityScalarType\022\025\n\013float_value\030\003 \001(\002H\000\022\026\n\014" +
|
||||
"string_value\030\004 \001(\tH\000\022\023\n\tint_value\030\005 \001(\005H" +
|
||||
"\000\022\024\n\nuint_value\030\006 \001(\rH\000B\007\n\005valueB\033\n\031emu." +
|
||||
"grasscutter.net.protob\006proto3"
|
||||
".AbilityString\022&\n\nvalue_type\030\002 \001(\0162\022.Abi" +
|
||||
"lityScalarType\022\025\n\013float_value\030\003 \001(\002H\000\022\026\n" +
|
||||
"\014string_value\030\004 \001(\tH\000\022\023\n\tint_value\030\005 \001(\005" +
|
||||
"H\000\022\024\n\nuint_value\030\006 \001(\rH\000B\007\n\005valueB\033\n\031emu" +
|
||||
".grasscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
new com.google.protobuf.Descriptors.FileDescriptor[] {
|
||||
emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor(),
|
||||
emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.getDescriptor(),
|
||||
emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor(),
|
||||
});
|
||||
internal_static_AbilityScalarValueEntry_descriptor =
|
||||
getDescriptor().getMessageTypes().get(0);
|
||||
@@ -1359,8 +1367,8 @@ public final class AbilityScalarValueEntryOuterClass {
|
||||
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
|
||||
internal_static_AbilityScalarValueEntry_descriptor,
|
||||
new java.lang.String[] { "Key", "ValueType", "FloatValue", "StringValue", "IntValue", "UintValue", "Value", });
|
||||
emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor();
|
||||
emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.getDescriptor();
|
||||
emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor();
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(outer_class_scope)
|
||||
|
||||
Reference in New Issue
Block a user