Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 13:22:52 +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/PlayerCompoundMaterialRspOuterClass.java
+51 -174
View File
@@ -19,27 +19,32 @@ public final class PlayerCompoundMaterialRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.CompoundQueueData compoundQueueData = 8;</code>
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* @return Whether the compoundQueueData field is set.
*/
boolean hasCompoundQueueData();
/**
* <code>.CompoundQueueData compoundQueueData = 8;</code>
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* @return The compoundQueueData.
*/
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueueData();
/**
* <code>.CompoundQueueData compoundQueueData = 8;</code>
* <code>.CompoundQueueData compoundQueueData = 4;</code>
*/
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataOrBuilder();
/**
* <code>int32 retcode = 15;</code>
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* Name: FLGCALNDKFE
* CmdId: 116
* </pre>
*
* Protobuf type {@code PlayerCompoundMaterialRsp}
*/
public static final class PlayerCompoundMaterialRsp extends
@@ -84,7 +89,12 @@ public final class PlayerCompoundMaterialRspOuterClass {
case 0:
done = true;
break;
case 66: {
case 8: {
retcode_ = input.readInt32();
break;
}
case 34: {
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder subBuilder = null;
if (compoundQueueData_ != null) {
subBuilder = compoundQueueData_.toBuilder();
@@ -97,11 +107,6 @@ public final class PlayerCompoundMaterialRspOuterClass {
break;
}
case 120: {
retcode_ = input.readInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -134,141 +139,10 @@ public final class PlayerCompoundMaterialRspOuterClass {
emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp.class, emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp.Builder.class);
}
/**
* Protobuf enum {@code PlayerCompoundMaterialRsp.OFCGANODLLA}
*/
public enum OFCGANODLLA
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 150;</code>
*/
PEPPOHPHJOJ(1, 150),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final OFCGANODLLA DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 150;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 150;
/**
* <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 OFCGANODLLA 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 OFCGANODLLA forNumber(int value) {
switch (value) {
case 0: return NONE;
case 150: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<OFCGANODLLA>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
OFCGANODLLA> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<OFCGANODLLA>() {
public OFCGANODLLA findValueByNumber(int number) {
return OFCGANODLLA.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.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp.getDescriptor().getEnumTypes().get(0);
}
private static final OFCGANODLLA[] VALUES = getStaticValuesArray();
private static OFCGANODLLA[] getStaticValuesArray() {
return new OFCGANODLLA[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static OFCGANODLLA 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 OFCGANODLLA(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:PlayerCompoundMaterialRsp.OFCGANODLLA)
}
public static final int COMPOUNDQUEUEDATA_FIELD_NUMBER = 8;
public static final int COMPOUNDQUEUEDATA_FIELD_NUMBER = 4;
private emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData compoundQueueData_;
/**
* <code>.CompoundQueueData compoundQueueData = 8;</code>
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* @return Whether the compoundQueueData field is set.
*/
@java.lang.Override
@@ -276,7 +150,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return compoundQueueData_ != null;
}
/**
* <code>.CompoundQueueData compoundQueueData = 8;</code>
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* @return The compoundQueueData.
*/
@java.lang.Override
@@ -284,17 +158,17 @@ public final class PlayerCompoundMaterialRspOuterClass {
return compoundQueueData_ == null ? emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.getDefaultInstance() : compoundQueueData_;
}
/**
* <code>.CompoundQueueData compoundQueueData = 8;</code>
* <code>.CompoundQueueData compoundQueueData = 4;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataOrBuilder() {
return getCompoundQueueData();
}
public static final int RETCODE_FIELD_NUMBER = 15;
public static final int RETCODE_FIELD_NUMBER = 1;
private int retcode_;
/**
* <code>int32 retcode = 15;</code>
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -316,11 +190,11 @@ public final class PlayerCompoundMaterialRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (compoundQueueData_ != null) {
output.writeMessage(8, getCompoundQueueData());
}
if (retcode_ != 0) {
output.writeInt32(15, retcode_);
output.writeInt32(1, retcode_);
}
if (compoundQueueData_ != null) {
output.writeMessage(4, getCompoundQueueData());
}
unknownFields.writeTo(output);
}
@@ -331,13 +205,13 @@ public final class PlayerCompoundMaterialRspOuterClass {
if (size != -1) return size;
size = 0;
if (compoundQueueData_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(8, getCompoundQueueData());
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(15, retcode_);
.computeInt32Size(1, retcode_);
}
if (compoundQueueData_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, getCompoundQueueData());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -474,6 +348,11 @@ public final class PlayerCompoundMaterialRspOuterClass {
return builder;
}
/**
* <pre>
* Name: FLGCALNDKFE
* CmdId: 116
* </pre>
*
* Protobuf type {@code PlayerCompoundMaterialRsp}
*/
public static final class Builder extends
@@ -638,14 +517,14 @@ public final class PlayerCompoundMaterialRspOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder> compoundQueueDataBuilder_;
/**
* <code>.CompoundQueueData compoundQueueData = 8;</code>
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* @return Whether the compoundQueueData field is set.
*/
public boolean hasCompoundQueueData() {
return compoundQueueDataBuilder_ != null || compoundQueueData_ != null;
}
/**
* <code>.CompoundQueueData compoundQueueData = 8;</code>
* <code>.CompoundQueueData compoundQueueData = 4;</code>
* @return The compoundQueueData.
*/
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueueData() {
@@ -656,7 +535,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
}
}
/**
* <code>.CompoundQueueData compoundQueueData = 8;</code>
* <code>.CompoundQueueData compoundQueueData = 4;</code>
*/
public Builder setCompoundQueueData(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) {
if (compoundQueueDataBuilder_ == null) {
@@ -672,7 +551,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return this;
}
/**
* <code>.CompoundQueueData compoundQueueData = 8;</code>
* <code>.CompoundQueueData compoundQueueData = 4;</code>
*/
public Builder setCompoundQueueData(
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder builderForValue) {
@@ -686,7 +565,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return this;
}
/**
* <code>.CompoundQueueData compoundQueueData = 8;</code>
* <code>.CompoundQueueData compoundQueueData = 4;</code>
*/
public Builder mergeCompoundQueueData(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) {
if (compoundQueueDataBuilder_ == null) {
@@ -704,7 +583,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return this;
}
/**
* <code>.CompoundQueueData compoundQueueData = 8;</code>
* <code>.CompoundQueueData compoundQueueData = 4;</code>
*/
public Builder clearCompoundQueueData() {
if (compoundQueueDataBuilder_ == null) {
@@ -718,7 +597,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return this;
}
/**
* <code>.CompoundQueueData compoundQueueData = 8;</code>
* <code>.CompoundQueueData compoundQueueData = 4;</code>
*/
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder getCompoundQueueDataBuilder() {
@@ -726,7 +605,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return getCompoundQueueDataFieldBuilder().getBuilder();
}
/**
* <code>.CompoundQueueData compoundQueueData = 8;</code>
* <code>.CompoundQueueData compoundQueueData = 4;</code>
*/
public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataOrBuilder() {
if (compoundQueueDataBuilder_ != null) {
@@ -737,7 +616,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
}
}
/**
* <code>.CompoundQueueData compoundQueueData = 8;</code>
* <code>.CompoundQueueData compoundQueueData = 4;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder>
@@ -755,7 +634,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 15;</code>
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -763,7 +642,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 15;</code>
* <code>int32 retcode = 1;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -774,7 +653,7 @@ public final class PlayerCompoundMaterialRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 15;</code>
* <code>int32 retcode = 1;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -851,12 +730,10 @@ public final class PlayerCompoundMaterialRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\037PlayerCompoundMaterialRsp.proto\032\027Compo" +
"undQueueData.proto\"\254\001\n\031PlayerCompoundMat" +
"erialRsp\022-\n\021compoundQueueData\030\010 \001(\0132\022.Co" +
"mpoundQueueData\022\017\n\007retcode\030\017 \001(\005\"O\n\013OFCG" +
"ANODLLA\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\226\001\022\017\n\013D" +
"CDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu" +
".grasscutter.net.protob\006proto3"
"undQueueData.proto\"[\n\031PlayerCompoundMate" +
"rialRsp\022-\n\021compoundQueueData\030\004 \001(\0132\022.Com" +
"poundQueueData\022\017\n\007retcode\030\001 \001(\005B\033\n\031emu.g" +
"rasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,