Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 13:49:59 +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/MapMarkPointOuterClass.java
+63 -55
View File
@@ -19,7 +19,7 @@ public final class MapMarkPointOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 sceneId = 1;</code>
* <code>uint32 scene_id = 1;</code>
* @return The sceneId.
*/
int getSceneId();
@@ -52,40 +52,44 @@ public final class MapMarkPointOuterClass {
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
/**
* <code>.MapMarkPointType pointType = 4;</code>
* <code>.MapMarkPointType point_type = 4;</code>
* @return The enum numeric value on the wire for pointType.
*/
int getPointTypeValue();
/**
* <code>.MapMarkPointType pointType = 4;</code>
* <code>.MapMarkPointType point_type = 4;</code>
* @return The pointType.
*/
emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.MapMarkPointType getPointType();
/**
* <code>uint32 monsterId = 5;</code>
* <code>uint32 monster_id = 5;</code>
* @return The monsterId.
*/
int getMonsterId();
/**
* <code>.MapMarkFromType fromType = 6;</code>
* <code>.MapMarkFromType from_type = 6;</code>
* @return The enum numeric value on the wire for fromType.
*/
int getFromTypeValue();
/**
* <code>.MapMarkFromType fromType = 6;</code>
* <code>.MapMarkFromType from_type = 6;</code>
* @return The fromType.
*/
emu.grasscutter.net.proto.MapMarkFromTypeOuterClass.MapMarkFromType getFromType();
/**
* <code>uint32 questId = 7;</code>
* <code>uint32 quest_id = 7;</code>
* @return The questId.
*/
int getQuestId();
}
/**
* <pre>
* Name: CKNMIHFPLAI
* </pre>
*
* Protobuf type {@code MapMarkPoint}
*/
public static final class MapMarkPoint extends
@@ -211,10 +215,10 @@ public final class MapMarkPointOuterClass {
emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.class, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder.class);
}
public static final int SCENEID_FIELD_NUMBER = 1;
public static final int SCENE_ID_FIELD_NUMBER = 1;
private int sceneId_;
/**
* <code>uint32 sceneId = 1;</code>
* <code>uint32 scene_id = 1;</code>
* @return The sceneId.
*/
@java.lang.Override
@@ -286,17 +290,17 @@ public final class MapMarkPointOuterClass {
return getPos();
}
public static final int POINTTYPE_FIELD_NUMBER = 4;
public static final int POINT_TYPE_FIELD_NUMBER = 4;
private int pointType_;
/**
* <code>.MapMarkPointType pointType = 4;</code>
* <code>.MapMarkPointType point_type = 4;</code>
* @return The enum numeric value on the wire for pointType.
*/
@java.lang.Override public int getPointTypeValue() {
return pointType_;
}
/**
* <code>.MapMarkPointType pointType = 4;</code>
* <code>.MapMarkPointType point_type = 4;</code>
* @return The pointType.
*/
@java.lang.Override public emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.MapMarkPointType getPointType() {
@@ -305,10 +309,10 @@ public final class MapMarkPointOuterClass {
return result == null ? emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.MapMarkPointType.UNRECOGNIZED : result;
}
public static final int MONSTERID_FIELD_NUMBER = 5;
public static final int MONSTER_ID_FIELD_NUMBER = 5;
private int monsterId_;
/**
* <code>uint32 monsterId = 5;</code>
* <code>uint32 monster_id = 5;</code>
* @return The monsterId.
*/
@java.lang.Override
@@ -316,17 +320,17 @@ public final class MapMarkPointOuterClass {
return monsterId_;
}
public static final int FROMTYPE_FIELD_NUMBER = 6;
public static final int FROM_TYPE_FIELD_NUMBER = 6;
private int fromType_;
/**
* <code>.MapMarkFromType fromType = 6;</code>
* <code>.MapMarkFromType from_type = 6;</code>
* @return The enum numeric value on the wire for fromType.
*/
@java.lang.Override public int getFromTypeValue() {
return fromType_;
}
/**
* <code>.MapMarkFromType fromType = 6;</code>
* <code>.MapMarkFromType from_type = 6;</code>
* @return The fromType.
*/
@java.lang.Override public emu.grasscutter.net.proto.MapMarkFromTypeOuterClass.MapMarkFromType getFromType() {
@@ -335,10 +339,10 @@ public final class MapMarkPointOuterClass {
return result == null ? emu.grasscutter.net.proto.MapMarkFromTypeOuterClass.MapMarkFromType.UNRECOGNIZED : result;
}
public static final int QUESTID_FIELD_NUMBER = 7;
public static final int QUEST_ID_FIELD_NUMBER = 7;
private int questId_;
/**
* <code>uint32 questId = 7;</code>
* <code>uint32 quest_id = 7;</code>
* @return The questId.
*/
@java.lang.Override
@@ -458,7 +462,7 @@ public final class MapMarkPointOuterClass {
}
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) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -466,13 +470,13 @@ public final class MapMarkPointOuterClass {
hash = (37 * hash) + POS_FIELD_NUMBER;
hash = (53 * hash) + getPos().hashCode();
}
hash = (37 * hash) + POINTTYPE_FIELD_NUMBER;
hash = (37 * hash) + POINT_TYPE_FIELD_NUMBER;
hash = (53 * hash) + pointType_;
hash = (37 * hash) + MONSTERID_FIELD_NUMBER;
hash = (37 * hash) + MONSTER_ID_FIELD_NUMBER;
hash = (53 * hash) + getMonsterId();
hash = (37 * hash) + FROMTYPE_FIELD_NUMBER;
hash = (37 * hash) + FROM_TYPE_FIELD_NUMBER;
hash = (53 * hash) + fromType_;
hash = (37 * hash) + QUESTID_FIELD_NUMBER;
hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
hash = (53 * hash) + getQuestId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -570,6 +574,10 @@ public final class MapMarkPointOuterClass {
return builder;
}
/**
* <pre>
* Name: CKNMIHFPLAI
* </pre>
*
* Protobuf type {@code MapMarkPoint}
*/
public static final class Builder extends
@@ -763,7 +771,7 @@ public final class MapMarkPointOuterClass {
private int sceneId_ ;
/**
* <code>uint32 sceneId = 1;</code>
* <code>uint32 scene_id = 1;</code>
* @return The sceneId.
*/
@java.lang.Override
@@ -771,7 +779,7 @@ public final class MapMarkPointOuterClass {
return sceneId_;
}
/**
* <code>uint32 sceneId = 1;</code>
* <code>uint32 scene_id = 1;</code>
* @param value The sceneId to set.
* @return This builder for chaining.
*/
@@ -782,7 +790,7 @@ public final class MapMarkPointOuterClass {
return this;
}
/**
* <code>uint32 sceneId = 1;</code>
* <code>uint32 scene_id = 1;</code>
* @return This builder for chaining.
*/
public Builder clearSceneId() {
@@ -989,14 +997,14 @@ public final class MapMarkPointOuterClass {
private int pointType_ = 0;
/**
* <code>.MapMarkPointType pointType = 4;</code>
* <code>.MapMarkPointType point_type = 4;</code>
* @return The enum numeric value on the wire for pointType.
*/
@java.lang.Override public int getPointTypeValue() {
return pointType_;
}
/**
* <code>.MapMarkPointType pointType = 4;</code>
* <code>.MapMarkPointType point_type = 4;</code>
* @param value The enum numeric value on the wire for pointType to set.
* @return This builder for chaining.
*/
@@ -1007,7 +1015,7 @@ public final class MapMarkPointOuterClass {
return this;
}
/**
* <code>.MapMarkPointType pointType = 4;</code>
* <code>.MapMarkPointType point_type = 4;</code>
* @return The pointType.
*/
@java.lang.Override
@@ -1017,7 +1025,7 @@ public final class MapMarkPointOuterClass {
return result == null ? emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.MapMarkPointType.UNRECOGNIZED : result;
}
/**
* <code>.MapMarkPointType pointType = 4;</code>
* <code>.MapMarkPointType point_type = 4;</code>
* @param value The pointType to set.
* @return This builder for chaining.
*/
@@ -1031,7 +1039,7 @@ public final class MapMarkPointOuterClass {
return this;
}
/**
* <code>.MapMarkPointType pointType = 4;</code>
* <code>.MapMarkPointType point_type = 4;</code>
* @return This builder for chaining.
*/
public Builder clearPointType() {
@@ -1043,7 +1051,7 @@ public final class MapMarkPointOuterClass {
private int monsterId_ ;
/**
* <code>uint32 monsterId = 5;</code>
* <code>uint32 monster_id = 5;</code>
* @return The monsterId.
*/
@java.lang.Override
@@ -1051,7 +1059,7 @@ public final class MapMarkPointOuterClass {
return monsterId_;
}
/**
* <code>uint32 monsterId = 5;</code>
* <code>uint32 monster_id = 5;</code>
* @param value The monsterId to set.
* @return This builder for chaining.
*/
@@ -1062,7 +1070,7 @@ public final class MapMarkPointOuterClass {
return this;
}
/**
* <code>uint32 monsterId = 5;</code>
* <code>uint32 monster_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearMonsterId() {
@@ -1074,14 +1082,14 @@ public final class MapMarkPointOuterClass {
private int fromType_ = 0;
/**
* <code>.MapMarkFromType fromType = 6;</code>
* <code>.MapMarkFromType from_type = 6;</code>
* @return The enum numeric value on the wire for fromType.
*/
@java.lang.Override public int getFromTypeValue() {
return fromType_;
}
/**
* <code>.MapMarkFromType fromType = 6;</code>
* <code>.MapMarkFromType from_type = 6;</code>
* @param value The enum numeric value on the wire for fromType to set.
* @return This builder for chaining.
*/
@@ -1092,7 +1100,7 @@ public final class MapMarkPointOuterClass {
return this;
}
/**
* <code>.MapMarkFromType fromType = 6;</code>
* <code>.MapMarkFromType from_type = 6;</code>
* @return The fromType.
*/
@java.lang.Override
@@ -1102,7 +1110,7 @@ public final class MapMarkPointOuterClass {
return result == null ? emu.grasscutter.net.proto.MapMarkFromTypeOuterClass.MapMarkFromType.UNRECOGNIZED : result;
}
/**
* <code>.MapMarkFromType fromType = 6;</code>
* <code>.MapMarkFromType from_type = 6;</code>
* @param value The fromType to set.
* @return This builder for chaining.
*/
@@ -1116,7 +1124,7 @@ public final class MapMarkPointOuterClass {
return this;
}
/**
* <code>.MapMarkFromType fromType = 6;</code>
* <code>.MapMarkFromType from_type = 6;</code>
* @return This builder for chaining.
*/
public Builder clearFromType() {
@@ -1128,7 +1136,7 @@ public final class MapMarkPointOuterClass {
private int questId_ ;
/**
* <code>uint32 questId = 7;</code>
* <code>uint32 quest_id = 7;</code>
* @return The questId.
*/
@java.lang.Override
@@ -1136,7 +1144,7 @@ public final class MapMarkPointOuterClass {
return questId_;
}
/**
* <code>uint32 questId = 7;</code>
* <code>uint32 quest_id = 7;</code>
* @param value The questId to set.
* @return This builder for chaining.
*/
@@ -1147,7 +1155,7 @@ public final class MapMarkPointOuterClass {
return this;
}
/**
* <code>uint32 questId = 7;</code>
* <code>uint32 quest_id = 7;</code>
* @return This builder for chaining.
*/
public Builder clearQuestId() {
@@ -1223,21 +1231,21 @@ public final class MapMarkPointOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\022MapMarkPoint.proto\032\014Vector.proto\032\026MapM" +
"arkPointType.proto\032\025MapMarkFromType.prot" +
"o\"\261\001\n\014MapMarkPoint\022\017\n\007sceneId\030\001 \001(\r\022\014\n\004n" +
"ame\030\002 \001(\t\022\024\n\003pos\030\003 \001(\0132\007.Vector\022$\n\tpoint" +
"Type\030\004 \001(\0162\021.MapMarkPointType\022\021\n\tmonster" +
"Id\030\005 \001(\r\022\"\n\010fromType\030\006 \001(\0162\020.MapMarkFrom" +
"Type\022\017\n\007questId\030\007 \001(\rB\033\n\031emu.grasscutter" +
".net.protob\006proto3"
"\n\022MapMarkPoint.proto\032\025MapMarkFromType.pr" +
"oto\032\026MapMarkPointType.proto\032\014Vector.prot" +
"o\"\266\001\n\014MapMarkPoint\022\020\n\010scene_id\030\001 \001(\r\022\014\n\004" +
"name\030\002 \001(\t\022\024\n\003pos\030\003 \001(\0132\007.Vector\022%\n\npoin" +
"t_type\030\004 \001(\0162\021.MapMarkPointType\022\022\n\nmonst" +
"er_id\030\005 \001(\r\022#\n\tfrom_type\030\006 \001(\0162\020.MapMark" +
"FromType\022\020\n\010quest_id\030\007 \001(\rB\033\n\031emu.grassc" +
"utter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.getDescriptor(),
emu.grasscutter.net.proto.MapMarkFromTypeOuterClass.getDescriptor(),
emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.getDescriptor(),
emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
});
internal_static_MapMarkPoint_descriptor =
getDescriptor().getMessageTypes().get(0);
@@ -1245,9 +1253,9 @@ public final class MapMarkPointOuterClass {
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_MapMarkPoint_descriptor,
new java.lang.String[] { "SceneId", "Name", "Pos", "PointType", "MonsterId", "FromType", "QuestId", });
emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.getDescriptor();
emu.grasscutter.net.proto.MapMarkFromTypeOuterClass.getDescriptor();
emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.getDescriptor();
emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
}
// @@protoc_insertion_point(outer_class_scope)