Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 09:45:03 +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/EnterSceneReadyRspOuterClass.java
+32 -155
View File
@@ -19,18 +19,23 @@ public final class EnterSceneReadyRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>int32 retcode = 7;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 enterSceneToken = 9;</code>
* <code>uint32 enter_scene_token = 10;</code>
* @return The enterSceneToken.
*/
int getEnterSceneToken();
}
/**
* <pre>
* Name: GPCIOGEMCJP
* CmdId: 239
* </pre>
*
* Protobuf type {@code EnterSceneReadyRsp}
*/
public static final class EnterSceneReadyRsp extends
@@ -75,12 +80,12 @@ public final class EnterSceneReadyRspOuterClass {
case 0:
done = true;
break;
case 56: {
case 72: {
retcode_ = input.readInt32();
break;
}
case 72: {
case 80: {
enterSceneToken_ = input.readUInt32();
break;
@@ -117,141 +122,10 @@ public final class EnterSceneReadyRspOuterClass {
emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp.class, emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp.Builder.class);
}
/**
* Protobuf enum {@code EnterSceneReadyRsp.DBKKDMHCKCE}
*/
public enum DBKKDMHCKCE
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 233;</code>
*/
PEPPOHPHJOJ(1, 233),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final DBKKDMHCKCE DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 233;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 233;
/**
* <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 DBKKDMHCKCE 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 DBKKDMHCKCE forNumber(int value) {
switch (value) {
case 0: return NONE;
case 233: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<DBKKDMHCKCE>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
DBKKDMHCKCE> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<DBKKDMHCKCE>() {
public DBKKDMHCKCE findValueByNumber(int number) {
return DBKKDMHCKCE.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.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp.getDescriptor().getEnumTypes().get(0);
}
private static final DBKKDMHCKCE[] VALUES = getStaticValuesArray();
private static DBKKDMHCKCE[] getStaticValuesArray() {
return new DBKKDMHCKCE[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static DBKKDMHCKCE 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 DBKKDMHCKCE(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:EnterSceneReadyRsp.DBKKDMHCKCE)
}
public static final int RETCODE_FIELD_NUMBER = 7;
public static final int RETCODE_FIELD_NUMBER = 9;
private int retcode_;
/**
* <code>int32 retcode = 7;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -259,10 +133,10 @@ public final class EnterSceneReadyRspOuterClass {
return retcode_;
}
public static final int ENTERSCENETOKEN_FIELD_NUMBER = 9;
public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 10;
private int enterSceneToken_;
/**
* <code>uint32 enterSceneToken = 9;</code>
* <code>uint32 enter_scene_token = 10;</code>
* @return The enterSceneToken.
*/
@java.lang.Override
@@ -285,10 +159,10 @@ public final class EnterSceneReadyRspOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (retcode_ != 0) {
output.writeInt32(7, retcode_);
output.writeInt32(9, retcode_);
}
if (enterSceneToken_ != 0) {
output.writeUInt32(9, enterSceneToken_);
output.writeUInt32(10, enterSceneToken_);
}
unknownFields.writeTo(output);
}
@@ -301,11 +175,11 @@ public final class EnterSceneReadyRspOuterClass {
size = 0;
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(7, retcode_);
.computeInt32Size(9, retcode_);
}
if (enterSceneToken_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, enterSceneToken_);
.computeUInt32Size(10, enterSceneToken_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -339,7 +213,7 @@ public final class EnterSceneReadyRspOuterClass {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + ENTERSCENETOKEN_FIELD_NUMBER;
hash = (37 * hash) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
hash = (53 * hash) + getEnterSceneToken();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -437,6 +311,11 @@ public final class EnterSceneReadyRspOuterClass {
return builder;
}
/**
* <pre>
* Name: GPCIOGEMCJP
* CmdId: 239
* </pre>
*
* Protobuf type {@code EnterSceneReadyRsp}
*/
public static final class Builder extends
@@ -591,7 +470,7 @@ public final class EnterSceneReadyRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 7;</code>
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -599,7 +478,7 @@ public final class EnterSceneReadyRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 7;</code>
* <code>int32 retcode = 9;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -610,7 +489,7 @@ public final class EnterSceneReadyRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 7;</code>
* <code>int32 retcode = 9;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -622,7 +501,7 @@ public final class EnterSceneReadyRspOuterClass {
private int enterSceneToken_ ;
/**
* <code>uint32 enterSceneToken = 9;</code>
* <code>uint32 enter_scene_token = 10;</code>
* @return The enterSceneToken.
*/
@java.lang.Override
@@ -630,7 +509,7 @@ public final class EnterSceneReadyRspOuterClass {
return enterSceneToken_;
}
/**
* <code>uint32 enterSceneToken = 9;</code>
* <code>uint32 enter_scene_token = 10;</code>
* @param value The enterSceneToken to set.
* @return This builder for chaining.
*/
@@ -641,7 +520,7 @@ public final class EnterSceneReadyRspOuterClass {
return this;
}
/**
* <code>uint32 enterSceneToken = 9;</code>
* <code>uint32 enter_scene_token = 10;</code>
* @return This builder for chaining.
*/
public Builder clearEnterSceneToken() {
@@ -717,11 +596,9 @@ public final class EnterSceneReadyRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\030EnterSceneReadyRsp.proto\"\217\001\n\022EnterScen" +
"eReadyRsp\022\017\n\007retcode\030\007 \001(\005\022\027\n\017enterScene" +
"Token\030\t \001(\r\"O\n\013DBKKDMHCKCE\022\010\n\004NONE\020\000\022\020\n\013" +
"PEPPOHPHJOJ\020\351\001\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKO" +
"LMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutter.net.prot" +
"\n\030EnterSceneReadyRsp.proto\"@\n\022EnterScene" +
"ReadyRsp\022\017\n\007retcode\030\t \001(\005\022\031\n\021enter_scene" +
"_token\030\n \001(\rB\033\n\031emu.grasscutter.net.prot" +
"ob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor