Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-23 16:20:34 +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/HitTreeNotifyOuterClass.java
+74 -205
View File
@@ -19,42 +19,47 @@ public final class HitTreeNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.Vector dropPos = 11;</code>
* <code>.Vector drop_pos = 6;</code>
* @return Whether the dropPos field is set.
*/
boolean hasDropPos();
/**
* <code>.Vector dropPos = 11;</code>
* <code>.Vector drop_pos = 6;</code>
* @return The dropPos.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos();
/**
* <code>.Vector dropPos = 11;</code>
* <code>.Vector drop_pos = 6;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder();
/**
* <code>.Vector treePos = 4;</code>
* <code>.Vector tree_pos = 2;</code>
* @return Whether the treePos field is set.
*/
boolean hasTreePos();
/**
* <code>.Vector treePos = 4;</code>
* <code>.Vector tree_pos = 2;</code>
* @return The treePos.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos();
/**
* <code>.Vector treePos = 4;</code>
* <code>.Vector tree_pos = 2;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder();
/**
* <code>uint32 treeType = 5;</code>
* <code>uint32 tree_type = 11;</code>
* @return The treeType.
*/
int getTreeType();
}
/**
* <pre>
* Name: FCOELCNJHFD
* CmdId: 3299
* </pre>
*
* Protobuf type {@code HitTreeNotify}
*/
public static final class HitTreeNotify extends
@@ -99,7 +104,7 @@ public final class HitTreeNotifyOuterClass {
case 0:
done = true;
break;
case 34: {
case 18: {
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
if (treePos_ != null) {
subBuilder = treePos_.toBuilder();
@@ -112,12 +117,7 @@ public final class HitTreeNotifyOuterClass {
break;
}
case 40: {
treeType_ = input.readUInt32();
break;
}
case 90: {
case 50: {
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
if (dropPos_ != null) {
subBuilder = dropPos_.toBuilder();
@@ -130,6 +130,11 @@ public final class HitTreeNotifyOuterClass {
break;
}
case 88: {
treeType_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -162,149 +167,10 @@ public final class HitTreeNotifyOuterClass {
emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify.class, emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify.Builder.class);
}
/**
* Protobuf enum {@code HitTreeNotify.IGPKPGNGFHB}
*/
public enum IGPKPGNGFHB
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 3118;</code>
*/
PEPPOHPHJOJ(1, 3118),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final IGPKPGNGFHB DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final IGPKPGNGFHB EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 3118;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 3118;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final int DCDNILFDFLB_VALUE = 0;
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
public static final int NNBKOLMPOEA_VALUE = 1;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final int EAJIABGAOCI_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 IGPKPGNGFHB 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 IGPKPGNGFHB forNumber(int value) {
switch (value) {
case 0: return NONE;
case 3118: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<IGPKPGNGFHB>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
IGPKPGNGFHB> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<IGPKPGNGFHB>() {
public IGPKPGNGFHB findValueByNumber(int number) {
return IGPKPGNGFHB.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.HitTreeNotifyOuterClass.HitTreeNotify.getDescriptor().getEnumTypes().get(0);
}
private static final IGPKPGNGFHB[] VALUES = getStaticValuesArray();
private static IGPKPGNGFHB[] getStaticValuesArray() {
return new IGPKPGNGFHB[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static IGPKPGNGFHB 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 IGPKPGNGFHB(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:HitTreeNotify.IGPKPGNGFHB)
}
public static final int DROPPOS_FIELD_NUMBER = 11;
public static final int DROP_POS_FIELD_NUMBER = 6;
private emu.grasscutter.net.proto.VectorOuterClass.Vector dropPos_;
/**
* <code>.Vector dropPos = 11;</code>
* <code>.Vector drop_pos = 6;</code>
* @return Whether the dropPos field is set.
*/
@java.lang.Override
@@ -312,7 +178,7 @@ public final class HitTreeNotifyOuterClass {
return dropPos_ != null;
}
/**
* <code>.Vector dropPos = 11;</code>
* <code>.Vector drop_pos = 6;</code>
* @return The dropPos.
*/
@java.lang.Override
@@ -320,17 +186,17 @@ public final class HitTreeNotifyOuterClass {
return dropPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dropPos_;
}
/**
* <code>.Vector dropPos = 11;</code>
* <code>.Vector drop_pos = 6;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder() {
return getDropPos();
}
public static final int TREEPOS_FIELD_NUMBER = 4;
public static final int TREE_POS_FIELD_NUMBER = 2;
private emu.grasscutter.net.proto.VectorOuterClass.Vector treePos_;
/**
* <code>.Vector treePos = 4;</code>
* <code>.Vector tree_pos = 2;</code>
* @return Whether the treePos field is set.
*/
@java.lang.Override
@@ -338,7 +204,7 @@ public final class HitTreeNotifyOuterClass {
return treePos_ != null;
}
/**
* <code>.Vector treePos = 4;</code>
* <code>.Vector tree_pos = 2;</code>
* @return The treePos.
*/
@java.lang.Override
@@ -346,17 +212,17 @@ public final class HitTreeNotifyOuterClass {
return treePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : treePos_;
}
/**
* <code>.Vector treePos = 4;</code>
* <code>.Vector tree_pos = 2;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder() {
return getTreePos();
}
public static final int TREETYPE_FIELD_NUMBER = 5;
public static final int TREE_TYPE_FIELD_NUMBER = 11;
private int treeType_;
/**
* <code>uint32 treeType = 5;</code>
* <code>uint32 tree_type = 11;</code>
* @return The treeType.
*/
@java.lang.Override
@@ -379,13 +245,13 @@ public final class HitTreeNotifyOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (treePos_ != null) {
output.writeMessage(4, getTreePos());
}
if (treeType_ != 0) {
output.writeUInt32(5, treeType_);
output.writeMessage(2, getTreePos());
}
if (dropPos_ != null) {
output.writeMessage(11, getDropPos());
output.writeMessage(6, getDropPos());
}
if (treeType_ != 0) {
output.writeUInt32(11, treeType_);
}
unknownFields.writeTo(output);
}
@@ -398,15 +264,15 @@ public final class HitTreeNotifyOuterClass {
size = 0;
if (treePos_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(4, getTreePos());
}
if (treeType_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(5, treeType_);
.computeMessageSize(2, getTreePos());
}
if (dropPos_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(11, getDropPos());
.computeMessageSize(6, getDropPos());
}
if (treeType_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, treeType_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -447,14 +313,14 @@ public final class HitTreeNotifyOuterClass {
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (hasDropPos()) {
hash = (37 * hash) + DROPPOS_FIELD_NUMBER;
hash = (37 * hash) + DROP_POS_FIELD_NUMBER;
hash = (53 * hash) + getDropPos().hashCode();
}
if (hasTreePos()) {
hash = (37 * hash) + TREEPOS_FIELD_NUMBER;
hash = (37 * hash) + TREE_POS_FIELD_NUMBER;
hash = (53 * hash) + getTreePos().hashCode();
}
hash = (37 * hash) + TREETYPE_FIELD_NUMBER;
hash = (37 * hash) + TREE_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getTreeType();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -552,6 +418,11 @@ public final class HitTreeNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: FCOELCNJHFD
* CmdId: 3299
* </pre>
*
* Protobuf type {@code HitTreeNotify}
*/
public static final class Builder extends
@@ -730,14 +601,14 @@ public final class HitTreeNotifyOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> dropPosBuilder_;
/**
* <code>.Vector dropPos = 11;</code>
* <code>.Vector drop_pos = 6;</code>
* @return Whether the dropPos field is set.
*/
public boolean hasDropPos() {
return dropPosBuilder_ != null || dropPos_ != null;
}
/**
* <code>.Vector dropPos = 11;</code>
* <code>.Vector drop_pos = 6;</code>
* @return The dropPos.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getDropPos() {
@@ -748,7 +619,7 @@ public final class HitTreeNotifyOuterClass {
}
}
/**
* <code>.Vector dropPos = 11;</code>
* <code>.Vector drop_pos = 6;</code>
*/
public Builder setDropPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (dropPosBuilder_ == null) {
@@ -764,7 +635,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector dropPos = 11;</code>
* <code>.Vector drop_pos = 6;</code>
*/
public Builder setDropPos(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -778,7 +649,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector dropPos = 11;</code>
* <code>.Vector drop_pos = 6;</code>
*/
public Builder mergeDropPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (dropPosBuilder_ == null) {
@@ -796,7 +667,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector dropPos = 11;</code>
* <code>.Vector drop_pos = 6;</code>
*/
public Builder clearDropPos() {
if (dropPosBuilder_ == null) {
@@ -810,7 +681,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector dropPos = 11;</code>
* <code>.Vector drop_pos = 6;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDropPosBuilder() {
@@ -818,7 +689,7 @@ public final class HitTreeNotifyOuterClass {
return getDropPosFieldBuilder().getBuilder();
}
/**
* <code>.Vector dropPos = 11;</code>
* <code>.Vector drop_pos = 6;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder() {
if (dropPosBuilder_ != null) {
@@ -829,7 +700,7 @@ public final class HitTreeNotifyOuterClass {
}
}
/**
* <code>.Vector dropPos = 11;</code>
* <code>.Vector drop_pos = 6;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>
@@ -849,14 +720,14 @@ public final class HitTreeNotifyOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> treePosBuilder_;
/**
* <code>.Vector treePos = 4;</code>
* <code>.Vector tree_pos = 2;</code>
* @return Whether the treePos field is set.
*/
public boolean hasTreePos() {
return treePosBuilder_ != null || treePos_ != null;
}
/**
* <code>.Vector treePos = 4;</code>
* <code>.Vector tree_pos = 2;</code>
* @return The treePos.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos() {
@@ -867,7 +738,7 @@ public final class HitTreeNotifyOuterClass {
}
}
/**
* <code>.Vector treePos = 4;</code>
* <code>.Vector tree_pos = 2;</code>
*/
public Builder setTreePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (treePosBuilder_ == null) {
@@ -883,7 +754,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector treePos = 4;</code>
* <code>.Vector tree_pos = 2;</code>
*/
public Builder setTreePos(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -897,7 +768,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector treePos = 4;</code>
* <code>.Vector tree_pos = 2;</code>
*/
public Builder mergeTreePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (treePosBuilder_ == null) {
@@ -915,7 +786,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector treePos = 4;</code>
* <code>.Vector tree_pos = 2;</code>
*/
public Builder clearTreePos() {
if (treePosBuilder_ == null) {
@@ -929,7 +800,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>.Vector treePos = 4;</code>
* <code>.Vector tree_pos = 2;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getTreePosBuilder() {
@@ -937,7 +808,7 @@ public final class HitTreeNotifyOuterClass {
return getTreePosFieldBuilder().getBuilder();
}
/**
* <code>.Vector treePos = 4;</code>
* <code>.Vector tree_pos = 2;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder() {
if (treePosBuilder_ != null) {
@@ -948,7 +819,7 @@ public final class HitTreeNotifyOuterClass {
}
}
/**
* <code>.Vector treePos = 4;</code>
* <code>.Vector tree_pos = 2;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>
@@ -966,7 +837,7 @@ public final class HitTreeNotifyOuterClass {
private int treeType_ ;
/**
* <code>uint32 treeType = 5;</code>
* <code>uint32 tree_type = 11;</code>
* @return The treeType.
*/
@java.lang.Override
@@ -974,7 +845,7 @@ public final class HitTreeNotifyOuterClass {
return treeType_;
}
/**
* <code>uint32 treeType = 5;</code>
* <code>uint32 tree_type = 11;</code>
* @param value The treeType to set.
* @return This builder for chaining.
*/
@@ -985,7 +856,7 @@ public final class HitTreeNotifyOuterClass {
return this;
}
/**
* <code>uint32 treeType = 5;</code>
* <code>uint32 tree_type = 11;</code>
* @return This builder for chaining.
*/
public Builder clearTreeType() {
@@ -1061,13 +932,11 @@ public final class HitTreeNotifyOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\023HitTreeNotify.proto\032\014Vector.proto\"\267\001\n\r" +
"HitTreeNotify\022\030\n\007dropPos\030\013 \001(\0132\007.Vector\022" +
"\030\n\007treePos\030\004 \001(\0132\007.Vector\022\020\n\010treeType\030\005 " +
"\001(\r\"`\n\013IGPKPGNGFHB\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPH" +
"JOJ\020\256\030\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001" +
"\022\017\n\013EAJIABGAOCI\020\001\032\002\020\001B\033\n\031emu.grasscutter" +
".net.protob\006proto3"
"\n\023HitTreeNotify.proto\032\014Vector.proto\"X\n\rH" +
"itTreeNotify\022\031\n\010drop_pos\030\006 \001(\0132\007.Vector\022" +
"\031\n\010tree_pos\030\002 \001(\0132\007.Vector\022\021\n\ttree_type\030" +
"\013 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
"o3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,