Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-22 09:19:49 +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/AvatarExpeditionStartReqOuterClass.java
+101 -233
View File
@@ -19,24 +19,29 @@ public final class AvatarExpeditionStartReqOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 hourTime = 12;</code>
* <code>uint32 exp_id = 3;</code>
* @return The expId.
*/
int getExpId();
/**
* <code>uint32 hour_time = 15;</code>
* @return The hourTime.
*/
int getHourTime();
/**
* <code>uint64 avatarGuid = 8;</code>
* <code>uint64 avatar_guid = 5;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>uint32 expId = 14;</code>
* @return The expId.
*/
int getExpId();
}
/**
* <pre>
* Name: GIANJFPNBJO
* CmdId: 1763
* </pre>
*
* Protobuf type {@code AvatarExpeditionStartReq}
*/
public static final class AvatarExpeditionStartReq extends
@@ -81,21 +86,21 @@ public final class AvatarExpeditionStartReqOuterClass {
case 0:
done = true;
break;
case 64: {
case 24: {
expId_ = input.readUInt32();
break;
}
case 40: {
avatarGuid_ = input.readUInt64();
break;
}
case 96: {
case 120: {
hourTime_ = input.readUInt32();
break;
}
case 112: {
expId_ = input.readUInt32();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -128,149 +133,21 @@ public final class AvatarExpeditionStartReqOuterClass {
emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq.class, emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq.Builder.class);
}
public static final int EXP_ID_FIELD_NUMBER = 3;
private int expId_;
/**
* Protobuf enum {@code AvatarExpeditionStartReq.ALMCOHOIHKE}
* <code>uint32 exp_id = 3;</code>
* @return The expId.
*/
public enum ALMCOHOIHKE
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>NONE = 0;</code>
*/
NONE(0, 0),
/**
* <code>PEPPOHPHJOJ = 1656;</code>
*/
PEPPOHPHJOJ(1, 1656),
/**
* <code>NNBKOLMPOEA = 1;</code>
*/
NNBKOLMPOEA(3, 1),
UNRECOGNIZED(-1, -1),
;
/**
* <code>DCDNILFDFLB = 0;</code>
*/
public static final ALMCOHOIHKE DCDNILFDFLB = NONE;
/**
* <code>EAJIABGAOCI = 1;</code>
*/
public static final ALMCOHOIHKE EAJIABGAOCI = NNBKOLMPOEA;
/**
* <code>NONE = 0;</code>
*/
public static final int NONE_VALUE = 0;
/**
* <code>PEPPOHPHJOJ = 1656;</code>
*/
public static final int PEPPOHPHJOJ_VALUE = 1656;
/**
* <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 ALMCOHOIHKE 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 ALMCOHOIHKE forNumber(int value) {
switch (value) {
case 0: return NONE;
case 1656: return PEPPOHPHJOJ;
case 1: return NNBKOLMPOEA;
default: return null;
}
}
public static com.google.protobuf.Internal.EnumLiteMap<ALMCOHOIHKE>
internalGetValueMap() {
return internalValueMap;
}
private static final com.google.protobuf.Internal.EnumLiteMap<
ALMCOHOIHKE> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<ALMCOHOIHKE>() {
public ALMCOHOIHKE findValueByNumber(int number) {
return ALMCOHOIHKE.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.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq.getDescriptor().getEnumTypes().get(0);
}
private static final ALMCOHOIHKE[] VALUES = getStaticValuesArray();
private static ALMCOHOIHKE[] getStaticValuesArray() {
return new ALMCOHOIHKE[] {
NONE, PEPPOHPHJOJ, DCDNILFDFLB, NNBKOLMPOEA, EAJIABGAOCI,
};
}
public static ALMCOHOIHKE 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 ALMCOHOIHKE(int index, int value) {
this.index = index;
this.value = value;
}
// @@protoc_insertion_point(enum_scope:AvatarExpeditionStartReq.ALMCOHOIHKE)
@java.lang.Override
public int getExpId() {
return expId_;
}
public static final int HOURTIME_FIELD_NUMBER = 12;
public static final int HOUR_TIME_FIELD_NUMBER = 15;
private int hourTime_;
/**
* <code>uint32 hourTime = 12;</code>
* <code>uint32 hour_time = 15;</code>
* @return The hourTime.
*/
@java.lang.Override
@@ -278,10 +155,10 @@ public final class AvatarExpeditionStartReqOuterClass {
return hourTime_;
}
public static final int AVATARGUID_FIELD_NUMBER = 8;
public static final int AVATAR_GUID_FIELD_NUMBER = 5;
private long avatarGuid_;
/**
* <code>uint64 avatarGuid = 8;</code>
* <code>uint64 avatar_guid = 5;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -289,17 +166,6 @@ public final class AvatarExpeditionStartReqOuterClass {
return avatarGuid_;
}
public static final int EXPID_FIELD_NUMBER = 14;
private int expId_;
/**
* <code>uint32 expId = 14;</code>
* @return The expId.
*/
@java.lang.Override
public int getExpId() {
return expId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -314,14 +180,14 @@ public final class AvatarExpeditionStartReqOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (expId_ != 0) {
output.writeUInt32(3, expId_);
}
if (avatarGuid_ != 0L) {
output.writeUInt64(8, avatarGuid_);
output.writeUInt64(5, avatarGuid_);
}
if (hourTime_ != 0) {
output.writeUInt32(12, hourTime_);
}
if (expId_ != 0) {
output.writeUInt32(14, expId_);
output.writeUInt32(15, hourTime_);
}
unknownFields.writeTo(output);
}
@@ -332,17 +198,17 @@ public final class AvatarExpeditionStartReqOuterClass {
if (size != -1) return size;
size = 0;
if (expId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, expId_);
}
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(8, avatarGuid_);
.computeUInt64Size(5, avatarGuid_);
}
if (hourTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, hourTime_);
}
if (expId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, expId_);
.computeUInt32Size(15, hourTime_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -359,12 +225,12 @@ public final class AvatarExpeditionStartReqOuterClass {
}
emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq other = (emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq) obj;
if (getExpId()
!= other.getExpId()) return false;
if (getHourTime()
!= other.getHourTime()) return false;
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (getExpId()
!= other.getExpId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -376,13 +242,13 @@ public final class AvatarExpeditionStartReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + HOURTIME_FIELD_NUMBER;
hash = (37 * hash) + EXP_ID_FIELD_NUMBER;
hash = (53 * hash) + getExpId();
hash = (37 * hash) + HOUR_TIME_FIELD_NUMBER;
hash = (53 * hash) + getHourTime();
hash = (37 * hash) + AVATARGUID_FIELD_NUMBER;
hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getAvatarGuid());
hash = (37 * hash) + EXPID_FIELD_NUMBER;
hash = (53 * hash) + getExpId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -479,6 +345,11 @@ public final class AvatarExpeditionStartReqOuterClass {
return builder;
}
/**
* <pre>
* Name: GIANJFPNBJO
* CmdId: 1763
* </pre>
*
* Protobuf type {@code AvatarExpeditionStartReq}
*/
public static final class Builder extends
@@ -516,12 +387,12 @@ public final class AvatarExpeditionStartReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
expId_ = 0;
hourTime_ = 0;
avatarGuid_ = 0L;
expId_ = 0;
return this;
}
@@ -548,9 +419,9 @@ public final class AvatarExpeditionStartReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq buildPartial() {
emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq result = new emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq(this);
result.expId_ = expId_;
result.hourTime_ = hourTime_;
result.avatarGuid_ = avatarGuid_;
result.expId_ = expId_;
onBuilt();
return result;
}
@@ -599,15 +470,15 @@ public final class AvatarExpeditionStartReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq other) {
if (other == emu.grasscutter.net.proto.AvatarExpeditionStartReqOuterClass.AvatarExpeditionStartReq.getDefaultInstance()) return this;
if (other.getExpId() != 0) {
setExpId(other.getExpId());
}
if (other.getHourTime() != 0) {
setHourTime(other.getHourTime());
}
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
if (other.getExpId() != 0) {
setExpId(other.getExpId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -637,9 +508,40 @@ public final class AvatarExpeditionStartReqOuterClass {
return this;
}
private int expId_ ;
/**
* <code>uint32 exp_id = 3;</code>
* @return The expId.
*/
@java.lang.Override
public int getExpId() {
return expId_;
}
/**
* <code>uint32 exp_id = 3;</code>
* @param value The expId to set.
* @return This builder for chaining.
*/
public Builder setExpId(int value) {
expId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 exp_id = 3;</code>
* @return This builder for chaining.
*/
public Builder clearExpId() {
expId_ = 0;
onChanged();
return this;
}
private int hourTime_ ;
/**
* <code>uint32 hourTime = 12;</code>
* <code>uint32 hour_time = 15;</code>
* @return The hourTime.
*/
@java.lang.Override
@@ -647,7 +549,7 @@ public final class AvatarExpeditionStartReqOuterClass {
return hourTime_;
}
/**
* <code>uint32 hourTime = 12;</code>
* <code>uint32 hour_time = 15;</code>
* @param value The hourTime to set.
* @return This builder for chaining.
*/
@@ -658,7 +560,7 @@ public final class AvatarExpeditionStartReqOuterClass {
return this;
}
/**
* <code>uint32 hourTime = 12;</code>
* <code>uint32 hour_time = 15;</code>
* @return This builder for chaining.
*/
public Builder clearHourTime() {
@@ -670,7 +572,7 @@ public final class AvatarExpeditionStartReqOuterClass {
private long avatarGuid_ ;
/**
* <code>uint64 avatarGuid = 8;</code>
* <code>uint64 avatar_guid = 5;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -678,7 +580,7 @@ public final class AvatarExpeditionStartReqOuterClass {
return avatarGuid_;
}
/**
* <code>uint64 avatarGuid = 8;</code>
* <code>uint64 avatar_guid = 5;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
@@ -689,7 +591,7 @@ public final class AvatarExpeditionStartReqOuterClass {
return this;
}
/**
* <code>uint64 avatarGuid = 8;</code>
* <code>uint64 avatar_guid = 5;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
@@ -698,37 +600,6 @@ public final class AvatarExpeditionStartReqOuterClass {
onChanged();
return this;
}
private int expId_ ;
/**
* <code>uint32 expId = 14;</code>
* @return The expId.
*/
@java.lang.Override
public int getExpId() {
return expId_;
}
/**
* <code>uint32 expId = 14;</code>
* @param value The expId to set.
* @return This builder for chaining.
*/
public Builder setExpId(int value) {
expId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 expId = 14;</code>
* @return This builder for chaining.
*/
public Builder clearExpId() {
expId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -796,13 +667,10 @@ public final class AvatarExpeditionStartReqOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\036AvatarExpeditionStartReq.proto\"\261\001\n\030Ava" +
"tarExpeditionStartReq\022\020\n\010hourTime\030\014 \001(\r\022" +
"\022\n\navatarGuid\030\010 \001(\004\022\r\n\005expId\030\016 \001(\r\"`\n\013AL" +
"MCOHOIHKE\022\010\n\004NONE\020\000\022\020\n\013PEPPOHPHJOJ\020\370\014\022\017\n" +
"\013DCDNILFDFLB\020\000\022\017\n\013NNBKOLMPOEA\020\001\022\017\n\013EAJIA" +
"BGAOCI\020\001\032\002\020\001B\033\n\031emu.grasscutter.net.prot" +
"ob\006proto3"
"\n\036AvatarExpeditionStartReq.proto\"R\n\030Avat" +
"arExpeditionStartReq\022\016\n\006exp_id\030\003 \001(\r\022\021\n\t" +
"hour_time\030\017 \001(\r\022\023\n\013avatar_guid\030\005 \001(\004B\033\n\031" +
"emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -813,7 +681,7 @@ public final class AvatarExpeditionStartReqOuterClass {
internal_static_AvatarExpeditionStartReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarExpeditionStartReq_descriptor,
new java.lang.String[] { "HourTime", "AvatarGuid", "ExpId", });
new java.lang.String[] { "ExpId", "HourTime", "AvatarGuid", });
}
// @@protoc_insertion_point(outer_class_scope)