Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 19:29:50 +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/SceneTransToPointRspOuterClass.java
+51 -174
View File
@@ -19,24 +19,29 @@ public final class SceneTransToPointRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 sceneId = 2;</code>
* <code>uint32 scene_id = 8;</code>
* @return The sceneId.
*/
int getSceneId();
/**
* <code>int32 retcode = 4;</code>
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 pointId = 12;</code>
* <code>uint32 point_id = 9;</code>
* @return The pointId.
*/
int getPointId();
}
/**
* <pre>
* Name: NLAGLOOCJKD
* CmdId: 223
* </pre>
*
* Protobuf type {@code SceneTransToPointRsp}
*/
public static final class SceneTransToPointRsp extends
@@ -81,17 +86,17 @@ public final class SceneTransToPointRspOuterClass {
case 0:
done = true;
break;
case 16: {
sceneId_ = input.readUInt32();
break;
}
case 32: {
case 8: {
retcode_ = input.readInt32();
break;
}
case 96: {
case 64: {
sceneId_ = input.readUInt32();
break;
}
case 72: {
pointId_ = input.readUInt32();
break;
@@ -128,141 +133,10 @@ public final class SceneTransToPointRspOuterClass {
emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp.class, emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp.Builder.class);
}
/**
* Protobuf enum {@code SceneTransToPointRsp.CMLEKCNMFJM}
*/
public enum CMLEKCNMFJM
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 300;</code>
*/
PEPPOHPHJOJ(1, 300),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final CMLEKCNMFJM DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 300;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 300;
/**
* <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 CMLEKCNMFJM 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 CMLEKCNMFJM forNumber(int value) {
switch (value) {
case 0: return NONE;
case 300: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<CMLEKCNMFJM>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
CMLEKCNMFJM> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<CMLEKCNMFJM>() {
public CMLEKCNMFJM findValueByNumber(int number) {
return CMLEKCNMFJM.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.SceneTransToPointRspOuterClass.SceneTransToPointRsp.getDescriptor().getEnumTypes().get(0);
}
private static final CMLEKCNMFJM[] VALUES = getStaticValuesArray();
private static CMLEKCNMFJM[] getStaticValuesArray() {
return new CMLEKCNMFJM[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static CMLEKCNMFJM 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 CMLEKCNMFJM(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:SceneTransToPointRsp.CMLEKCNMFJM)
}
public static final int SCENEID_FIELD_NUMBER = 2;
public static final int SCENE_ID_FIELD_NUMBER = 8;
private int sceneId_;
/**
* <code>uint32 sceneId = 2;</code>
* <code>uint32 scene_id = 8;</code>
* @return The sceneId.
*/
@java.lang.Override
@@ -270,10 +144,10 @@ public final class SceneTransToPointRspOuterClass {
return sceneId_;
}
public static final int RETCODE_FIELD_NUMBER = 4;
public static final int RETCODE_FIELD_NUMBER = 1;
private int retcode_;
/**
* <code>int32 retcode = 4;</code>
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -281,10 +155,10 @@ public final class SceneTransToPointRspOuterClass {
return retcode_;
}
public static final int POINTID_FIELD_NUMBER = 12;
public static final int POINT_ID_FIELD_NUMBER = 9;
private int pointId_;
/**
* <code>uint32 pointId = 12;</code>
* <code>uint32 point_id = 9;</code>
* @return The pointId.
*/
@java.lang.Override
@@ -306,14 +180,14 @@ public final class SceneTransToPointRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (sceneId_ != 0) {
output.writeUInt32(2, sceneId_);
}
if (retcode_ != 0) {
output.writeInt32(4, retcode_);
output.writeInt32(1, retcode_);
}
if (sceneId_ != 0) {
output.writeUInt32(8, sceneId_);
}
if (pointId_ != 0) {
output.writeUInt32(12, pointId_);
output.writeUInt32(9, pointId_);
}
unknownFields.writeTo(output);
}
@@ -324,17 +198,17 @@ public final class SceneTransToPointRspOuterClass {
if (size != -1) return size;
size = 0;
if (sceneId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, sceneId_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(4, retcode_);
.computeInt32Size(1, retcode_);
}
if (sceneId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, sceneId_);
}
if (pointId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, pointId_);
.computeUInt32Size(9, pointId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -368,11 +242,11 @@ public final class SceneTransToPointRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SCENEID_FIELD_NUMBER;
hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
hash = (53 * hash) + getSceneId();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + POINTID_FIELD_NUMBER;
hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
hash = (53 * hash) + getPointId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -470,6 +344,11 @@ public final class SceneTransToPointRspOuterClass {
return builder;
}
/**
* <pre>
* Name: NLAGLOOCJKD
* CmdId: 223
* </pre>
*
* Protobuf type {@code SceneTransToPointRsp}
*/
public static final class Builder extends
@@ -630,7 +509,7 @@ public final class SceneTransToPointRspOuterClass {
private int sceneId_ ;
/**
* <code>uint32 sceneId = 2;</code>
* <code>uint32 scene_id = 8;</code>
* @return The sceneId.
*/
@java.lang.Override
@@ -638,7 +517,7 @@ public final class SceneTransToPointRspOuterClass {
return sceneId_;
}
/**
* <code>uint32 sceneId = 2;</code>
* <code>uint32 scene_id = 8;</code>
* @param value The sceneId to set.
* @return This builder for chaining.
*/
@@ -649,7 +528,7 @@ public final class SceneTransToPointRspOuterClass {
return this;
}
/**
* <code>uint32 sceneId = 2;</code>
* <code>uint32 scene_id = 8;</code>
* @return This builder for chaining.
*/
public Builder clearSceneId() {
@@ -661,7 +540,7 @@ public final class SceneTransToPointRspOuterClass {
private int retcode_ ;
/**
* <code>int32 retcode = 4;</code>
* <code>int32 retcode = 1;</code>
* @return The retcode.
*/
@java.lang.Override
@@ -669,7 +548,7 @@ public final class SceneTransToPointRspOuterClass {
return retcode_;
}
/**
* <code>int32 retcode = 4;</code>
* <code>int32 retcode = 1;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
@@ -680,7 +559,7 @@ public final class SceneTransToPointRspOuterClass {
return this;
}
/**
* <code>int32 retcode = 4;</code>
* <code>int32 retcode = 1;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
@@ -692,7 +571,7 @@ public final class SceneTransToPointRspOuterClass {
private int pointId_ ;
/**
* <code>uint32 pointId = 12;</code>
* <code>uint32 point_id = 9;</code>
* @return The pointId.
*/
@java.lang.Override
@@ -700,7 +579,7 @@ public final class SceneTransToPointRspOuterClass {
return pointId_;
}
/**
* <code>uint32 pointId = 12;</code>
* <code>uint32 point_id = 9;</code>
* @param value The pointId to set.
* @return This builder for chaining.
*/
@@ -711,7 +590,7 @@ public final class SceneTransToPointRspOuterClass {
return this;
}
/**
* <code>uint32 pointId = 12;</code>
* <code>uint32 point_id = 9;</code>
* @return This builder for chaining.
*/
public Builder clearPointId() {
@@ -787,11 +666,9 @@ public final class SceneTransToPointRspOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\032SceneTransToPointRsp.proto\"\232\001\n\024SceneTr" +
"ansToPointRsp\022\017\n\007sceneId\030\002 \001(\r\022\017\n\007retcod" +
"e\030\004 \001(\005\022\017\n\007pointId\030\014 \001(\r\"O\n\013CMLEKCNMFJM\022" +
"\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\254\002\022\017\n\013DCDNILFDF" +
"LB\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscu" +
"\n\032SceneTransToPointRsp.proto\"K\n\024SceneTra" +
"nsToPointRsp\022\020\n\010scene_id\030\010 \001(\r\022\017\n\007retcod" +
"e\030\001 \001(\005\022\020\n\010point_id\030\t \001(\rB\033\n\031emu.grasscu" +
"tter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor