Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-18 05:39:56 +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/ActivityTakeWatcherRewardReqOuterClass.java
+43 -175
View File
@@ -19,18 +19,23 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 activityId = 11;</code>
* <code>uint32 activity_id = 5;</code>
* @return The activityId.
*/
int getActivityId();
/**
* <code>uint32 watcherId = 6;</code>
* <code>uint32 watcher_id = 15;</code>
* @return The watcherId.
*/
int getWatcherId();
}
/**
* <pre>
* Name: DEADHMNJBHA
* CmdId: 2063
* </pre>
*
* Protobuf type {@code ActivityTakeWatcherRewardReq}
*/
public static final class ActivityTakeWatcherRewardReq extends
@@ -75,16 +80,16 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
case 0:
done = true;
break;
case 48: {
watcherId_ = input.readUInt32();
break;
}
case 88: {
case 40: {
activityId_ = input.readUInt32();
break;
}
case 120: {
watcherId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -117,149 +122,10 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq.class, emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq.Builder.class);
}
/**
* Protobuf enum {@code ActivityTakeWatcherRewardReq.PHOMHFCNABE}
*/
public enum PHOMHFCNABE
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 2124;</code>
*/
PEPPOHPHJOJ(1, 2124),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final PHOMHFCNABE DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final PHOMHFCNABE EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 2124;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 2124;
/**
* <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 PHOMHFCNABE 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 PHOMHFCNABE forNumber(int value) {
switch (value) {
case 0: return NONE;
case 2124: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<PHOMHFCNABE>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
PHOMHFCNABE> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<PHOMHFCNABE>() {
public PHOMHFCNABE findValueByNumber(int number) {
return PHOMHFCNABE.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.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq.getDescriptor().getEnumTypes().get(0);
}
private static final PHOMHFCNABE[] VALUES = getStaticValuesArray();
private static PHOMHFCNABE[] getStaticValuesArray() {
return new PHOMHFCNABE[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static PHOMHFCNABE 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 PHOMHFCNABE(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:ActivityTakeWatcherRewardReq.PHOMHFCNABE)
}
public static final int ACTIVITYID_FIELD_NUMBER = 11;
public static final int ACTIVITY_ID_FIELD_NUMBER = 5;
private int activityId_;
/**
* <code>uint32 activityId = 11;</code>
* <code>uint32 activity_id = 5;</code>
* @return The activityId.
*/
@java.lang.Override
@@ -267,10 +133,10 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
return activityId_;
}
public static final int WATCHERID_FIELD_NUMBER = 6;
public static final int WATCHER_ID_FIELD_NUMBER = 15;
private int watcherId_;
/**
* <code>uint32 watcherId = 6;</code>
* <code>uint32 watcher_id = 15;</code>
* @return The watcherId.
*/
@java.lang.Override
@@ -292,11 +158,11 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (watcherId_ != 0) {
output.writeUInt32(6, watcherId_);
}
if (activityId_ != 0) {
output.writeUInt32(11, activityId_);
output.writeUInt32(5, activityId_);
}
if (watcherId_ != 0) {
output.writeUInt32(15, watcherId_);
}
unknownFields.writeTo(output);
}
@@ -307,13 +173,13 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
if (size != -1) return size;
size = 0;
if (watcherId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, watcherId_);
}
if (activityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, activityId_);
.computeUInt32Size(5, activityId_);
}
if (watcherId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, watcherId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -345,9 +211,9 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ACTIVITYID_FIELD_NUMBER;
hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getActivityId();
hash = (37 * hash) + WATCHERID_FIELD_NUMBER;
hash = (37 * hash) + WATCHER_ID_FIELD_NUMBER;
hash = (53 * hash) + getWatcherId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -445,6 +311,11 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
return builder;
}
/**
* <pre>
* Name: DEADHMNJBHA
* CmdId: 2063
* </pre>
*
* Protobuf type {@code ActivityTakeWatcherRewardReq}
*/
public static final class Builder extends
@@ -599,7 +470,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
private int activityId_ ;
/**
* <code>uint32 activityId = 11;</code>
* <code>uint32 activity_id = 5;</code>
* @return The activityId.
*/
@java.lang.Override
@@ -607,7 +478,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
return activityId_;
}
/**
* <code>uint32 activityId = 11;</code>
* <code>uint32 activity_id = 5;</code>
* @param value The activityId to set.
* @return This builder for chaining.
*/
@@ -618,7 +489,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
return this;
}
/**
* <code>uint32 activityId = 11;</code>
* <code>uint32 activity_id = 5;</code>
* @return This builder for chaining.
*/
public Builder clearActivityId() {
@@ -630,7 +501,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
private int watcherId_ ;
/**
* <code>uint32 watcherId = 6;</code>
* <code>uint32 watcher_id = 15;</code>
* @return The watcherId.
*/
@java.lang.Override
@@ -638,7 +509,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
return watcherId_;
}
/**
* <code>uint32 watcherId = 6;</code>
* <code>uint32 watcher_id = 15;</code>
* @param value The watcherId to set.
* @return This builder for chaining.
*/
@@ -649,7 +520,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
return this;
}
/**
* <code>uint32 watcherId = 6;</code>
* <code>uint32 watcher_id = 15;</code>
* @return This builder for chaining.
*/
public Builder clearWatcherId() {
@@ -725,13 +596,10 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\"ActivityTakeWatcherRewardReq.proto\"\247\001\n" +
"\034ActivityTakeWatcherRewardReq\022\022\n\nactivit" +
"yId\030\013 \001(\r\022\021\n\twatcherId\030\006 \001(\r\"`\n\013PHOMHFCN" +
"ABE\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\314\020\022\017\n\013DCDNI" +
"LFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\022\017\n\013EAJIABGAOCI" +
"\020\001\032\002\020\001B\033\n\031emu.grasscutter.net.protob\006pro" +
"to3"
"\n\"ActivityTakeWatcherRewardReq.proto\"G\n\034" +
"ActivityTakeWatcherRewardReq\022\023\n\013activity" +
"_id\030\005 \001(\r\022\022\n\nwatcher_id\030\017 \001(\rB\033\n\031emu.gra" +
"sscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,