Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-06-05 12:53:34 +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/BattlePassCycleOuterClass.java
+123 -95
View File
@@ -19,24 +19,32 @@ public final class BattlePassCycleOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 cycleIdx = 8;</code>
* @return The cycleIdx.
*/
int getCycleIdx();
/**
* <code>uint32 beginTime = 2;</code>
* <code>uint32 begin_time = 8;</code>
* @return The beginTime.
*/
int getBeginTime();
/**
* <code>uint32 endTime = 11;</code>
* <pre>
* FLNDBEEKMFN
* </pre>
*
* <code>uint32 cycle_idx = 5;</code>
* @return The cycleIdx.
*/
int getCycleIdx();
/**
* <code>uint32 end_time = 12;</code>
* @return The endTime.
*/
int getEndTime();
}
/**
* <pre>
* Name: IAMODOAMICJ
* </pre>
*
* Protobuf type {@code BattlePassCycle}
*/
public static final class BattlePassCycle extends
@@ -81,17 +89,17 @@ public final class BattlePassCycleOuterClass {
case 0:
done = true;
break;
case 16: {
beginTime_ = input.readUInt32();
break;
}
case 64: {
case 40: {
cycleIdx_ = input.readUInt32();
break;
}
case 88: {
case 64: {
beginTime_ = input.readUInt32();
break;
}
case 96: {
endTime_ = input.readUInt32();
break;
@@ -128,21 +136,10 @@ public final class BattlePassCycleOuterClass {
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.class, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder.class);
}
public static final int CYCLEIDX_FIELD_NUMBER = 8;
private int cycleIdx_;
/**
* <code>uint32 cycleIdx = 8;</code>
* @return The cycleIdx.
*/
@java.lang.Override
public int getCycleIdx() {
return cycleIdx_;
}
public static final int BEGINTIME_FIELD_NUMBER = 2;
public static final int BEGIN_TIME_FIELD_NUMBER = 8;
private int beginTime_;
/**
* <code>uint32 beginTime = 2;</code>
* <code>uint32 begin_time = 8;</code>
* @return The beginTime.
*/
@java.lang.Override
@@ -150,10 +147,25 @@ public final class BattlePassCycleOuterClass {
return beginTime_;
}
public static final int ENDTIME_FIELD_NUMBER = 11;
public static final int CYCLE_IDX_FIELD_NUMBER = 5;
private int cycleIdx_;
/**
* <pre>
* FLNDBEEKMFN
* </pre>
*
* <code>uint32 cycle_idx = 5;</code>
* @return The cycleIdx.
*/
@java.lang.Override
public int getCycleIdx() {
return cycleIdx_;
}
public static final int END_TIME_FIELD_NUMBER = 12;
private int endTime_;
/**
* <code>uint32 endTime = 11;</code>
* <code>uint32 end_time = 12;</code>
* @return The endTime.
*/
@java.lang.Override
@@ -175,14 +187,14 @@ public final class BattlePassCycleOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (beginTime_ != 0) {
output.writeUInt32(2, beginTime_);
}
if (cycleIdx_ != 0) {
output.writeUInt32(8, cycleIdx_);
output.writeUInt32(5, cycleIdx_);
}
if (beginTime_ != 0) {
output.writeUInt32(8, beginTime_);
}
if (endTime_ != 0) {
output.writeUInt32(11, endTime_);
output.writeUInt32(12, endTime_);
}
unknownFields.writeTo(output);
}
@@ -193,17 +205,17 @@ public final class BattlePassCycleOuterClass {
if (size != -1) return size;
size = 0;
if (beginTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, beginTime_);
}
if (cycleIdx_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, cycleIdx_);
.computeUInt32Size(5, cycleIdx_);
}
if (beginTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(8, beginTime_);
}
if (endTime_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(11, endTime_);
.computeUInt32Size(12, endTime_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -220,10 +232,10 @@ public final class BattlePassCycleOuterClass {
}
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle other = (emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle) obj;
if (getCycleIdx()
!= other.getCycleIdx()) return false;
if (getBeginTime()
!= other.getBeginTime()) return false;
if (getCycleIdx()
!= other.getCycleIdx()) return false;
if (getEndTime()
!= other.getEndTime()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
@@ -237,11 +249,11 @@ public final class BattlePassCycleOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CYCLEIDX_FIELD_NUMBER;
hash = (53 * hash) + getCycleIdx();
hash = (37 * hash) + BEGINTIME_FIELD_NUMBER;
hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
hash = (53 * hash) + getBeginTime();
hash = (37 * hash) + ENDTIME_FIELD_NUMBER;
hash = (37 * hash) + CYCLE_IDX_FIELD_NUMBER;
hash = (53 * hash) + getCycleIdx();
hash = (37 * hash) + END_TIME_FIELD_NUMBER;
hash = (53 * hash) + getEndTime();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
@@ -339,6 +351,10 @@ public final class BattlePassCycleOuterClass {
return builder;
}
/**
* <pre>
* Name: IAMODOAMICJ
* </pre>
*
* Protobuf type {@code BattlePassCycle}
*/
public static final class Builder extends
@@ -376,10 +392,10 @@ public final class BattlePassCycleOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
cycleIdx_ = 0;
beginTime_ = 0;
cycleIdx_ = 0;
endTime_ = 0;
return this;
@@ -408,8 +424,8 @@ public final class BattlePassCycleOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle buildPartial() {
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle result = new emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle(this);
result.cycleIdx_ = cycleIdx_;
result.beginTime_ = beginTime_;
result.cycleIdx_ = cycleIdx_;
result.endTime_ = endTime_;
onBuilt();
return result;
@@ -459,12 +475,12 @@ public final class BattlePassCycleOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle other) {
if (other == emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.getDefaultInstance()) return this;
if (other.getCycleIdx() != 0) {
setCycleIdx(other.getCycleIdx());
}
if (other.getBeginTime() != 0) {
setBeginTime(other.getBeginTime());
}
if (other.getCycleIdx() != 0) {
setCycleIdx(other.getCycleIdx());
}
if (other.getEndTime() != 0) {
setEndTime(other.getEndTime());
}
@@ -497,40 +513,9 @@ public final class BattlePassCycleOuterClass {
return this;
}
private int cycleIdx_ ;
/**
* <code>uint32 cycleIdx = 8;</code>
* @return The cycleIdx.
*/
@java.lang.Override
public int getCycleIdx() {
return cycleIdx_;
}
/**
* <code>uint32 cycleIdx = 8;</code>
* @param value The cycleIdx to set.
* @return This builder for chaining.
*/
public Builder setCycleIdx(int value) {
cycleIdx_ = value;
onChanged();
return this;
}
/**
* <code>uint32 cycleIdx = 8;</code>
* @return This builder for chaining.
*/
public Builder clearCycleIdx() {
cycleIdx_ = 0;
onChanged();
return this;
}
private int beginTime_ ;
/**
* <code>uint32 beginTime = 2;</code>
* <code>uint32 begin_time = 8;</code>
* @return The beginTime.
*/
@java.lang.Override
@@ -538,7 +523,7 @@ public final class BattlePassCycleOuterClass {
return beginTime_;
}
/**
* <code>uint32 beginTime = 2;</code>
* <code>uint32 begin_time = 8;</code>
* @param value The beginTime to set.
* @return This builder for chaining.
*/
@@ -549,7 +534,7 @@ public final class BattlePassCycleOuterClass {
return this;
}
/**
* <code>uint32 beginTime = 2;</code>
* <code>uint32 begin_time = 8;</code>
* @return This builder for chaining.
*/
public Builder clearBeginTime() {
@@ -559,9 +544,52 @@ public final class BattlePassCycleOuterClass {
return this;
}
private int cycleIdx_ ;
/**
* <pre>
* FLNDBEEKMFN
* </pre>
*
* <code>uint32 cycle_idx = 5;</code>
* @return The cycleIdx.
*/
@java.lang.Override
public int getCycleIdx() {
return cycleIdx_;
}
/**
* <pre>
* FLNDBEEKMFN
* </pre>
*
* <code>uint32 cycle_idx = 5;</code>
* @param value The cycleIdx to set.
* @return This builder for chaining.
*/
public Builder setCycleIdx(int value) {
cycleIdx_ = value;
onChanged();
return this;
}
/**
* <pre>
* FLNDBEEKMFN
* </pre>
*
* <code>uint32 cycle_idx = 5;</code>
* @return This builder for chaining.
*/
public Builder clearCycleIdx() {
cycleIdx_ = 0;
onChanged();
return this;
}
private int endTime_ ;
/**
* <code>uint32 endTime = 11;</code>
* <code>uint32 end_time = 12;</code>
* @return The endTime.
*/
@java.lang.Override
@@ -569,7 +597,7 @@ public final class BattlePassCycleOuterClass {
return endTime_;
}
/**
* <code>uint32 endTime = 11;</code>
* <code>uint32 end_time = 12;</code>
* @param value The endTime to set.
* @return This builder for chaining.
*/
@@ -580,7 +608,7 @@ public final class BattlePassCycleOuterClass {
return this;
}
/**
* <code>uint32 endTime = 11;</code>
* <code>uint32 end_time = 12;</code>
* @return This builder for chaining.
*/
public Builder clearEndTime() {
@@ -656,10 +684,10 @@ public final class BattlePassCycleOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\025BattlePassCycle.proto\"G\n\017BattlePassCyc" +
"le\022\020\n\010cycleIdx\030\010 \001(\r\022\021\n\tbeginTime\030\002 \001(\r\022" +
"\017\n\007endTime\030\013 \001(\rB\033\n\031emu.grasscutter.net." +
"protob\006proto3"
"\n\025BattlePassCycle.proto\"J\n\017BattlePassCyc" +
"le\022\022\n\nbegin_time\030\010 \001(\r\022\021\n\tcycle_idx\030\005 \001(" +
"\r\022\020\n\010end_time\030\014 \001(\rB\033\n\031emu.grasscutter.n" +
"et.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -670,7 +698,7 @@ public final class BattlePassCycleOuterClass {
internal_static_BattlePassCycle_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_BattlePassCycle_descriptor,
new java.lang.String[] { "CycleIdx", "BeginTime", "EndTime", });
new java.lang.String[] { "BeginTime", "CycleIdx", "EndTime", });
}
// @@protoc_insertion_point(outer_class_scope)