Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-24 10:59:52 +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/PullPrivateChatReqOuterClass.java
+105 -237
View File
@@ -19,24 +19,29 @@ public final class PullPrivateChatReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 targetUid = 1;</code>
* <code>uint32 target_uid = 9;</code>
* @return The targetUid.
*/
int getTargetUid();
/**
* <code>uint32 fromSequence = 4;</code>
* @return The fromSequence.
*/
int getFromSequence();
/**
* <code>uint32 pullNum = 6;</code>
* <code>uint32 pull_num = 11;</code>
* @return The pullNum.
*/
int getPullNum();
/**
* <code>uint32 from_sequence = 7;</code>
* @return The fromSequence.
*/
int getFromSequence();
}
/**
* <pre>
* Name: PDOKMDBACPA
* CmdId: 4984
* </pre>
*
* Protobuf type {@code PullPrivateChatReq}
*/
public static final class PullPrivateChatReq extends
@@ -81,17 +86,17 @@ public final class PullPrivateChatReqOuterClass {
case 0:
done = true;
break;
case 8: {
targetUid_ = input.readUInt32();
break;
}
case 32: {
case 56: {
fromSequence_ = input.readUInt32();
break;
}
case 48: {
case 72: {
targetUid_ = input.readUInt32();
break;
}
case 88: {
pullNum_ = input.readUInt32();
break;
@@ -128,149 +133,10 @@ public final class PullPrivateChatReqOuterClass {
emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq.class, emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq.Builder.class);
}
/**
* Protobuf enum {@code PullPrivateChatReq.NIJLIODNKPO}
*/
public enum NIJLIODNKPO
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 5024;</code>
*/
PEPPOHPHJOJ(1, 5024),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final NIJLIODNKPO DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final NIJLIODNKPO EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 5024;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 5024;
/**
* <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 NIJLIODNKPO 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 NIJLIODNKPO forNumber(int value) {
switch (value) {
case 0: return NONE;
case 5024: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<NIJLIODNKPO>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
NIJLIODNKPO> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<NIJLIODNKPO>() {
public NIJLIODNKPO findValueByNumber(int number) {
return NIJLIODNKPO.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.PullPrivateChatReqOuterClass.PullPrivateChatReq.getDescriptor().getEnumTypes().get(0);
}
private static final NIJLIODNKPO[] VALUES = getStaticValuesArray();
private static NIJLIODNKPO[] getStaticValuesArray() {
return new NIJLIODNKPO[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static NIJLIODNKPO 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 NIJLIODNKPO(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:PullPrivateChatReq.NIJLIODNKPO)
}
public static final int TARGETUID_FIELD_NUMBER = 1;
public static final int TARGET_UID_FIELD_NUMBER = 9;
private int targetUid_;
/**
* <code>uint32 targetUid = 1;</code>
* <code>uint32 target_uid = 9;</code>
* @return The targetUid.
*/
@java.lang.Override
@@ -278,21 +144,10 @@ public final class PullPrivateChatReqOuterClass {
return targetUid_;
}
public static final int FROMSEQUENCE_FIELD_NUMBER = 4;
private int fromSequence_;
/**
* <code>uint32 fromSequence = 4;</code>
* @return The fromSequence.
*/
@java.lang.Override
public int getFromSequence() {
return fromSequence_;
}
public static final int PULLNUM_FIELD_NUMBER = 6;
public static final int PULL_NUM_FIELD_NUMBER = 11;
private int pullNum_;
/**
* <code>uint32 pullNum = 6;</code>
* <code>uint32 pull_num = 11;</code>
* @return The pullNum.
*/
@java.lang.Override
@@ -300,6 +155,17 @@ public final class PullPrivateChatReqOuterClass {
return pullNum_;
}
public static final int FROM_SEQUENCE_FIELD_NUMBER = 7;
private int fromSequence_;
/**
* <code>uint32 from_sequence = 7;</code>
* @return The fromSequence.
*/
@java.lang.Override
public int getFromSequence() {
return fromSequence_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -314,14 +180,14 @@ public final class PullPrivateChatReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (targetUid_ != 0) {
output.writeUInt32(1, targetUid_);
}
if (fromSequence_ != 0) {
output.writeUInt32(4, fromSequence_);
output.writeUInt32(7, fromSequence_);
}
if (targetUid_ != 0) {
output.writeUInt32(9, targetUid_);
}
if (pullNum_ != 0) {
output.writeUInt32(6, pullNum_);
output.writeUInt32(11, pullNum_);
}
unknownFields.writeTo(output);
}
@@ -332,17 +198,17 @@ public final class PullPrivateChatReqOuterClass {
if (size != -1) return size;
size = 0;
if (targetUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(1, targetUid_);
}
if (fromSequence_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, fromSequence_);
.computeUInt32Size(7, fromSequence_);
}
if (targetUid_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(9, targetUid_);
}
if (pullNum_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(6, pullNum_);
.computeUInt32Size(11, pullNum_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -361,10 +227,10 @@ public final class PullPrivateChatReqOuterClass {
if (getTargetUid()
!= other.getTargetUid()) return false;
if (getFromSequence()
!= other.getFromSequence()) return false;
if (getPullNum()
!= other.getPullNum()) return false;
if (getFromSequence()
!= other.getFromSequence()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -376,12 +242,12 @@ public final class PullPrivateChatReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TARGETUID_FIELD_NUMBER;
hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
hash = (53 * hash) + getTargetUid();
hash = (37 * hash) + FROMSEQUENCE_FIELD_NUMBER;
hash = (53 * hash) + getFromSequence();
hash = (37 * hash) + PULLNUM_FIELD_NUMBER;
hash = (37 * hash) + PULL_NUM_FIELD_NUMBER;
hash = (53 * hash) + getPullNum();
hash = (37 * hash) + FROM_SEQUENCE_FIELD_NUMBER;
hash = (53 * hash) + getFromSequence();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -478,6 +344,11 @@ public final class PullPrivateChatReqOuterClass {
return builder;
}
/**
* <pre>
* Name: PDOKMDBACPA
* CmdId: 4984
* </pre>
*
* Protobuf type {@code PullPrivateChatReq}
*/
public static final class Builder extends
@@ -517,10 +388,10 @@ public final class PullPrivateChatReqOuterClass {
super.clear();
targetUid_ = 0;
fromSequence_ = 0;
pullNum_ = 0;
fromSequence_ = 0;
return this;
}
@@ -548,8 +419,8 @@ public final class PullPrivateChatReqOuterClass {
public emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq buildPartial() {
emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq result = new emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq(this);
result.targetUid_ = targetUid_;
result.fromSequence_ = fromSequence_;
result.pullNum_ = pullNum_;
result.fromSequence_ = fromSequence_;
onBuilt();
return result;
}
@@ -601,12 +472,12 @@ public final class PullPrivateChatReqOuterClass {
if (other.getTargetUid() != 0) {
setTargetUid(other.getTargetUid());
}
if (other.getFromSequence() != 0) {
setFromSequence(other.getFromSequence());
}
if (other.getPullNum() != 0) {
setPullNum(other.getPullNum());
}
if (other.getFromSequence() != 0) {
setFromSequence(other.getFromSequence());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -638,7 +509,7 @@ public final class PullPrivateChatReqOuterClass {
private int targetUid_ ;
/**
* <code>uint32 targetUid = 1;</code>
* <code>uint32 target_uid = 9;</code>
* @return The targetUid.
*/
@java.lang.Override
@@ -646,7 +517,7 @@ public final class PullPrivateChatReqOuterClass {
return targetUid_;
}
/**
* <code>uint32 targetUid = 1;</code>
* <code>uint32 target_uid = 9;</code>
* @param value The targetUid to set.
* @return This builder for chaining.
*/
@@ -657,7 +528,7 @@ public final class PullPrivateChatReqOuterClass {
return this;
}
/**
* <code>uint32 targetUid = 1;</code>
* <code>uint32 target_uid = 9;</code>
* @return This builder for chaining.
*/
public Builder clearTargetUid() {
@@ -667,40 +538,9 @@ public final class PullPrivateChatReqOuterClass {
return this;
}
private int fromSequence_ ;
/**
* <code>uint32 fromSequence = 4;</code>
* @return The fromSequence.
*/
@java.lang.Override
public int getFromSequence() {
return fromSequence_;
}
/**
* <code>uint32 fromSequence = 4;</code>
* @param value The fromSequence to set.
* @return This builder for chaining.
*/
public Builder setFromSequence(int value) {
fromSequence_ = value;
onChanged();
return this;
}
/**
* <code>uint32 fromSequence = 4;</code>
* @return This builder for chaining.
*/
public Builder clearFromSequence() {
fromSequence_ = 0;
onChanged();
return this;
}
private int pullNum_ ;
/**
* <code>uint32 pullNum = 6;</code>
* <code>uint32 pull_num = 11;</code>
* @return The pullNum.
*/
@java.lang.Override
@@ -708,7 +548,7 @@ public final class PullPrivateChatReqOuterClass {
return pullNum_;
}
/**
* <code>uint32 pullNum = 6;</code>
* <code>uint32 pull_num = 11;</code>
* @param value The pullNum to set.
* @return This builder for chaining.
*/
@@ -719,7 +559,7 @@ public final class PullPrivateChatReqOuterClass {
return this;
}
/**
* <code>uint32 pullNum = 6;</code>
* <code>uint32 pull_num = 11;</code>
* @return This builder for chaining.
*/
public Builder clearPullNum() {
@@ -728,6 +568,37 @@ public final class PullPrivateChatReqOuterClass {
onChanged();
return this;
}
private int fromSequence_ ;
/**
* <code>uint32 from_sequence = 7;</code>
* @return The fromSequence.
*/
@java.lang.Override
public int getFromSequence() {
return fromSequence_;
}
/**
* <code>uint32 from_sequence = 7;</code>
* @param value The fromSequence to set.
* @return This builder for chaining.
*/
public Builder setFromSequence(int value) {
fromSequence_ = value;
onChanged();
return this;
}
/**
* <code>uint32 from_sequence = 7;</code>
* @return This builder for chaining.
*/
public Builder clearFromSequence() {
fromSequence_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -795,13 +666,10 @@ public final class PullPrivateChatReqOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\030PullPrivateChatReq.proto\"\260\001\n\022PullPriva" +
"teChatReq\022\021\n\ttargetUid\030\001 \001(\r\022\024\n\014fromSequ" +
"ence\030\004 \001(\r\022\017\n\007pullNum\030\006 \001(\r\"`\n\013NIJLIODNK" +
"PO\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\240\'\022\017\n\013DCDNIL" +
"FDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\022\017\n\013EAJIABGAOCI\020" +
"\001\032\002\020\001B\033\n\031emu.grasscutter.net.protob\006prot" +
"o3"
"\n\030PullPrivateChatReq.proto\"Q\n\022PullPrivat" +
"eChatReq\022\022\n\ntarget_uid\030\t \001(\r\022\020\n\010pull_num" +
"\030\013 \001(\r\022\025\n\rfrom_sequence\030\007 \001(\rB\033\n\031emu.gra" +
"sscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -812,7 +680,7 @@ public final class PullPrivateChatReqOuterClass {
internal_static_PullPrivateChatReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_PullPrivateChatReq_descriptor,
new java.lang.String[] { "TargetUid", "FromSequence", "PullNum", });
new java.lang.String[] { "TargetUid", "PullNum", "FromSequence", });
}
// @@protoc_insertion_point(outer_class_scope)