mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2026-06-08 22:44:47 +08:00
Add support for v3.5.0 (#2090)
* 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
committed by
GitHub
Unverified
GitHub
parent
922f7bca51
commit
516e5975e1
@@ -19,18 +19,22 @@ public final class UgcMusicNoteOuterClass {
|
||||
com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
/**
|
||||
* <code>uint32 startTime = 3;</code>
|
||||
* <code>uint32 start_time = 15;</code>
|
||||
* @return The startTime.
|
||||
*/
|
||||
int getStartTime();
|
||||
|
||||
/**
|
||||
* <code>uint32 endTime = 5;</code>
|
||||
* <code>uint32 end_time = 8;</code>
|
||||
* @return The endTime.
|
||||
*/
|
||||
int getEndTime();
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: KELICPOLEGO
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code UgcMusicNote}
|
||||
*/
|
||||
public static final class UgcMusicNote extends
|
||||
@@ -75,16 +79,16 @@ public final class UgcMusicNoteOuterClass {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
case 24: {
|
||||
|
||||
startTime_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 40: {
|
||||
case 64: {
|
||||
|
||||
endTime_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
case 120: {
|
||||
|
||||
startTime_ = input.readUInt32();
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
if (!parseUnknownField(
|
||||
input, unknownFields, extensionRegistry, tag)) {
|
||||
@@ -117,10 +121,10 @@ public final class UgcMusicNoteOuterClass {
|
||||
emu.grasscutter.net.proto.UgcMusicNoteOuterClass.UgcMusicNote.class, emu.grasscutter.net.proto.UgcMusicNoteOuterClass.UgcMusicNote.Builder.class);
|
||||
}
|
||||
|
||||
public static final int STARTTIME_FIELD_NUMBER = 3;
|
||||
public static final int START_TIME_FIELD_NUMBER = 15;
|
||||
private int startTime_;
|
||||
/**
|
||||
* <code>uint32 startTime = 3;</code>
|
||||
* <code>uint32 start_time = 15;</code>
|
||||
* @return The startTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -128,10 +132,10 @@ public final class UgcMusicNoteOuterClass {
|
||||
return startTime_;
|
||||
}
|
||||
|
||||
public static final int ENDTIME_FIELD_NUMBER = 5;
|
||||
public static final int END_TIME_FIELD_NUMBER = 8;
|
||||
private int endTime_;
|
||||
/**
|
||||
* <code>uint32 endTime = 5;</code>
|
||||
* <code>uint32 end_time = 8;</code>
|
||||
* @return The endTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -153,11 +157,11 @@ public final class UgcMusicNoteOuterClass {
|
||||
@java.lang.Override
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
if (startTime_ != 0) {
|
||||
output.writeUInt32(3, startTime_);
|
||||
}
|
||||
if (endTime_ != 0) {
|
||||
output.writeUInt32(5, endTime_);
|
||||
output.writeUInt32(8, endTime_);
|
||||
}
|
||||
if (startTime_ != 0) {
|
||||
output.writeUInt32(15, startTime_);
|
||||
}
|
||||
unknownFields.writeTo(output);
|
||||
}
|
||||
@@ -168,13 +172,13 @@ public final class UgcMusicNoteOuterClass {
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (startTime_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(3, startTime_);
|
||||
}
|
||||
if (endTime_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(5, endTime_);
|
||||
.computeUInt32Size(8, endTime_);
|
||||
}
|
||||
if (startTime_ != 0) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeUInt32Size(15, startTime_);
|
||||
}
|
||||
size += unknownFields.getSerializedSize();
|
||||
memoizedSize = size;
|
||||
@@ -206,9 +210,9 @@ public final class UgcMusicNoteOuterClass {
|
||||
}
|
||||
int hash = 41;
|
||||
hash = (19 * hash) + getDescriptor().hashCode();
|
||||
hash = (37 * hash) + STARTTIME_FIELD_NUMBER;
|
||||
hash = (37 * hash) + START_TIME_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getStartTime();
|
||||
hash = (37 * hash) + ENDTIME_FIELD_NUMBER;
|
||||
hash = (37 * hash) + END_TIME_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getEndTime();
|
||||
hash = (29 * hash) + unknownFields.hashCode();
|
||||
memoizedHashCode = hash;
|
||||
@@ -306,6 +310,10 @@ public final class UgcMusicNoteOuterClass {
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* <pre>
|
||||
* Name: KELICPOLEGO
|
||||
* </pre>
|
||||
*
|
||||
* Protobuf type {@code UgcMusicNote}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
@@ -460,7 +468,7 @@ public final class UgcMusicNoteOuterClass {
|
||||
|
||||
private int startTime_ ;
|
||||
/**
|
||||
* <code>uint32 startTime = 3;</code>
|
||||
* <code>uint32 start_time = 15;</code>
|
||||
* @return The startTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -468,7 +476,7 @@ public final class UgcMusicNoteOuterClass {
|
||||
return startTime_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 startTime = 3;</code>
|
||||
* <code>uint32 start_time = 15;</code>
|
||||
* @param value The startTime to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -479,7 +487,7 @@ public final class UgcMusicNoteOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 startTime = 3;</code>
|
||||
* <code>uint32 start_time = 15;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearStartTime() {
|
||||
@@ -491,7 +499,7 @@ public final class UgcMusicNoteOuterClass {
|
||||
|
||||
private int endTime_ ;
|
||||
/**
|
||||
* <code>uint32 endTime = 5;</code>
|
||||
* <code>uint32 end_time = 8;</code>
|
||||
* @return The endTime.
|
||||
*/
|
||||
@java.lang.Override
|
||||
@@ -499,7 +507,7 @@ public final class UgcMusicNoteOuterClass {
|
||||
return endTime_;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 endTime = 5;</code>
|
||||
* <code>uint32 end_time = 8;</code>
|
||||
* @param value The endTime to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
@@ -510,7 +518,7 @@ public final class UgcMusicNoteOuterClass {
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>uint32 endTime = 5;</code>
|
||||
* <code>uint32 end_time = 8;</code>
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearEndTime() {
|
||||
@@ -586,9 +594,9 @@ public final class UgcMusicNoteOuterClass {
|
||||
descriptor;
|
||||
static {
|
||||
java.lang.String[] descriptorData = {
|
||||
"\n\022UgcMusicNote.proto\"2\n\014UgcMusicNote\022\021\n\t" +
|
||||
"startTime\030\003 \001(\r\022\017\n\007endTime\030\005 \001(\rB\033\n\031emu." +
|
||||
"grasscutter.net.protob\006proto3"
|
||||
"\n\022UgcMusicNote.proto\"4\n\014UgcMusicNote\022\022\n\n" +
|
||||
"start_time\030\017 \001(\r\022\020\n\010end_time\030\010 \001(\rB\033\n\031em" +
|
||||
"u.grasscutter.net.protob\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(descriptorData,
|
||||
|
||||
Reference in New Issue
Block a user