Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-06 10:53:36 +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/DropHintNotifyOuterClass.java
+67 -190
View File
@@ -19,38 +19,43 @@ public final class DropHintNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.Vector position = 9;</code>
* <code>.Vector position = 14;</code>
* @return Whether the position field is set.
*/
boolean hasPosition();
/**
* <code>.Vector position = 9;</code>
* <code>.Vector position = 14;</code>
* @return The position.
*/
emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition();
/**
* <code>.Vector position = 9;</code>
* <code>.Vector position = 14;</code>
*/
emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
/**
* <code>repeated uint32 itemIdList = 10;</code>
* <code>repeated uint32 item_id_list = 5;</code>
* @return A list containing the itemIdList.
*/
java.util.List<java.lang.Integer> getItemIdListList();
/**
* <code>repeated uint32 itemIdList = 10;</code>
* <code>repeated uint32 item_id_list = 5;</code>
* @return The count of itemIdList.
*/
int getItemIdListCount();
/**
* <code>repeated uint32 itemIdList = 10;</code>
* <code>repeated uint32 item_id_list = 5;</code>
* @param index The index of the element to return.
* @return The itemIdList at the given index.
*/
int getItemIdList(int index);
}
/**
* <pre>
* Name: PAKLNEDHMBL
* CmdId: 633
* </pre>
*
* Protobuf type {@code DropHintNotify}
*/
public static final class DropHintNotify extends
@@ -97,20 +102,7 @@ public final class DropHintNotifyOuterClass {
case 0:
done = true;
break;
case 74: {
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
if (position_ != null) {
subBuilder = position_.toBuilder();
}
position_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(position_);
position_ = subBuilder.buildPartial();
}
break;
}
case 80: {
case 40: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
itemIdList_ = newIntList();
mutable_bitField0_ |= 0x00000001;
@@ -118,7 +110,7 @@ public final class DropHintNotifyOuterClass {
itemIdList_.addInt(input.readUInt32());
break;
}
case 82: {
case 42: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -131,6 +123,19 @@ public final class DropHintNotifyOuterClass {
input.popLimit(limit);
break;
}
case 114: {
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
if (position_ != null) {
subBuilder = position_.toBuilder();
}
position_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(position_);
position_ = subBuilder.buildPartial();
}
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -166,141 +171,10 @@ public final class DropHintNotifyOuterClass {
emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify.class, emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify.Builder.class);
}
/**
* Protobuf enum {@code DropHintNotify.MDFCGFMGDNI}
*/
public enum MDFCGFMGDNI
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 642;</code>
*/
PEPPOHPHJOJ(1, 642),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final MDFCGFMGDNI DCDNILFDFLB = NONE;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 642;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 642;
/**
* <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 MDFCGFMGDNI 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 MDFCGFMGDNI forNumber(int value) {
switch (value) {
case 0: return NONE;
case 642: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<MDFCGFMGDNI>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
MDFCGFMGDNI> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<MDFCGFMGDNI>() {
public MDFCGFMGDNI findValueByNumber(int number) {
return MDFCGFMGDNI.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.DropHintNotifyOuterClass.DropHintNotify.getDescriptor().getEnumTypes().get(0);
}
private static final MDFCGFMGDNI[] VALUES = getStaticValuesArray();
private static MDFCGFMGDNI[] getStaticValuesArray() {
return new MDFCGFMGDNI[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA,
};
}
public static MDFCGFMGDNI 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 MDFCGFMGDNI(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:DropHintNotify.MDFCGFMGDNI)
}
public static final int POSITION_FIELD_NUMBER = 9;
public static final int POSITION_FIELD_NUMBER = 14;
private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
/**
* <code>.Vector position = 9;</code>
* <code>.Vector position = 14;</code>
* @return Whether the position field is set.
*/
@java.lang.Override
@@ -308,7 +182,7 @@ public final class DropHintNotifyOuterClass {
return position_ != null;
}
/**
* <code>.Vector position = 9;</code>
* <code>.Vector position = 14;</code>
* @return The position.
*/
@java.lang.Override
@@ -316,17 +190,17 @@ public final class DropHintNotifyOuterClass {
return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
}
/**
* <code>.Vector position = 9;</code>
* <code>.Vector position = 14;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
return getPosition();
}
public static final int ITEMIDLIST_FIELD_NUMBER = 10;
public static final int ITEM_ID_LIST_FIELD_NUMBER = 5;
private com.google.protobuf.Internal.IntList itemIdList_;
/**
* <code>repeated uint32 itemIdList = 10;</code>
* <code>repeated uint32 item_id_list = 5;</code>
* @return A list containing the itemIdList.
*/
@java.lang.Override
@@ -335,14 +209,14 @@ public final class DropHintNotifyOuterClass {
return itemIdList_;
}
/**
* <code>repeated uint32 itemIdList = 10;</code>
* <code>repeated uint32 item_id_list = 5;</code>
* @return The count of itemIdList.
*/
public int getItemIdListCount() {
return itemIdList_.size();
}
/**
* <code>repeated uint32 itemIdList = 10;</code>
* <code>repeated uint32 item_id_list = 5;</code>
* @param index The index of the element to return.
* @return The itemIdList at the given index.
*/
@@ -366,16 +240,16 @@ public final class DropHintNotifyOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (position_ != null) {
output.writeMessage(9, getPosition());
}
if (getItemIdListList().size() > 0) {
output.writeUInt32NoTag(82);
output.writeUInt32NoTag(42);
output.writeUInt32NoTag(itemIdListMemoizedSerializedSize);
}
for (int i = 0; i < itemIdList_.size(); i++) {
output.writeUInt32NoTag(itemIdList_.getInt(i));
}
if (position_ != null) {
output.writeMessage(14, getPosition());
}
unknownFields.writeTo(output);
}
@@ -385,10 +259,6 @@ public final class DropHintNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (position_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(9, getPosition());
}
{
int dataSize = 0;
for (int i = 0; i < itemIdList_.size(); i++) {
@@ -403,6 +273,10 @@ public final class DropHintNotifyOuterClass {
}
itemIdListMemoizedSerializedSize = dataSize;
}
if (position_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(14, getPosition());
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -441,7 +315,7 @@ public final class DropHintNotifyOuterClass {
hash = (53 * hash) + getPosition().hashCode();
}
if (getItemIdListCount() > 0) {
hash = (37 * hash) + ITEMIDLIST_FIELD_NUMBER;
hash = (37 * hash) + ITEM_ID_LIST_FIELD_NUMBER;
hash = (53 * hash) + getItemIdListList().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
@@ -540,6 +414,11 @@ public final class DropHintNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: PAKLNEDHMBL
* CmdId: 633
* </pre>
*
* Protobuf type {@code DropHintNotify}
*/
public static final class Builder extends
@@ -717,14 +596,14 @@ public final class DropHintNotifyOuterClass {
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> positionBuilder_;
/**
* <code>.Vector position = 9;</code>
* <code>.Vector position = 14;</code>
* @return Whether the position field is set.
*/
public boolean hasPosition() {
return positionBuilder_ != null || position_ != null;
}
/**
* <code>.Vector position = 9;</code>
* <code>.Vector position = 14;</code>
* @return The position.
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
@@ -735,7 +614,7 @@ public final class DropHintNotifyOuterClass {
}
}
/**
* <code>.Vector position = 9;</code>
* <code>.Vector position = 14;</code>
*/
public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (positionBuilder_ == null) {
@@ -751,7 +630,7 @@ public final class DropHintNotifyOuterClass {
return this;
}
/**
* <code>.Vector position = 9;</code>
* <code>.Vector position = 14;</code>
*/
public Builder setPosition(
emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -765,7 +644,7 @@ public final class DropHintNotifyOuterClass {
return this;
}
/**
* <code>.Vector position = 9;</code>
* <code>.Vector position = 14;</code>
*/
public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
if (positionBuilder_ == null) {
@@ -783,7 +662,7 @@ public final class DropHintNotifyOuterClass {
return this;
}
/**
* <code>.Vector position = 9;</code>
* <code>.Vector position = 14;</code>
*/
public Builder clearPosition() {
if (positionBuilder_ == null) {
@@ -797,7 +676,7 @@ public final class DropHintNotifyOuterClass {
return this;
}
/**
* <code>.Vector position = 9;</code>
* <code>.Vector position = 14;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuilder() {
@@ -805,7 +684,7 @@ public final class DropHintNotifyOuterClass {
return getPositionFieldBuilder().getBuilder();
}
/**
* <code>.Vector position = 9;</code>
* <code>.Vector position = 14;</code>
*/
public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
if (positionBuilder_ != null) {
@@ -816,7 +695,7 @@ public final class DropHintNotifyOuterClass {
}
}
/**
* <code>.Vector position = 9;</code>
* <code>.Vector position = 14;</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>
@@ -840,7 +719,7 @@ public final class DropHintNotifyOuterClass {
}
}
/**
* <code>repeated uint32 itemIdList = 10;</code>
* <code>repeated uint32 item_id_list = 5;</code>
* @return A list containing the itemIdList.
*/
public java.util.List<java.lang.Integer>
@@ -849,14 +728,14 @@ public final class DropHintNotifyOuterClass {
java.util.Collections.unmodifiableList(itemIdList_) : itemIdList_;
}
/**
* <code>repeated uint32 itemIdList = 10;</code>
* <code>repeated uint32 item_id_list = 5;</code>
* @return The count of itemIdList.
*/
public int getItemIdListCount() {
return itemIdList_.size();
}
/**
* <code>repeated uint32 itemIdList = 10;</code>
* <code>repeated uint32 item_id_list = 5;</code>
* @param index The index of the element to return.
* @return The itemIdList at the given index.
*/
@@ -864,7 +743,7 @@ public final class DropHintNotifyOuterClass {
return itemIdList_.getInt(index);
}
/**
* <code>repeated uint32 itemIdList = 10;</code>
* <code>repeated uint32 item_id_list = 5;</code>
* @param index The index to set the value at.
* @param value The itemIdList to set.
* @return This builder for chaining.
@@ -877,7 +756,7 @@ public final class DropHintNotifyOuterClass {
return this;
}
/**
* <code>repeated uint32 itemIdList = 10;</code>
* <code>repeated uint32 item_id_list = 5;</code>
* @param value The itemIdList to add.
* @return This builder for chaining.
*/
@@ -888,7 +767,7 @@ public final class DropHintNotifyOuterClass {
return this;
}
/**
* <code>repeated uint32 itemIdList = 10;</code>
* <code>repeated uint32 item_id_list = 5;</code>
* @param values The itemIdList to add.
* @return This builder for chaining.
*/
@@ -901,7 +780,7 @@ public final class DropHintNotifyOuterClass {
return this;
}
/**
* <code>repeated uint32 itemIdList = 10;</code>
* <code>repeated uint32 item_id_list = 5;</code>
* @return This builder for chaining.
*/
public Builder clearItemIdList() {
@@ -977,11 +856,9 @@ public final class DropHintNotifyOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\024DropHintNotify.proto\032\014Vector.proto\"\220\001\n" +
"\016DropHintNotify\022\031\n\010position\030\t \001(\0132\007.Vect" +
"or\022\022\n\nitemIdList\030\n \003(\r\"O\n\013MDFCGFMGDNI\022\010\n" +
"\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\202\005\022\017\n\013DCDNILFDFLB" +
"\020\000\022\017\n\013NNBKOLMPOEA\020\001\032\002\020\001B\033\n\031emu.grasscutt" +
"\n\024DropHintNotify.proto\032\014Vector.proto\"A\n\016" +
"DropHintNotify\022\031\n\010position\030\016 \001(\0132\007.Vecto" +
"r\022\024\n\014item_id_list\030\005 \003(\rB\033\n\031emu.grasscutt" +
"er.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor