Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-24 13:39:55 +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/SeaLampContributeItemReqOuterClass.java
+66 -197
View File
@@ -19,36 +19,41 @@ public final class SeaLampContributeItemReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>
getItemListList();
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index);
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
int getItemListCount();
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>
getItemListOrBuilderList();
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
int index);
/**
* <code>uint32 activityId = 12;</code>
* <code>uint32 activity_id = 3;</code>
* @return The activityId.
*/
int getActivityId();
}
/**
* <pre>
* Name: BLGLCOLCEPL
* CmdId: 2119
* </pre>
*
* Protobuf type {@code SeaLampContributeItemReq}
*/
public static final class SeaLampContributeItemReq extends
@@ -95,12 +100,7 @@ public final class SeaLampContributeItemReqOuterClass {
case 0:
done = true;
break;
case 96: {
activityId_ = input.readUInt32();
break;
}
case 106: {
case 10: {
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
itemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
mutable_bitField0_ |= 0x00000001;
@@ -109,6 +109,11 @@ public final class SeaLampContributeItemReqOuterClass {
input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
break;
}
case 24: {
activityId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -144,156 +149,17 @@ public final class SeaLampContributeItemReqOuterClass {
emu.grasscutter.net.proto.SeaLampContributeItemReqOuterClass.SeaLampContributeItemReq.class, emu.grasscutter.net.proto.SeaLampContributeItemReqOuterClass.SeaLampContributeItemReq.Builder.class);
}
/**
* Protobuf enum {@code SeaLampContributeItemReq.NFJOBJLOODK}
*/
public enum NFJOBJLOODK
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 2110;</code>
*/
PEPPOHPHJOJ(1, 2110),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final NFJOBJLOODK DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final NFJOBJLOODK EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 2110;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 2110;
/**
* <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 NFJOBJLOODK 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 NFJOBJLOODK forNumber(int value) {
switch (value) {
case 0: return NONE;
case 2110: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<NFJOBJLOODK>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
NFJOBJLOODK> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<NFJOBJLOODK>() {
public NFJOBJLOODK findValueByNumber(int number) {
return NFJOBJLOODK.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.SeaLampContributeItemReqOuterClass.SeaLampContributeItemReq.getDescriptor().getEnumTypes().get(0);
}
private static final NFJOBJLOODK[] VALUES = getStaticValuesArray();
private static NFJOBJLOODK[] getStaticValuesArray() {
return new NFJOBJLOODK[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static NFJOBJLOODK 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 NFJOBJLOODK(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:SeaLampContributeItemReq.NFJOBJLOODK)
}
public static final int ITEMLIST_FIELD_NUMBER = 13;
public static final int ITEM_LIST_FIELD_NUMBER = 1;
private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemList_;
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
@java.lang.Override
public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemListList() {
return itemList_;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
@java.lang.Override
public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>
@@ -301,21 +167,21 @@ public final class SeaLampContributeItemReqOuterClass {
return itemList_;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
@java.lang.Override
public int getItemListCount() {
return itemList_.size();
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) {
return itemList_.get(index);
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
@@ -323,10 +189,10 @@ public final class SeaLampContributeItemReqOuterClass {
return itemList_.get(index);
}
public static final int ACTIVITYID_FIELD_NUMBER = 12;
public static final int ACTIVITY_ID_FIELD_NUMBER = 3;
private int activityId_;
/**
* <code>uint32 activityId = 12;</code>
* <code>uint32 activity_id = 3;</code>
* @return The activityId.
*/
@java.lang.Override
@@ -348,11 +214,11 @@ public final class SeaLampContributeItemReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (activityId_ != 0) {
output.writeUInt32(12, activityId_);
}
for (int i = 0; i < itemList_.size(); i++) {
output.writeMessage(13, itemList_.get(i));
output.writeMessage(1, itemList_.get(i));
}
if (activityId_ != 0) {
output.writeUInt32(3, activityId_);
}
unknownFields.writeTo(output);
}
@@ -363,13 +229,13 @@ public final class SeaLampContributeItemReqOuterClass {
if (size != -1) return size;
size = 0;
if (activityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, activityId_);
}
for (int i = 0; i < itemList_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(13, itemList_.get(i));
.computeMessageSize(1, itemList_.get(i));
}
if (activityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, activityId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -402,10 +268,10 @@ public final class SeaLampContributeItemReqOuterClass {
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
if (getItemListCount() > 0) {
hash = (37 * hash) + ITEMLIST_FIELD_NUMBER;
hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER;
hash = (53 * hash) + getItemListList().hashCode();
}
hash = (37 * hash) + ACTIVITYID_FIELD_NUMBER;
hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getActivityId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -503,6 +369,11 @@ public final class SeaLampContributeItemReqOuterClass {
return builder;
}
/**
* <pre>
* Name: BLGLCOLCEPL
* CmdId: 2119
* </pre>
*
* Protobuf type {@code SeaLampContributeItemReq}
*/
public static final class Builder extends
@@ -706,7 +577,7 @@ public final class SeaLampContributeItemReqOuterClass {
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemListBuilder_;
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemListList() {
if (itemListBuilder_ == null) {
@@ -716,7 +587,7 @@ public final class SeaLampContributeItemReqOuterClass {
}
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public int getItemListCount() {
if (itemListBuilder_ == null) {
@@ -726,7 +597,7 @@ public final class SeaLampContributeItemReqOuterClass {
}
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) {
if (itemListBuilder_ == null) {
@@ -736,7 +607,7 @@ public final class SeaLampContributeItemReqOuterClass {
}
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public Builder setItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -753,7 +624,7 @@ public final class SeaLampContributeItemReqOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public Builder setItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -767,7 +638,7 @@ public final class SeaLampContributeItemReqOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
if (itemListBuilder_ == null) {
@@ -783,7 +654,7 @@ public final class SeaLampContributeItemReqOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public Builder addItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -800,7 +671,7 @@ public final class SeaLampContributeItemReqOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public Builder addItemList(
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -814,7 +685,7 @@ public final class SeaLampContributeItemReqOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public Builder addItemList(
int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -828,7 +699,7 @@ public final class SeaLampContributeItemReqOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public Builder addAllItemList(
java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
@@ -843,7 +714,7 @@ public final class SeaLampContributeItemReqOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public Builder clearItemList() {
if (itemListBuilder_ == null) {
@@ -856,7 +727,7 @@ public final class SeaLampContributeItemReqOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public Builder removeItemList(int index) {
if (itemListBuilder_ == null) {
@@ -869,14 +740,14 @@ public final class SeaLampContributeItemReqOuterClass {
return this;
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemListBuilder(
int index) {
return getItemListFieldBuilder().getBuilder(index);
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
int index) {
@@ -886,7 +757,7 @@ public final class SeaLampContributeItemReqOuterClass {
}
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>
getItemListOrBuilderList() {
@@ -897,14 +768,14 @@ public final class SeaLampContributeItemReqOuterClass {
}
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder() {
return getItemListFieldBuilder().addBuilder(
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder(
int index) {
@@ -912,7 +783,7 @@ public final class SeaLampContributeItemReqOuterClass {
index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
}
/**
* <code>repeated .ItemParam itemList = 13;</code>
* <code>repeated .ItemParam item_list = 1;</code>
*/
public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder>
getItemListBuilderList() {
@@ -935,7 +806,7 @@ public final class SeaLampContributeItemReqOuterClass {
private int activityId_ ;
/**
* <code>uint32 activityId = 12;</code>
* <code>uint32 activity_id = 3;</code>
* @return The activityId.
*/
@java.lang.Override
@@ -943,7 +814,7 @@ public final class SeaLampContributeItemReqOuterClass {
return activityId_;
}
/**
* <code>uint32 activityId = 12;</code>
* <code>uint32 activity_id = 3;</code>
* @param value The activityId to set.
* @return This builder for chaining.
*/
@@ -954,7 +825,7 @@ public final class SeaLampContributeItemReqOuterClass {
return this;
}
/**
* <code>uint32 activityId = 12;</code>
* <code>uint32 activity_id = 3;</code>
* @return This builder for chaining.
*/
public Builder clearActivityId() {
@@ -1031,12 +902,10 @@ public final class SeaLampContributeItemReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\036SeaLampContributeItemReq.proto\032\017ItemPa" +
"ram.proto\"\256\001\n\030SeaLampContributeItemReq\022\034" +
"\n\010itemList\030\r \003(\0132\n.ItemParam\022\022\n\nactivity" +
"Id\030\014 \001(\r\"`\n\013NFJOBJLOODK\022\010\n\004NONE\020\000\022\020\n\013PEP" +
"POHPHJOJ\020\276\020\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMP" +
"OEA\020\001\022\017\n\013EAJIABGAOCI\020\001\032\002\020\001B\033\n\031emu.grassc" +
"utter.net.protob\006proto3"
"ram.proto\"N\n\030SeaLampContributeItemReq\022\035\n" +
"\titem_list\030\001 \003(\0132\n.ItemParam\022\023\n\013activity" +
"_id\030\003 \001(\rB\033\n\031emu.grasscutter.net.protob\006" +
"proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,