Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 09:45:03 +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/AvatarSatiationDataOuterClass.java
+105 -97
View File
@@ -19,24 +19,28 @@ public final class AvatarSatiationDataOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint64 avatarGuid = 5;</code>
* <code>uint64 avatar_guid = 3;</code>
* @return The avatarGuid.
*/
long getAvatarGuid();
/**
* <code>float finishTime = 15;</code>
* @return The finishTime.
*/
float getFinishTime();
/**
* <code>float penaltyFinishTime = 12;</code>
* <code>float penalty_finish_time = 13;</code>
* @return The penaltyFinishTime.
*/
float getPenaltyFinishTime();
/**
* <code>float finish_time = 5;</code>
* @return The finishTime.
*/
float getFinishTime();
}
/**
* <pre>
* Name: IPIDLJAAEGM
* </pre>
*
* Protobuf type {@code AvatarSatiationData}
*/
public static final class AvatarSatiationData extends
@@ -81,21 +85,21 @@ public final class AvatarSatiationDataOuterClass {
case 0:
done = true;
break;
case 40: {
case 24: {
avatarGuid_ = input.readUInt64();
break;
}
case 101: {
penaltyFinishTime_ = input.readFloat();
break;
}
case 125: {
case 45: {
finishTime_ = input.readFloat();
break;
}
case 109: {
penaltyFinishTime_ = input.readFloat();
break;
}
default: {
if (!parseUnknownField(
input, unknownFields, extensionRegistry, tag)) {
@@ -128,10 +132,10 @@ public final class AvatarSatiationDataOuterClass {
emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.class, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder.class);
}
public static final int AVATARGUID_FIELD_NUMBER = 5;
public static final int AVATAR_GUID_FIELD_NUMBER = 3;
private long avatarGuid_;
/**
* <code>uint64 avatarGuid = 5;</code>
* <code>uint64 avatar_guid = 3;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -139,21 +143,10 @@ public final class AvatarSatiationDataOuterClass {
return avatarGuid_;
}
public static final int FINISHTIME_FIELD_NUMBER = 15;
private float finishTime_;
/**
* <code>float finishTime = 15;</code>
* @return The finishTime.
*/
@java.lang.Override
public float getFinishTime() {
return finishTime_;
}
public static final int PENALTYFINISHTIME_FIELD_NUMBER = 12;
public static final int PENALTY_FINISH_TIME_FIELD_NUMBER = 13;
private float penaltyFinishTime_;
/**
* <code>float penaltyFinishTime = 12;</code>
* <code>float penalty_finish_time = 13;</code>
* @return The penaltyFinishTime.
*/
@java.lang.Override
@@ -161,6 +154,17 @@ public final class AvatarSatiationDataOuterClass {
return penaltyFinishTime_;
}
public static final int FINISH_TIME_FIELD_NUMBER = 5;
private float finishTime_;
/**
* <code>float finish_time = 5;</code>
* @return The finishTime.
*/
@java.lang.Override
public float getFinishTime() {
return finishTime_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -176,13 +180,13 @@ public final class AvatarSatiationDataOuterClass {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (avatarGuid_ != 0L) {
output.writeUInt64(5, avatarGuid_);
}
if (penaltyFinishTime_ != 0F) {
output.writeFloat(12, penaltyFinishTime_);
output.writeUInt64(3, avatarGuid_);
}
if (finishTime_ != 0F) {
output.writeFloat(15, finishTime_);
output.writeFloat(5, finishTime_);
}
if (penaltyFinishTime_ != 0F) {
output.writeFloat(13, penaltyFinishTime_);
}
unknownFields.writeTo(output);
}
@@ -195,15 +199,15 @@ public final class AvatarSatiationDataOuterClass {
size = 0;
if (avatarGuid_ != 0L) {
size += com.google.protobuf.CodedOutputStream
.computeUInt64Size(5, avatarGuid_);
}
if (penaltyFinishTime_ != 0F) {
size += com.google.protobuf.CodedOutputStream
.computeFloatSize(12, penaltyFinishTime_);
.computeUInt64Size(3, avatarGuid_);
}
if (finishTime_ != 0F) {
size += com.google.protobuf.CodedOutputStream
.computeFloatSize(15, finishTime_);
.computeFloatSize(5, finishTime_);
}
if (penaltyFinishTime_ != 0F) {
size += com.google.protobuf.CodedOutputStream
.computeFloatSize(13, penaltyFinishTime_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -222,12 +226,12 @@ public final class AvatarSatiationDataOuterClass {
if (getAvatarGuid()
!= other.getAvatarGuid()) return false;
if (java.lang.Float.floatToIntBits(getFinishTime())
!= java.lang.Float.floatToIntBits(
other.getFinishTime())) return false;
if (java.lang.Float.floatToIntBits(getPenaltyFinishTime())
!= java.lang.Float.floatToIntBits(
other.getPenaltyFinishTime())) return false;
if (java.lang.Float.floatToIntBits(getFinishTime())
!= java.lang.Float.floatToIntBits(
other.getFinishTime())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -239,15 +243,15 @@ public final class AvatarSatiationDataOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
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) + FINISHTIME_FIELD_NUMBER;
hash = (53 * hash) + java.lang.Float.floatToIntBits(
getFinishTime());
hash = (37 * hash) + PENALTYFINISHTIME_FIELD_NUMBER;
hash = (37 * hash) + PENALTY_FINISH_TIME_FIELD_NUMBER;
hash = (53 * hash) + java.lang.Float.floatToIntBits(
getPenaltyFinishTime());
hash = (37 * hash) + FINISH_TIME_FIELD_NUMBER;
hash = (53 * hash) + java.lang.Float.floatToIntBits(
getFinishTime());
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -344,6 +348,10 @@ public final class AvatarSatiationDataOuterClass {
return builder;
}
/**
* <pre>
* Name: IPIDLJAAEGM
* </pre>
*
* Protobuf type {@code AvatarSatiationData}
*/
public static final class Builder extends
@@ -383,10 +391,10 @@ public final class AvatarSatiationDataOuterClass {
super.clear();
avatarGuid_ = 0L;
finishTime_ = 0F;
penaltyFinishTime_ = 0F;
finishTime_ = 0F;
return this;
}
@@ -414,8 +422,8 @@ public final class AvatarSatiationDataOuterClass {
public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData buildPartial() {
emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData result = new emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData(this);
result.avatarGuid_ = avatarGuid_;
result.finishTime_ = finishTime_;
result.penaltyFinishTime_ = penaltyFinishTime_;
result.finishTime_ = finishTime_;
onBuilt();
return result;
}
@@ -467,12 +475,12 @@ public final class AvatarSatiationDataOuterClass {
if (other.getAvatarGuid() != 0L) {
setAvatarGuid(other.getAvatarGuid());
}
if (other.getFinishTime() != 0F) {
setFinishTime(other.getFinishTime());
}
if (other.getPenaltyFinishTime() != 0F) {
setPenaltyFinishTime(other.getPenaltyFinishTime());
}
if (other.getFinishTime() != 0F) {
setFinishTime(other.getFinishTime());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -504,7 +512,7 @@ public final class AvatarSatiationDataOuterClass {
private long avatarGuid_ ;
/**
* <code>uint64 avatarGuid = 5;</code>
* <code>uint64 avatar_guid = 3;</code>
* @return The avatarGuid.
*/
@java.lang.Override
@@ -512,7 +520,7 @@ public final class AvatarSatiationDataOuterClass {
return avatarGuid_;
}
/**
* <code>uint64 avatarGuid = 5;</code>
* <code>uint64 avatar_guid = 3;</code>
* @param value The avatarGuid to set.
* @return This builder for chaining.
*/
@@ -523,7 +531,7 @@ public final class AvatarSatiationDataOuterClass {
return this;
}
/**
* <code>uint64 avatarGuid = 5;</code>
* <code>uint64 avatar_guid = 3;</code>
* @return This builder for chaining.
*/
public Builder clearAvatarGuid() {
@@ -533,40 +541,9 @@ public final class AvatarSatiationDataOuterClass {
return this;
}
private float finishTime_ ;
/**
* <code>float finishTime = 15;</code>
* @return The finishTime.
*/
@java.lang.Override
public float getFinishTime() {
return finishTime_;
}
/**
* <code>float finishTime = 15;</code>
* @param value The finishTime to set.
* @return This builder for chaining.
*/
public Builder setFinishTime(float value) {
finishTime_ = value;
onChanged();
return this;
}
/**
* <code>float finishTime = 15;</code>
* @return This builder for chaining.
*/
public Builder clearFinishTime() {
finishTime_ = 0F;
onChanged();
return this;
}
private float penaltyFinishTime_ ;
/**
* <code>float penaltyFinishTime = 12;</code>
* <code>float penalty_finish_time = 13;</code>
* @return The penaltyFinishTime.
*/
@java.lang.Override
@@ -574,7 +551,7 @@ public final class AvatarSatiationDataOuterClass {
return penaltyFinishTime_;
}
/**
* <code>float penaltyFinishTime = 12;</code>
* <code>float penalty_finish_time = 13;</code>
* @param value The penaltyFinishTime to set.
* @return This builder for chaining.
*/
@@ -585,7 +562,7 @@ public final class AvatarSatiationDataOuterClass {
return this;
}
/**
* <code>float penaltyFinishTime = 12;</code>
* <code>float penalty_finish_time = 13;</code>
* @return This builder for chaining.
*/
public Builder clearPenaltyFinishTime() {
@@ -594,6 +571,37 @@ public final class AvatarSatiationDataOuterClass {
onChanged();
return this;
}
private float finishTime_ ;
/**
* <code>float finish_time = 5;</code>
* @return The finishTime.
*/
@java.lang.Override
public float getFinishTime() {
return finishTime_;
}
/**
* <code>float finish_time = 5;</code>
* @param value The finishTime to set.
* @return This builder for chaining.
*/
public Builder setFinishTime(float value) {
finishTime_ = value;
onChanged();
return this;
}
/**
* <code>float finish_time = 5;</code>
* @return This builder for chaining.
*/
public Builder clearFinishTime() {
finishTime_ = 0F;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -661,10 +669,10 @@ public final class AvatarSatiationDataOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\031AvatarSatiationData.proto\"X\n\023AvatarSat" +
"iationData\022\022\n\navatarGuid\030\005 \001(\004\022\022\n\nfinish" +
"Time\030\017 \001(\002\022\031\n\021penaltyFinishTime\030\014 \001(\002B\033\n" +
"\031emu.grasscutter.net.protob\006proto3"
"\n\031AvatarSatiationData.proto\"\\\n\023AvatarSat" +
"iationData\022\023\n\013avatar_guid\030\003 \001(\004\022\033\n\023penal" +
"ty_finish_time\030\r \001(\002\022\023\n\013finish_time\030\005 \001(" +
"\002B\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -675,7 +683,7 @@ public final class AvatarSatiationDataOuterClass {
internal_static_AvatarSatiationData_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_AvatarSatiationData_descriptor,
new java.lang.String[] { "AvatarGuid", "FinishTime", "PenaltyFinishTime", });
new java.lang.String[] { "AvatarGuid", "PenaltyFinishTime", "FinishTime", });
}
// @@protoc_insertion_point(outer_class_scope)