Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-21 12:10:14 +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/ActivityUpdateWatcherNotifyOuterClass.java
+101 -233
View File
@@ -19,27 +19,32 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>.ActivityWatcherInfo watcherInfo = 11;</code>
* <code>uint32 activity_id = 15;</code>
* @return The activityId.
*/
int getActivityId();
/**
* <code>.ActivityWatcherInfo watcher_info = 3;</code>
* @return Whether the watcherInfo field is set.
*/
boolean hasWatcherInfo();
/**
* <code>.ActivityWatcherInfo watcherInfo = 11;</code>
* <code>.ActivityWatcherInfo watcher_info = 3;</code>
* @return The watcherInfo.
*/
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo getWatcherInfo();
/**
* <code>.ActivityWatcherInfo watcherInfo = 11;</code>
* <code>.ActivityWatcherInfo watcher_info = 3;</code>
*/
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder getWatcherInfoOrBuilder();
/**
* <code>uint32 activityId = 3;</code>
* @return The activityId.
*/
int getActivityId();
}
/**
* <pre>
* Name: PPOLCIAJKGN
* CmdId: 2183
* </pre>
*
* Protobuf type {@code ActivityUpdateWatcherNotify}
*/
public static final class ActivityUpdateWatcherNotify extends
@@ -84,12 +89,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
case 0:
done = true;
break;
case 24: {
activityId_ = input.readUInt32();
break;
}
case 90: {
case 26: {
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder subBuilder = null;
if (watcherInfo_ != null) {
subBuilder = watcherInfo_.toBuilder();
@@ -102,6 +102,11 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
break;
}
case 120: {
activityId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -134,149 +139,21 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify.class, emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify.Builder.class);
}
public static final int ACTIVITY_ID_FIELD_NUMBER = 15;
private int activityId_;
/**
* Protobuf enum {@code ActivityUpdateWatcherNotify.FDMJLLHOHGH}
* <code>uint32 activity_id = 15;</code>
* @return The activityId.
*/
public enum FDMJLLHOHGH
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 2079;</code>
*/
PEPPOHPHJOJ(1, 2079),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final FDMJLLHOHGH DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final FDMJLLHOHGH EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 2079;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 2079;
/**
* <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 FDMJLLHOHGH 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 FDMJLLHOHGH forNumber(int value) {
switch (value) {
case 0: return NONE;
case 2079: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<FDMJLLHOHGH>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
FDMJLLHOHGH> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<FDMJLLHOHGH>() {
public FDMJLLHOHGH findValueByNumber(int number) {
return FDMJLLHOHGH.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.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify.getDescriptor().getEnumTypes().get(0);
}
private static final FDMJLLHOHGH[] VALUES = getStaticValuesArray();
private static FDMJLLHOHGH[] getStaticValuesArray() {
return new FDMJLLHOHGH[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static FDMJLLHOHGH 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 FDMJLLHOHGH(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:ActivityUpdateWatcherNotify.FDMJLLHOHGH)
@java.lang.Override
public int getActivityId() {
return activityId_;
}
public static final int WATCHERINFO_FIELD_NUMBER = 11;
public static final int WATCHER_INFO_FIELD_NUMBER = 3;
private emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo watcherInfo_;
/**
* <code>.ActivityWatcherInfo watcherInfo = 11;</code>
* <code>.ActivityWatcherInfo watcher_info = 3;</code>
* @return Whether the watcherInfo field is set.
*/
@java.lang.Override
@@ -284,7 +161,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return watcherInfo_ != null;
}
/**
* <code>.ActivityWatcherInfo watcherInfo = 11;</code>
* <code>.ActivityWatcherInfo watcher_info = 3;</code>
* @return The watcherInfo.
*/
@java.lang.Override
@@ -292,24 +169,13 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return watcherInfo_ == null ? emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.getDefaultInstance() : watcherInfo_;
}
/**
* <code>.ActivityWatcherInfo watcherInfo = 11;</code>
* <code>.ActivityWatcherInfo watcher_info = 3;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder getWatcherInfoOrBuilder() {
return getWatcherInfo();
}
public static final int ACTIVITYID_FIELD_NUMBER = 3;
private int activityId_;
/**
* <code>uint32 activityId = 3;</code>
* @return The activityId.
*/
@java.lang.Override
public int getActivityId() {
return activityId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -324,11 +190,11 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (activityId_ != 0) {
output.writeUInt32(3, activityId_);
}
if (watcherInfo_ != null) {
output.writeMessage(11, getWatcherInfo());
output.writeMessage(3, getWatcherInfo());
}
if (activityId_ != 0) {
output.writeUInt32(15, activityId_);
}
unknownFields.writeTo(output);
}
@@ -339,13 +205,13 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
if (size != -1) return size;
size = 0;
if (activityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, activityId_);
}
if (watcherInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(11, getWatcherInfo());
.computeMessageSize(3, getWatcherInfo());
}
if (activityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(15, activityId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -362,13 +228,13 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
}
emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify other = (emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify) obj;
if (getActivityId()
!= other.getActivityId()) return false;
if (hasWatcherInfo() != other.hasWatcherInfo()) return false;
if (hasWatcherInfo()) {
if (!getWatcherInfo()
.equals(other.getWatcherInfo())) return false;
}
if (getActivityId()
!= other.getActivityId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -380,12 +246,12 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getActivityId();
if (hasWatcherInfo()) {
hash = (37 * hash) + WATCHERINFO_FIELD_NUMBER;
hash = (37 * hash) + WATCHER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getWatcherInfo().hashCode();
}
hash = (37 * hash) + ACTIVITYID_FIELD_NUMBER;
hash = (53 * hash) + getActivityId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -482,6 +348,11 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return builder;
}
/**
* <pre>
* Name: PPOLCIAJKGN
* CmdId: 2183
* </pre>
*
* Protobuf type {@code ActivityUpdateWatcherNotify}
*/
public static final class Builder extends
@@ -519,14 +390,14 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
activityId_ = 0;
if (watcherInfoBuilder_ == null) {
watcherInfo_ = null;
} else {
watcherInfo_ = null;
watcherInfoBuilder_ = null;
}
activityId_ = 0;
return this;
}
@@ -553,12 +424,12 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify buildPartial() {
emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify result = new emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify(this);
result.activityId_ = activityId_;
if (watcherInfoBuilder_ == null) {
result.watcherInfo_ = watcherInfo_;
} else {
result.watcherInfo_ = watcherInfoBuilder_.build();
}
result.activityId_ = activityId_;
onBuilt();
return result;
}
@@ -607,12 +478,12 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify other) {
if (other == emu.grasscutter.net.proto.ActivityUpdateWatcherNotifyOuterClass.ActivityUpdateWatcherNotify.getDefaultInstance()) return this;
if (other.hasWatcherInfo()) {
mergeWatcherInfo(other.getWatcherInfo());
}
if (other.getActivityId() != 0) {
setActivityId(other.getActivityId());
}
if (other.hasWatcherInfo()) {
mergeWatcherInfo(other.getWatcherInfo());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -642,18 +513,49 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return this;
}
private int activityId_ ;
/**
* <code>uint32 activity_id = 15;</code>
* @return The activityId.
*/
@java.lang.Override
public int getActivityId() {
return activityId_;
}
/**
* <code>uint32 activity_id = 15;</code>
* @param value The activityId to set.
* @return This builder for chaining.
*/
public Builder setActivityId(int value) {
activityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 activity_id = 15;</code>
* @return This builder for chaining.
*/
public Builder clearActivityId() {
activityId_ = 0;
onChanged();
return this;
}
private emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo watcherInfo_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder> watcherInfoBuilder_;
/**
* <code>.ActivityWatcherInfo watcherInfo = 11;</code>
* <code>.ActivityWatcherInfo watcher_info = 3;</code>
* @return Whether the watcherInfo field is set.
*/
public boolean hasWatcherInfo() {
return watcherInfoBuilder_ != null || watcherInfo_ != null;
}
/**
* <code>.ActivityWatcherInfo watcherInfo = 11;</code>
* <code>.ActivityWatcherInfo watcher_info = 3;</code>
* @return The watcherInfo.
*/
public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo getWatcherInfo() {
@@ -664,7 +566,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
}
}
/**
* <code>.ActivityWatcherInfo watcherInfo = 11;</code>
* <code>.ActivityWatcherInfo watcher_info = 3;</code>
*/
public Builder setWatcherInfo(emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo value) {
if (watcherInfoBuilder_ == null) {
@@ -680,7 +582,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return this;
}
/**
* <code>.ActivityWatcherInfo watcherInfo = 11;</code>
* <code>.ActivityWatcherInfo watcher_info = 3;</code>
*/
public Builder setWatcherInfo(
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder builderForValue) {
@@ -694,7 +596,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return this;
}
/**
* <code>.ActivityWatcherInfo watcherInfo = 11;</code>
* <code>.ActivityWatcherInfo watcher_info = 3;</code>
*/
public Builder mergeWatcherInfo(emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo value) {
if (watcherInfoBuilder_ == null) {
@@ -712,7 +614,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return this;
}
/**
* <code>.ActivityWatcherInfo watcherInfo = 11;</code>
* <code>.ActivityWatcherInfo watcher_info = 3;</code>
*/
public Builder clearWatcherInfo() {
if (watcherInfoBuilder_ == null) {
@@ -726,7 +628,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return this;
}
/**
* <code>.ActivityWatcherInfo watcherInfo = 11;</code>
* <code>.ActivityWatcherInfo watcher_info = 3;</code>
*/
public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder getWatcherInfoBuilder() {
@@ -734,7 +636,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
return getWatcherInfoFieldBuilder().getBuilder();
}
/**
* <code>.ActivityWatcherInfo watcherInfo = 11;</code>
* <code>.ActivityWatcherInfo watcher_info = 3;</code>
*/
public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder getWatcherInfoOrBuilder() {
if (watcherInfoBuilder_ != null) {
@@ -745,7 +647,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
}
}
/**
* <code>.ActivityWatcherInfo watcherInfo = 11;</code>
* <code>.ActivityWatcherInfo watcher_info = 3;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder>
@@ -760,37 +662,6 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
}
return watcherInfoBuilder_;
}
private int activityId_ ;
/**
* <code>uint32 activityId = 3;</code>
* @return The activityId.
*/
@java.lang.Override
public int getActivityId() {
return activityId_;
}
/**
* <code>uint32 activityId = 3;</code>
* @param value The activityId to set.
* @return This builder for chaining.
*/
public Builder setActivityId(int value) {
activityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 activityId = 3;</code>
* @return This builder for chaining.
*/
public Builder clearActivityId() {
activityId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -859,13 +730,10 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
static {
java.lang.String[] descriptorData = {
"\n!ActivityUpdateWatcherNotify.proto\032\031Act" +
"ivityWatcherInfo.proto\"\276\001\n\033ActivityUpdat" +
"eWatcherNotify\022)\n\013watcherInfo\030\013 \001(\0132\024.Ac" +
"tivityWatcherInfo\022\022\n\nactivityId\030\003 \001(\r\"`\n" +
"\013FDMJLLHOHGH\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\237\020" +
"\022\017\n\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\022\017\n\013EA" +
"JIABGAOCI\020\001\032\002\020\001B\033\n\031emu.grasscutter.net.p" +
"rotob\006proto3"
"ivityWatcherInfo.proto\"^\n\033ActivityUpdate" +
"WatcherNotify\022\023\n\013activity_id\030\017 \001(\r\022*\n\014wa" +
"tcher_info\030\003 \001(\0132\024.ActivityWatcherInfoB\033" +
"\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -877,7 +745,7 @@ public final class ActivityUpdateWatcherNotifyOuterClass {
internal_static_ActivityUpdateWatcherNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ActivityUpdateWatcherNotify_descriptor,
new java.lang.String[] { "WatcherInfo", "ActivityId", });
new java.lang.String[] { "ActivityId", "WatcherInfo", });
emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.getDescriptor();
}