Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-02 19:59:54 +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/SalesmanDeliverItemRspOuterClass.java
+33 -156
View File
@@ -19,18 +19,23 @@ public final class SalesmanDeliverItemRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 scheduleId = 1;</code>
* <code>uint32 schedule_id = 6;</code>
* @return The scheduleId.
*/
int getScheduleId();
/**
* <code>int32 retcode = 10;</code>
* <code>int32 retcode = 8;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* Name: BKHOMIHCJML
* CmdId: 2067
* </pre>
*
* Protobuf type {@code SalesmanDeliverItemRsp}
*/
public static final class SalesmanDeliverItemRsp extends
@@ -75,12 +80,12 @@ public final class SalesmanDeliverItemRspOuterClass {
case 0:
done = true;
break;
case 8: {
case 48: {
scheduleId_ = input.readUInt32();
break;
}
case 80: {
case 64: {
retcode_ = input.readInt32();
break;
@@ -117,141 +122,10 @@ public final class SalesmanDeliverItemRspOuterClass {
emu.grasscutter.net.proto.SalesmanDeliverItemRspOuterClass.SalesmanDeliverItemRsp.class, emu.grasscutter.net.proto.SalesmanDeliverItemRspOuterClass.SalesmanDeliverItemRsp.Builder.class);
}
/**
* Protobuf enum {@code SalesmanDeliverItemRsp.GGKOGIPNKPI}
*/
public enum GGKOGIPNKPI
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 2096;</code>
*/
PEPPOHPHJOJ(1, 2096),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final GGKOGIPNKPI DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 2096;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 2096;
/**
* <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 GGKOGIPNKPI 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 GGKOGIPNKPI forNumber(int value) {
switch (value) {
case 0: return NONE;
case 2096: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<GGKOGIPNKPI>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
GGKOGIPNKPI> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<GGKOGIPNKPI>() {
public GGKOGIPNKPI findValueByNumber(int number) {
return GGKOGIPNKPI.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.SalesmanDeliverItemRspOuterClass.SalesmanDeliverItemRsp.getDescriptor().getEnumTypes().get(0);
}
private static final GGKOGIPNKPI[] VALUES = getStaticValuesArray();
private static GGKOGIPNKPI[] getStaticValuesArray() {
return new GGKOGIPNKPI[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static GGKOGIPNKPI 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 GGKOGIPNKPI(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:SalesmanDeliverItemRsp.GGKOGIPNKPI)
}
public static final int SCHEDULEID_FIELD_NUMBER = 1;
public static final int SCHEDULE_ID_FIELD_NUMBER = 6;
private int scheduleId_;
/**
* <code>uint32 scheduleId = 1;</code>
* <code>uint32 schedule_id = 6;</code>
* @return The scheduleId.
*/
@java.lang.Override
@@ -259,10 +133,10 @@ public final class SalesmanDeliverItemRspOuterClass {
return scheduleId_;
}
public static final int RETCODE_FIELD_NUMBER = 10;
public static final int RETCODE_FIELD_NUMBER = 8;
private int retcode_;
/**
* <code>int32 retcode = 10;</code>
* <code>int32 retcode = 8;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -285,10 +159,10 @@ public final class SalesmanDeliverItemRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (scheduleId_ != 0) {
output.writeUInt32(1, scheduleId_);
output.writeUInt32(6, scheduleId_);
}
if (retcode_ != 0) {
output.writeInt32(10, retcode_);
output.writeInt32(8, retcode_);
}
unknownFields.writeTo(output);
}
@@ -301,11 +175,11 @@ public final class SalesmanDeliverItemRspOuterClass {
size = 0;
if (scheduleId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, scheduleId_);
.computeUInt32Size(6, scheduleId_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(10, retcode_);
.computeInt32Size(8, retcode_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -337,7 +211,7 @@ public final class SalesmanDeliverItemRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SCHEDULEID_FIELD_NUMBER;
hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER;
hash = (53 * hash) + getScheduleId();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
@@ -437,6 +311,11 @@ public final class SalesmanDeliverItemRspOuterClass {
return builder;
}
/**
* <pre>
* Name: BKHOMIHCJML
* CmdId: 2067
* </pre>
*
* Protobuf type {@code SalesmanDeliverItemRsp}
*/
public static final class Builder extends
@@ -591,7 +470,7 @@ public final class SalesmanDeliverItemRspOuterClass {
private int scheduleId_ ;
/**
* <code>uint32 scheduleId = 1;</code>
* <code>uint32 schedule_id = 6;</code>
* @return The scheduleId.
*/
@java.lang.Override
@@ -599,7 +478,7 @@ public final class SalesmanDeliverItemRspOuterClass {
return scheduleId_;
}
/**
* <code>uint32 scheduleId = 1;</code>
* <code>uint32 schedule_id = 6;</code>
* @param value The scheduleId to set.
* @return This builder for chaining.
*/
@@ -610,7 +489,7 @@ public final class SalesmanDeliverItemRspOuterClass {
return this;
}
/**
* <code>uint32 scheduleId = 1;</code>
* <code>uint32 schedule_id = 6;</code>
* @return This builder for chaining.
*/
public Builder clearScheduleId() {
@@ -622,7 +501,7 @@ public final class SalesmanDeliverItemRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 10;</code>
* <code>int32 retcode = 8;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -630,7 +509,7 @@ public final class SalesmanDeliverItemRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 10;</code>
* <code>int32 retcode = 8;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -641,7 +520,7 @@ public final class SalesmanDeliverItemRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 10;</code>
* <code>int32 retcode = 8;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -717,12 +596,10 @@ public final class SalesmanDeliverItemRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\034SalesmanDeliverItemRsp.proto\"\216\001\n\026Sales" +
"manDeliverItemRsp\022\022\n\nscheduleId\030\001 \001(\r\022\017\n" +
"\007retcode\030\n \001(\005\"O\n\013GGKOGIPNKPI\022\010\n\004NONE\020\000\022" +
"\020\n\013PEPPOHPHJOJ\020\260\020\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NN" +
"BKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.net.p" +
"rotob\006proto3"
"\n\034SalesmanDeliverItemRsp.proto\">\n\026Salesm" +
"anDeliverItemRsp\022\023\n\013schedule_id\030\006 \001(\r\022\017\n" +
"\007retcode\030\010 \001(\005B\033\n\031emu.grasscutter.net.pr" +
"otob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,